Update rnc schemas.nxml-gentoo-schemas-20090527

3 files changed, 56 insertions, 247 deletions

diff --git a/guide.rnc b/guide.rnc
index eb48d30..6b5a014 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -46,18 +46,7 @@ news =
   element news { news.attlist, poster, date, title, summary?, body }
 news.attlist &=
   [ a:defaultValue = "no" ] attribute gentoo { "yes" | "no" }?,
-  attribute category {
-    "alpha"
-    | "gentoo"
-    | "main"
-    | "ibm"
-    | "linux"
-    | "moo"
-    | "nvidia"
-    | "kde"
-    | "plans"
-    | "freescale"
-  }
+  attribute category { "gentoo" | "main" | "linux" | "moo" | "plans" }
 subtitle = element subtitle { subtitle.attlist, text }
 subtitle.attlist &= empty
 poster = element poster { poster.attlist, text }
diff --git a/metadata.rnc b/metadata.rnc
index 429dd05..4fb8abd 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -10,7 +10,8 @@ attlist.catmetadata &=
 # Metadata for a package
 pkgmetadata =
   element pkgmetadata {
-    attlist.pkgmetadata, (herd | maintainer | longdescription | use)*
+    attlist.pkgmetadata,
+    (herd | maintainer | longdescription | use | upstream)*
   }
 attlist.pkgmetadata &=
   [ a:defaultValue = "" ] attribute pkgname { text }?
@@ -23,9 +24,14 @@ maintainer =
   }
 #  A long description of the package in freetext
 longdescription =
-  element longdescription { attlist.longdescription, (text | pkg)* }
+  element longdescription {
+    attlist.longdescription, (text | pkg | cat)*
+  }
 #  The changelog of the package
-changelog = element changelog { attlist.changelog, change* }
+
+# Please note that #PCDATA is mentioned only for the upstream changelog
+# element, where the content is a URL. This is due to limitations of the DTD
+changelog = element changelog { attlist.changelog, (text | change)* }
 attlist.changelog &= empty
 #  The changelog contains various "changes"
 change =
@@ -61,13 +67,40 @@ attlist.bug &= empty
 
 # description of what this USE flag does for this package
 use = element use { attlist.use, flag* }
-flag = element flag { attlist.flag, (text | pkg)* }
+flag = element flag { attlist.flag, (text | pkg | cat)* }
 # name attribute holds the name of the USE flag
 attlist.flag &= attribute name { text }
+# upstream metadata information (maintainers, upstream docs,..)
+upstream =
+  element upstream {
+    attlist.upstream,
+    (maintainer | changelog | doc | bugs-to | remote-id)*
+  }
+attlist.upstream &= empty
+# Due to the limitation of DTD this will also allow a status
+# attribute for the package maintainer element. Please note that
+# the usage of the status attribute is nevertheless _only_ allowed
+# in the upstream maintainer element.
+attlist.maintainer &=
+  [ a:defaultValue = "unknown" ]
+  attribute status { "active" | "inactive" | "unknown" }?
+# URL where the location of the upstream documentation can be found
+doc = element doc { attlist.doc, text }
+attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }?
+# location where to report bugs
+# (may also be an email address prefixed with mailto:)
+bugs-to = element bugs-to { attlist.bugs-to, text }
+attlist.bugs-to &= empty
+# specify a type of package identification tracker
+remote-id = element remote-id { attlist.remote-id, text }
+attlist.remote-id &=
+  attribute type { "freshmeat" | "sourceforge" | "cpan" | "vim" }
 # category/package information for cross-linking in descriptions
 # and useflag descriptions
 pkg = element pkg { attlist.pkg, text }
 attlist.pkg &= empty
+cat = element cat { attlist.cat, text }
+attlist.cat &= empty
 # Common attributes
 
 # the lang attribute, specifies the language of this tag. This is 
@@ -98,5 +131,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 | changelog
+start = catmetadata | packages
 #  A description of a maintainer or change
diff --git a/metadoc.rnc b/metadoc.rnc
index 819ffa5..a735d75 100644
--- a/metadoc.rnc
+++ b/metadoc.rnc
@@ -1,3 +1,4 @@
+include "common.rnc"
 metadoc =
   element metadoc {
     metadoc.attlist, version, members, categories, files, docs
@@ -5,8 +6,6 @@ metadoc =
 metadoc.attlist &=
   attribute lang { text },
   attribute parent { text }?
-version = element version { version.attlist, text }
-version.attlist &= empty
 members = element members { members.attlist, lead*, member* }
 members.attlist &= empty
 lead = element lead { lead.attlist, text* }
@@ -51,8 +50,6 @@ dynamic =
     (listing | catid* | overview)
   }
 dynamic.attlist &= attribute metadoc { text }
-title = element title { title.attlist, text* }
-title.attlist &= empty
 intro = element intro { intro.attlist, section* }
 intro.attlist &= empty
 # Section stuff copy/pasted from guide.dtd
@@ -64,230 +61,20 @@ catid = element catid { catid.attlist, text* }
 catid.attlist &= empty
 overview = element overview { overview.attlist, empty }
 overview.attlist &= empty
-inline.class = b | brite | c | e | path | img | br | mail | uri
-pre.class = comment | i
-block.class =
-  box | figure | fig | note | impo | warn | pre | p | table | ul | ol
-section = element section { section.attlist, title?, body }
-section.attlist &= attribute id { text }?
-body =
-  element body {
-    body.attlist, (block.class | glsa-latest | glsaindex)*
+section =
+  element section {
+    section.attlist,
+    (\include | (title?, body+))
   }
-body.attlist &= empty
-figure = element figure { figure.attlist, empty }
-figure.attlist &=
-  attribute caption { text }?,
-  attribute short { text }?,
-  attribute link { text }
-fig = element fig { fig.attlist, empty }
-fig.attlist &=
-  attribute short { text }?,
-  attribute linkto { text }?,
-  attribute link { text }
-img = element img { img.attlist, empty }
-img.attlist &= attribute src { text }
-br = element br { br.attlist, text }
-br.attlist &= empty
-note = element note { note.attlist, (text | inline.class)* }
-note.attlist &= empty
-impo = element impo { impo.attlist, (text | inline.class)* }
-impo.attlist &= empty
-warn = element warn { warn.attlist, (text | inline.class)* }
-warn.attlist &= empty
-pre = element pre { pre.attlist, (text | pre.class)* }
-pre.attlist &= attribute caption { text }
-p = element p { p.attlist, (text | inline.class)* }
-p.attlist &= empty
-table = element table { table.attlist, tcolumn*, tr+ }
-table.attlist &= empty
-tcolumn = element tcolumn { tcolumn.attlist, empty }
-tcolumn.attlist &= attribute width { text }
-tr = element tr { tr.attlist, (th | ti)+ }
-tr.attlist &= empty
-th = element th { th.attlist, (text | inline.class)* }
-th.attlist &= empty
-ti = element ti { ti.attlist, (text | inline.class | block.class)* }
-ti.attlist &= empty
-ul = element ul { ul.attlist, li+ }
-ul.attlist &= empty
-ol = element ol { ol.attlist, li+ }
-ol.attlist &= empty
-li = element li { li.attlist, (text | inline.class | ul | ol)* }
-li.attlist &= empty
-# STYLE TAGS
-b = element b { b.attlist, (text | inline.class)* }
-b.attlist &= empty
-brite = element brite { brite.attlist, (text | inline.class)* }
-brite.attlist &= empty
-box = element box { box.attlist, (text | inline.class)* }
-box.attlist &= empty
-c = element c { c.attlist, (text | inline.class)* }
-c.attlist &= empty
-comment = element comment { comment.attlist, (text | pre.class)* }
-comment.attlist &= empty
-e = element e { e.attlist, (text | inline.class)* }
-e.attlist &= empty
-i = element i { i.attlist, (text | pre.class)* }
-i.attlist &= empty
-path = element path { path.attlist, (text | inline.class)* }
-path.attlist &= empty
-# LINK TAGS
-mail = element mail { mail.attlist, text* }
-mail.attlist &= attribute link { text }?
-uri = element uri { uri.attlist, text* }
-uri.attlist &= attribute link { text }?
-glsa-latest |= notAllowed
-glsaindex |= notAllowed
-start = dynamic | metadoc
-# VULGAR FRACTION ONE HALF
-
-# VULGAR FRACTION ONE HALF
-
-# VULGAR FRACTION ONE QUARTER
-
-# VULGAR FRACTION THREE QUARTERS
-
-#
-
-#
-
-#
-
-#
-
-# SUPERSCRIPT ONE
-
-# SUPERSCRIPT TWO
-
-# SUPERSCRIPT THREE
-
-# PLUS SIGN
-
-# PLUS-MINUS SIGN
-
-# LESS-THAN SIGN
-
-# EQUALS SIGN
-
-# GREATER-THAN SIGN
-
-# DIVISION SIGN
-
-# MULTIPLICATION SIGN
-
-# CURRENCY SIGN
-
-# POUND SIGN
-
-# DOLLAR SIGN
-
-# CENT SIGN
-
-# YEN SIGN
-
-# NUMBER SIGN
-
-# PERCENT SIGN
-
-# AMPERSAND
-
-# ASTERISK OPERATOR
-
-# COMMERCIAL AT
-
-# LEFT SQUARE BRACKET
-
-# REVERSE SOLIDUS
-
-# RIGHT SQUARE BRACKET
-
-# LEFT CURLY BRACKET
-
-# HORIZONTAL BAR
-
-# VERTICAL LINE
-
-# RIGHT CURLY BRACKET
-
-# MICRO SIGN
-
-# OHM SIGN
-
-# DEGREE SIGN
-
-# MASCULINE ORDINAL INDICATOR
-
-# FEMININE ORDINAL INDICATOR
-
-# SECTION SIGN
-
-# PILCROW SIGN
-
-# MIDDLE DOT
-
-# LEFTWARDS DOUBLE ARROW
-
-# RIGHTWARDS DOUBLE ARROW
-
-# UPWARDS ARROW
-
-# DOWNWARDS ARROW
-
-# COPYRIGHT SIGN
-
-# REG TRADE MARK SIGN
-
-# TRADE MARK SIGN
-
-# BROKEN BAR
-
-# NOT SIGN
-
-#
-
-# EXCLAMATION MARK
-
-# INVERTED EXCLAMATION MARK
-
-# QUOTATION MARK
-
-# APOSTROPHE
-
-# LEFT PARENTHESIS
-
-# RIGHT PARENTHESIS
-
-# COMMA
-
-# LOW LINE
-
-#
-
-# FULL STOP
-
-# SOLIDUS
-
-# COLON
-
-# SEMICOLON
-
-# QUESTION MARK
-
-# INVERTED QUESTION MARK
-
-# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-
-# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-
-#
-
-# RIGHT SINGLE QUOTATION MARK
-
-#
-
-# RIGHT DOUBLE QUOTATION MARK
-
-# NO-BREAK SPACE
-
-# SOFT HYPHEN
+body = element body { body.attlist, (\include | block.class+) }
+chapter |= notAllowed
+start =
+  glepindex
+  | abstract
+  | author
+  | values
+  | metadoc
+  | license
+  | included
+  | summary
+  | dynamic