Update for new DTDs.

5 files changed, 42 insertions, 15 deletions

diff --git a/book.rnc b/book.rnc
index 8ede8da..ebec9f6 100644
--- a/book.rnc
+++ b/book.rnc
@@ -28,10 +28,18 @@ sections =
   }
 sections.attlist &= empty
 section =
-  element section { section.attlist, title, (body+ | subsection+) }
-subsection = element subsection { subsection.attlist, title?, body+ }
+  element section {
+    section.attlist,
+    (\include
+     | (title, (body+ | subsection+)))
+  }
+subsection =
+  element subsection {
+    subsection.attlist,
+    (\include | (title?, body+))
+  }
 subsection.attlist &=
   attribute id { text }?,
   attribute test { text }?
-body = element body { body.attlist, block.class+ }
+body = element body { body.attlist, (\include | block.class+) }
 start = glepindex | book | included | sections | summary
diff --git a/common.rnc b/common.rnc
index 3ce7e32..a5241d6 100644
--- a/common.rnc
+++ b/common.rnc
@@ -91,7 +91,9 @@ tr.attlist &=
 th = element th { th.attlist, (text | inline.class)* }
 th.attlist &=
   attribute colspan { text }?,
-  attribute rowspan { text }?
+  attribute rowspan { text }?,
+  [ a:defaultValue = "left" ]
+  attribute align { "left" | "center" | "right" }?
 ti = element ti { ti.attlist, (text | ti.class)* }
 ti.attlist &=
   attribute colspan { text }?,
diff --git a/glsa.rnc b/glsa.rnc
index 3ca92a0..f5adaf7 100644
--- a/glsa.rnc
+++ b/glsa.rnc
@@ -1,4 +1,6 @@
-# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/glsa.dtd,v 1.16 2007/11/05 00:54:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/glsa.dtd,v 1.17 2008/04/04 17:04:39 neysx Exp $
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
 glsa =
   element glsa {
@@ -62,10 +64,11 @@ announced = element announced { attlist.announced, text }
 attlist.announced &= empty
 # Element:      revised
 # Description:  Last revision date of the GLSA
+# Attribute:    @count: number of revisions
 # 
-# Example: <revised>2003-11-20</revised>
+# Example: <revised count="02">2003-11-20</revised>
 revised = element revised { attlist.revised, text }
-attlist.revised &= empty
+attlist.revised &= [ a:defaultValue = "01" ] attribute count { text }?
 # Element:      bug
 # Description:  Number of the bug on bugs.gentoo.org, if any
 # Occurrence:    The bug element can occur 0, 1 or more times
@@ -274,7 +277,7 @@ attlist.br &= empty
 # Description:  Add license information
 # 
 # Example:      <license/>
-license = element license { attlist.license, text }
+license = element license { attlist.license, EMPTY }
 attlist.license &= empty
 # Element:      metadata
 # Description:  Metadata information for GLSAMaker
@@ -288,4 +291,5 @@ attlist.metadata &=
   attribute revision { text }?,
   attribute author { text }?,
   attribute timestamp { text }?
+EMPTY |= notAllowed
 start = glsa
diff --git a/metadoc.rnc b/metadoc.rnc
index 3bae1c3..819ffa5 100644
--- a/metadoc.rnc
+++ b/metadoc.rnc
@@ -25,15 +25,15 @@ cat.attlist &=
 files = element files { files.attlist, file* }
 files.attlist &= empty
 file = element file { file.attlist, text* }
-file.attlist &= attribute id { text }
+file.attlist &= attribute id { xsd:ID }
 docs = element docs { docs.attlist, doc* }
 docs.attlist &= empty
-doc = element doc { doc.attlist, memberof*, fileid, bugs? }
-doc.attlist &= attribute id { text }
+doc = element doc { doc.attlist, memberof*, bookref?, bugs? }
+doc.attlist &= attribute fileid { text }
 memberof = element memberof { memberof.attlist, text* }
 memberof.attlist &= empty
-fileid = element fileid { fileid.attlist, text* }
-fileid.attlist &=
+bookref = element bookref { bookref.attlist, empty }
+bookref.attlist &=
   attribute vpart { text }?,
   attribute vchap { text }?
 bugs = element bugs { bugs.attlist, bug* }
diff --git a/project.rnc b/project.rnc
index b41a750..05b5c2d 100644
--- a/project.rnc
+++ b/project.rnc
@@ -13,6 +13,7 @@ project =
     description,
     longdescription,
     goals?,
+    recruitment?,
     (dev
      | resource
      | subproject
@@ -35,6 +36,18 @@ longdescription =
 longdescription.attlist &= empty
 goals = element goals { goals.attlist, body.class* }
 goals.attlist &= empty
+recruitment = element recruitment { recruitment.attlist, job+ }
+recruitment.attlist &= empty
+job =
+  element job { job.attlist, summary, details, requirements, contact+ }
+job.attlist &= empty
+details = element details { details.attlist, (text | inline.class)* }
+details.attlist &= empty
+requirements =
+  element requirements { requirements.attlist, (text | inline.class)* }
+requirements.attlist &= empty
+contact = element contact { contact.attlist, text }
+contact.attlist &= empty
 dev = element dev { dev.attlist, text }
 dev.attlist &=
   [ a:defaultValue = "member" ] attribute role { text }?,
@@ -69,6 +82,7 @@ extrachapter.attlist &=
     | "goals"
     | "resources"
     | "devs"
+    | "recruitment"
     | "tasks"
   }?
 herd = element herd { herd.attlist, empty }
@@ -104,5 +118,4 @@ milestone.attlist &=
 depends = element depends { depends.attlist, text }
 depends.attlist &= attribute ref { xsd:IDREF }
 chapter |= notAllowed
-start =
-  abstract | \include | values | license | included | summary | project
+start = abstract | \include | values | license | included | project