diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | book.rnc | 1 | ||||
| -rw-r--r-- | guide.rnc | 1 | ||||
| -rw-r--r-- | metadata.rnc | 34 | ||||
| -rw-r--r-- | project.rnc | 4 |
5 files changed, 37 insertions, 13 deletions
@@ -10,7 +10,7 @@ else PN=nxml-gentoo-schemas-$(shell date '+%Y%m%d') endif -TARBALL=$(PN).tar.bz2 +TARBALL=$(PN).tar.xz .SUFFIXES: .dtd .rnc .dep .PHONY: depend all clean @@ -30,7 +30,7 @@ clean: $(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS) mkdir -p $(PN) cp $^ $(PN) - tar jcf $@ $(PN) + tar cJf $@ $(PN) .dtd.dep: echo > $@ @@ -44,7 +44,11 @@ $(TARBALL): Makefile LICENCE DONATING schemas.xml $(RNCS) .dtd.rnc: trang -I dtd -O rnc $< $@ +metadata.rnc: metadata.dtd + trang -I dtd -O rnc -i no-generate-start $< $@ + echo 'start = catmetadata | pkgmetadata' >> $@ + %.dtd: - wget -N --no-verbose http://www.gentoo.org/dtd/$@ + wget -N --no-verbose https://www.gentoo.org/dtd/$@ -include .depend @@ -16,6 +16,7 @@ book.attlist &= attribute disclaimer { "articles" | "oldbook" | "draft" | "obsolete" }?, + attribute redirect { text }?, attribute lang { text }? part = element part { part.attlist, title, abstract, chapter+ } part.attlist &= attribute id { text }? @@ -35,7 +35,6 @@ guide = chapter+ } guide.attlist &= - attribute link { text }?, attribute type { text }?, attribute disclaimer { "articles" | "oldbook" | "draft" | "obsolete" diff --git a/metadata.rnc b/metadata.rnc index e325a21..7a23cca 100644 --- a/metadata.rnc +++ b/metadata.rnc @@ -11,7 +11,12 @@ attlist.catmetadata &= pkgmetadata = element pkgmetadata { attlist.pkgmetadata, - (herd | maintainer | longdescription | use | upstream)* + (herd + | maintainer + | natural-name + | longdescription + | use + | upstream)* } attlist.pkgmetadata &= [ a:defaultValue = "" ] attribute pkgname { text }? @@ -22,6 +27,9 @@ maintainer = element maintainer { attlist.maintainer, email, (description | name)* } +# Natural name for package, example: LibreOffice (for app-office/libreoffice) +natural-name = element natural-name { attlist.natural-name, text } +attlist.natural-name &= empty # A long description of the package in freetext longdescription = element longdescription { @@ -95,16 +103,26 @@ attlist.bugs-to &= empty remote-id = element remote-id { attlist.remote-id, text } attlist.remote-id &= attribute type { - "freshmeat" - | "sourceforge" - | "sourceforge-jp" + "bitbucket" | "cpan" - | "vim" - | "google-code" + | "cpan-module" + | "cpe" + | "cran" | "ctan" + | "freecode" + | "freshmeat" + | "github" + | "gitorious" + | "google-code" + | "launchpad" + | "pear" + | "pecl" | "pypi" | "rubyforge" - | "cran" + | "rubygems" + | "sourceforge" + | "sourceforge-jp" + | "vim" } # category/package information for cross-linking in descriptions # and useflag descriptions @@ -142,5 +160,5 @@ name = element name { attlist.name, text } attlist.name &= empty # the name of a person (maintainer, contributor) description = element description { attlist.description, text } -start = catmetadata | packages # A description of a maintainer or change +start = catmetadata | pkgmetadata diff --git a/project.rnc b/project.rnc index 65c3ce7..6984fa9 100644 --- a/project.rnc +++ b/project.rnc @@ -24,7 +24,9 @@ project = | task | author)* } -project.attlist &= empty +project.attlist &= + attribute disclaimer { "draft" | "obsolete" }?, + attribute redirect { text }? name = element name { name.attlist, text } name.attlist &= empty longname = element longname { longname.attlist, text } |