Update rnc schemas.

3 files changed, 63 insertions, 22 deletions

diff --git a/common.rnc b/common.rnc
index 597731f..3ce7e32 100644
--- a/common.rnc
+++ b/common.rnc
@@ -47,13 +47,15 @@ img.attlist &= attribute src { text }
 br = element br { br.attlist, empty }
 br.attlist &= empty
 note = element note { note.attlist, (text | inline.class)* }
-note.attlist &= empty
+note.attlist &= attribute test { text }?
 impo = element impo { impo.attlist, (text | inline.class)* }
-impo.attlist &= empty
+impo.attlist &= attribute test { text }?
 warn = element warn { warn.attlist, (text | inline.class)* }
-warn.attlist &= empty
+warn.attlist &= attribute test { text }?
 pre = element pre { pre.attlist, (text | pre.class)* }
-pre.attlist &= attribute caption { text }
+pre.attlist &=
+  attribute caption { text },
+  attribute test { text }?
 comment = element comment { comment.attlist, (text | pre.class | b)* }
 comment.attlist &= empty
 i = element i { i.attlist, (text | pre.class)* }
@@ -73,14 +75,19 @@ glepindex.attlist &=
   attribute status { text }?,
   [ a:defaultValue = "/proj/en/glep/gleps.xml" ]
   attribute index { text }?
+body.attlist &= attribute test { text }?
 p = element p { p.attlist, (text | inline.class)* }
-p.attlist &= attribute by { text }?
+p.attlist &=
+  attribute by { text }?,
+  attribute test { text }?
 table = element table { table.attlist, tcolumn*, tr+ }
-table.attlist &= empty
+table.attlist &= attribute test { text }?
 tcolumn = element tcolumn { tcolumn.attlist, empty }
 tcolumn.attlist &= attribute width { text }
 tr = element tr { tr.attlist, (th | ti)+ }
-tr.attlist &= attribute id { text }?
+tr.attlist &=
+  attribute id { text }?,
+  attribute test { text }?
 th = element th { th.attlist, (text | inline.class)* }
 th.attlist &=
   attribute colspan { text }?,
@@ -98,11 +105,11 @@ dt.attlist &= empty
 dd = element dd { dd.attlist, (text | inline.class | ul | ol)* }
 dd.attlist &= empty
 ul = element ul { ul.attlist, li+ }
-ul.attlist &= empty
+ul.attlist &= attribute test { text }?
 ol = element ol { ol.attlist, li+ }
-ol.attlist &= empty
+ol.attlist &= attribute test { text }?
 li = element li { li.attlist, (text | inline.class | ul | ol)* }
-li.attlist &= empty
+li.attlist &= attribute test { text }?
 sup = element sup { sup.attlist, (text | inline.class)* }
 sup.attlist &= empty
 sub = element sub { sub.attlist, (text | inline.class)* }
@@ -119,3 +126,13 @@ path = element path { path.attlist, (text | inline.class)* }
 path.attlist &= empty
 keyval = element keyval { keyval.attlist, empty }
 keyval.attlist &= attribute id { text }
+section.attlist &=
+  attribute id { text }?,
+  attribute test { text }?
+included =
+  element included {
+    included.attlist, version, date, (chapter | section | body)+
+  }
+included.attlist &= empty
+\include = element include { include.attlist, empty }
+include.attlist &= attribute href { text }
diff --git a/guide.rnc b/guide.rnc
index f19206d..eb48d30 100644
--- a/guide.rnc
+++ b/guide.rnc
@@ -10,9 +10,11 @@ mainpage =
     license?,
     version,
     date?,
-    (devmap? | newsitems? | chapter+)
+    (devmap? | newsitems? | (mirrorlist | chapter)+)
   }
-mainpage.attlist &= attribute lang { text }?
+mainpage.attlist &=
+  attribute redirect { text }?,
+  attribute lang { text }?
 newsitems = element newsitems { newsitems.attlist, empty }
 newsitems.attlist &= empty
 devmap = element devmap { devmap.attlist, empty }
@@ -22,6 +24,7 @@ guide =
     guide.attlist,
     title,
     subtitle?,
+    values?,
     author+,
     abstract,
     summary?,
@@ -44,7 +47,16 @@ news =
 news.attlist &=
   [ a:defaultValue = "no" ] attribute gentoo { "yes" | "no" }?,
   attribute category {
-    "gentoo" | "main" | "ibm" | "linux" | "moo" | "nvidia"
+    "alpha"
+    | "gentoo"
+    | "main"
+    | "ibm"
+    | "linux"
+    | "moo"
+    | "nvidia"
+    | "kde"
+    | "plans"
+    | "freescale"
   }
 subtitle = element subtitle { subtitle.attlist, text }
 subtitle.attlist &= empty
@@ -52,17 +64,29 @@ poster = element poster { poster.attlist, text }
 poster.attlist &= empty
 faqindex = element faqindex { faqindex.attlist, title, section? }
 faqindex.attlist &= empty
-chapter = element chapter { chapter.attlist, title, section+ }
+chapter =
+  element chapter {
+    chapter.attlist,
+    (\include | (title, section+))
+  }
 chapter.attlist &= attribute id { text }?
-section = element section { section.attlist, title?, body+ }
-section.attlist &= attribute id { text }?
+section =
+  element section {
+    section.attlist,
+    (\include | (title?, body+))
+  }
 body =
   element body {
-    body.attlist, (block.class | glsa-latest | glsaindex | glepindex)+
+    body.attlist,
+    (mirrorlist
+     | \include
+     | (block.class | glsa-latest | glsaindex | glepindex)+)
   }
-body.attlist &= empty
 glsaindex = element glsaindex { glsaindex.attlist, empty }
 glsaindex.attlist &= empty
 glsa-latest = element glsa-latest { glsa-latest.attlist, empty }
 glsa-latest.attlist &= empty
-start = news | mainpage | values | guide
+mirrorlist = element mirrorlist { mirrorlist.attlist, empty }
+mirrorlist.attlist &=
+  [ a:defaultValue = "full" ] attribute select { "full" | "partial" }?
+start = news | included | mainpage | guide
diff --git a/project.rnc b/project.rnc
index 885c951..b41a750 100644
--- a/project.rnc
+++ b/project.rnc
@@ -3,7 +3,6 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 include "common.rnc"
 body.class = block.class | glepindex
 body = element body { body.attlist, body.class* }
-body.attlist &= empty
 project =
   element project {
     project.attlist,
@@ -61,7 +60,6 @@ plannedproject.attlist &= attribute name { text }
 extrachapter =
   element extrachapter { extrachapter.attlist, title, section+ }
 section = element section { section.attlist, title?, body+ }
-section.attlist &= empty
 extrachapter.attlist &=
   [ a:defaultValue = "bottom" ]
   attribute position {
@@ -105,4 +103,6 @@ milestone.attlist &=
   [ a:defaultValue = "no" ] attribute finished { "yes" | "no" }?
 depends = element depends { depends.attlist, text }
 depends.attlist &= attribute ref { xsd:IDREF }
-start = project | abstract | license | summary | version | values
+chapter |= notAllowed
+start =
+  abstract | \include | values | license | included | summary | project