1 |
commit: b2741e4a0e1438aaffba2b4de9b171382d8c8fd1 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 28 17:53:17 2015 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 25 09:25:18 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=b2741e4a |
7 |
|
8 |
Import files from nxml-gentoo-schemas-20150428. |
9 |
|
10 |
Makefile | 10 +++++++--- |
11 |
book.rnc | 1 + |
12 |
guide.rnc | 1 - |
13 |
metadata.rnc | 34 ++++++++++++++++++++++++++-------- |
14 |
project.rnc | 4 +++- |
15 |
5 files changed, 37 insertions(+), 13 deletions(-) |
16 |
|
17 |
diff --git a/Makefile b/Makefile |
18 |
index 9302f27..5b20643 100644 |
19 |
--- a/Makefile |
20 |
+++ b/Makefile |
21 |
@@ -10,7 +10,7 @@ else |
22 |
PN=nxml-gentoo-schemas-$(shell date '+%Y%m%d') |
23 |
endif |
24 |
|
25 |
-TARBALL=$(PN).tar.bz2 |
26 |
+TARBALL=$(PN).tar.xz |
27 |
|
28 |
.SUFFIXES: .dtd .rnc .dep |
29 |
.PHONY: depend all clean |
30 |
@@ -30,7 +30,7 @@ clean: |
31 |
$(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS) |
32 |
mkdir -p $(PN) |
33 |
cp $^ $(PN) |
34 |
- tar jcf $@ $(PN) |
35 |
+ tar cJf $@ $(PN) |
36 |
|
37 |
.dtd.dep: |
38 |
echo > $@ |
39 |
@@ -44,7 +44,11 @@ $(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS) |
40 |
.dtd.rnc: |
41 |
trang -I dtd -O rnc $< $@ |
42 |
|
43 |
+metadata.rnc: metadata.dtd |
44 |
+ trang -I dtd -O rnc -i no-generate-start $< $@ |
45 |
+ echo 'start = catmetadata | pkgmetadata' >> $@ |
46 |
+ |
47 |
%.dtd: |
48 |
- wget -N --no-verbose http://www.gentoo.org/dtd/$@ |
49 |
+ wget -N --no-verbose https://www.gentoo.org/dtd/$@ |
50 |
|
51 |
-include .depend |
52 |
|
53 |
diff --git a/book.rnc b/book.rnc |
54 |
index b7ebf7e..51d57b1 100644 |
55 |
--- a/book.rnc |
56 |
+++ b/book.rnc |
57 |
@@ -16,6 +16,7 @@ book.attlist &= |
58 |
attribute disclaimer { |
59 |
"articles" | "oldbook" | "draft" | "obsolete" |
60 |
}?, |
61 |
+ attribute redirect { text }?, |
62 |
attribute lang { text }? |
63 |
part = element part { part.attlist, title, abstract, chapter+ } |
64 |
part.attlist &= attribute id { text }? |
65 |
|
66 |
diff --git a/guide.rnc b/guide.rnc |
67 |
index 1ef1921..aaef013 100644 |
68 |
--- a/guide.rnc |
69 |
+++ b/guide.rnc |
70 |
@@ -35,7 +35,6 @@ guide = |
71 |
chapter+ |
72 |
} |
73 |
guide.attlist &= |
74 |
- attribute link { text }?, |
75 |
attribute type { text }?, |
76 |
attribute disclaimer { |
77 |
"articles" | "oldbook" | "draft" | "obsolete" |
78 |
|
79 |
diff --git a/metadata.rnc b/metadata.rnc |
80 |
index e325a21..7a23cca 100644 |
81 |
--- a/metadata.rnc |
82 |
+++ b/metadata.rnc |
83 |
@@ -11,7 +11,12 @@ attlist.catmetadata &= |
84 |
pkgmetadata = |
85 |
element pkgmetadata { |
86 |
attlist.pkgmetadata, |
87 |
- (herd | maintainer | longdescription | use | upstream)* |
88 |
+ (herd |
89 |
+ | maintainer |
90 |
+ | natural-name |
91 |
+ | longdescription |
92 |
+ | use |
93 |
+ | upstream)* |
94 |
} |
95 |
attlist.pkgmetadata &= |
96 |
[ a:defaultValue = "" ] attribute pkgname { text }? |
97 |
@@ -22,6 +27,9 @@ maintainer = |
98 |
element maintainer { |
99 |
attlist.maintainer, email, (description | name)* |
100 |
} |
101 |
+# Natural name for package, example: LibreOffice (for app-office/libreoffice) |
102 |
+natural-name = element natural-name { attlist.natural-name, text } |
103 |
+attlist.natural-name &= empty |
104 |
# A long description of the package in freetext |
105 |
longdescription = |
106 |
element longdescription { |
107 |
@@ -95,16 +103,26 @@ attlist.bugs-to &= empty |
108 |
remote-id = element remote-id { attlist.remote-id, text } |
109 |
attlist.remote-id &= |
110 |
attribute type { |
111 |
- "freshmeat" |
112 |
- | "sourceforge" |
113 |
- | "sourceforge-jp" |
114 |
+ "bitbucket" |
115 |
| "cpan" |
116 |
- | "vim" |
117 |
- | "google-code" |
118 |
+ | "cpan-module" |
119 |
+ | "cpe" |
120 |
+ | "cran" |
121 |
| "ctan" |
122 |
+ | "freecode" |
123 |
+ | "freshmeat" |
124 |
+ | "github" |
125 |
+ | "gitorious" |
126 |
+ | "google-code" |
127 |
+ | "launchpad" |
128 |
+ | "pear" |
129 |
+ | "pecl" |
130 |
| "pypi" |
131 |
| "rubyforge" |
132 |
- | "cran" |
133 |
+ | "rubygems" |
134 |
+ | "sourceforge" |
135 |
+ | "sourceforge-jp" |
136 |
+ | "vim" |
137 |
} |
138 |
# category/package information for cross-linking in descriptions |
139 |
# and useflag descriptions |
140 |
@@ -142,5 +160,5 @@ name = element name { attlist.name, text } |
141 |
attlist.name &= empty |
142 |
# the name of a person (maintainer, contributor) |
143 |
description = element description { attlist.description, text } |
144 |
-start = catmetadata | packages |
145 |
# A description of a maintainer or change |
146 |
+start = catmetadata | pkgmetadata |
147 |
|
148 |
diff --git a/project.rnc b/project.rnc |
149 |
index 65c3ce7..6984fa9 100644 |
150 |
--- a/project.rnc |
151 |
+++ b/project.rnc |
152 |
@@ -24,7 +24,9 @@ project = |
153 |
| task |
154 |
| author)* |
155 |
} |
156 |
-project.attlist &= empty |
157 |
+project.attlist &= |
158 |
+ attribute disclaimer { "draft" | "obsolete" }?, |
159 |
+ attribute redirect { text }? |
160 |
name = element name { name.attlist, text } |
161 |
name.attlist &= empty |
162 |
longname = element longname { longname.attlist, text } |