Remove a few more errors

diff --git a/docbook/relaxng/tools/rng2dtd/overrides/docbook.xml b/docbook/relaxng/tools/rng2dtd/overrides/docbook.xml
index de9f829521fab045e917dbee2bd8f082384be88f..28f7cf498377fcd2814fe5cd55e2b4c959617764 100644 (file)
--- a/docbook/relaxng/tools/rng2dtd/overrides/docbook.xml
+++ b/docbook/relaxng/tools/rng2dtd/overrides/docbook.xml
@@ -6,6 +6,54 @@
   <del-pe name="db._any.attribute"/>
   <del-element name="db._any"/>
 
+  <!-- Fix info -->
+
+   <pe name="db._info">
+     <group>
+       <optional>
+         <ref name="db._title"/>
+       </optional>
+       <optional>
+         <ref name="db.info" optional="true"/>
+       </optional>
+     </group>
+   </pe>
+
+   <pe name="db._info.title.req">
+     <group>
+       <ref name="db._title.req"/>
+       <optional>
+         <ref name="db.info" optional="true"/>
+       </optional>
+     </group>
+   </pe>
+
+   <pe name="db._info.title.only">
+     <group>
+       <ref name="db._title.only"/>
+       <optional>
+         <ref name="db.info" optional="true"/>
+       </optional>
+     </group>
+   </pe>
+
+   <pe name="db._info.title.onlyreq">
+     <group>
+       <ref name="db._title.onlyreq"/>
+       <optional>
+         <ref name="db.info" optional="true"/>
+       </optional>
+     </group>
+   </pe>
+
+  <!-- Fix procedure  -->
+
+   <pe name="db.technical.blocks">
+      <choice>
+         <ref name="db.task"/>
+      </choice>
+   </pe>
+
   <!-- Fix indexterm -->
 
   <ref-rename name="db.indexterm.singular" rename="db.indexterm"/>
@@ -14,6 +62,253 @@
 
   <ref-rename name="db.html.caption" rename="db.caption"/>
 
+  <!-- Fix attribute co-constraints -->
+  <pe name="db.orgname.class.enumeration">
+    <choice>
+      <value>consortium</value>
+      <value>corporation</value>
+      <value>informal</value>
+      <value>nonprofit</value>
+      <value>other</value>
+    </choice>
+  </pe>
+
+   <del-pe name="db.orgname.class-other.attributes"/>
+   <del-pe name="db.orgname.class-enum.attribute"/>
+
+   <pe name="db.orgname.class.attribute">
+      <attdecl name="class">
+         <ref name="db.orgname.class.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.biblio.class.enumeration">
+      <choice>
+         <value>doi</value>
+         <value>isbn</value>
+         <value>isrn</value>
+         <value>issn</value>
+         <value>libraryofcongress</value>
+         <value>pubsnumber</value>
+         <value>uri</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.biblio.class-other.attributes"/>
+   <del-pe name="db.biblio.class-enum.attribute"/>
+
+   <pe name="db.biblio.class.attribute">
+      <attdecl name="class">
+         <ref name="db.biblio.class.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.othercredit.class.enumeration">
+      <choice>
+         <value>copyeditor</value>
+         <value>graphicdesigner</value>
+         <value>productioneditor</value>
+         <value>technicaleditor</value>
+         <value>translator</value>
+         <value>indexer</value>
+         <value>proofreader</value>
+         <value>coverdesigner</value>
+         <value>interiordesigner</value>
+         <value>illustrator</value>
+         <value>reviewer</value>
+         <value>typesetter</value>
+         <value>conversion</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.othercredit.class-other.attributes"/>
+   <del-pe name="db.othercredit.class-enum.attribute"/>
+
+   <pe name="db.othercredit.class.attribute">
+      <attdecl name="class">
+         <ref name="db.othercredit.class.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.bibliorelation.type.enumeration">
+      <choice>
+         <value>hasformat</value>
+         <value>haspart</value>
+         <value>hasversion</value>
+         <value>isformatof</value>
+         <value>ispartof</value>
+         <value>isreferencedby</value>
+         <value>isreplacedby</value>
+         <value>isrequiredby</value>
+         <value>isversionof</value>
+         <value>references</value>
+         <value>replaces</value>
+         <value>requires</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.bibliorelation.type-other.attributes"/>
+   <del-pe name="db.bibliorelation.type-enum.attribute"/>
+
+   <pe name="db.bibliorelation.type.attribute">
+      <attdecl name="type">
+         <ref name="db.bibliorelation.type.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.bridgehead.renderas.enumeration">
+      <choice>
+         <value>sect1</value>
+         <value>sect2</value>
+         <value>sect3</value>
+         <value>sect4</value>
+         <value>sect5</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.bridgehead.renderas-other.attributes"/>
+   <del-pe name="db.bridgehead.renderas-enum.attribute"/>
+
+   <pe name="db.bridgehead.renderas.attribute">
+      <attdecl name="class">
+         <ref name="db.bridgehead.renderas.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.bibliocoverage.spacial.enumeration"> <!-- [sic] -->
+      <choice>
+         <value>dcmipoint</value>
+         <value>iso3166</value>
+         <value>dcmibox</value>
+         <value>tgn</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.bibliocoverage.spatial-other.attributes"/>
+   <del-pe name="db.bibliocoverage.spatial-enum.attribute"/>
+
+   <pe name="db.bibliocoverage.spatial.attribute">
+      <attdecl name="spatial">
+         <ref name="db.bibliocoverage.spacial.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.bibliocoverage.temporal.enumeration">
+      <choice>
+         <value>dcmiperiod</value>
+         <value>w3c-dtf</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.bibliocoverage.temporal-other.attributes"/>
+   <del-pe name="db.bibliocoverage.temporal-enum.attribute"/>
+
+   <pe name="db.bibliocoverage.temporal.attribute">
+      <attdecl name="temporal">
+         <ref name="db.bibliocoverage.temporal.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.area.units.enumeration">
+      <choice>
+         <value>calspair</value>
+         <value>linecolumn</value>
+         <value>linecolumnpair</value>
+         <value>linerange</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.area.units-other.attributes"/>
+   <del-pe name="db.area.units-enum.attribute"/>
+
+   <pe name="db.area.units.attribute">
+      <attdecl name="class">
+         <ref name="db.area.units.enumeration"/>
+      </attdecl>
+   </pe>
+
+   <pe name="db.keycap.function.enumeration">
+      <choice>
+         <value>alt</value>
+         <value>backspace</value>
+         <value>command</value>
+         <value>control</value>
+         <value>delete</value>
+         <value>down</value>
+         <value>end</value>
+         <value>enter</value>
+         <value>escape</value>
+         <value>home</value>
+         <value>insert</value>
+         <value>left</value>
+         <value>meta</value>
+         <value>option</value>
+         <value>pagedown</value>
+         <value>pageup</value>
+         <value>right</value>
+         <value>shift</value>
+         <value>space</value>
+         <value>tab</value>
+         <value>up</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <del-pe name="db.keycap.function-enum.attribute"/>
+   <del-pe name="db.keycap.function-other.attributes"/>
+
+   <pe name="db.keycap.function.attrib">
+      <optional>
+         <attdecl name="function">
+            <ref name="db.keycap.function.enumeration"/>
+         </attdecl>
+      </optional>
+   </pe>
+
+   <pe name="db.keycombo.action.enumeration">
+      <choice>
+         <value>click</value>
+         <value>double-click</value>
+         <value>press</value>
+         <value>seq</value>
+         <value>simul</value>
+         <value>other</value>
+      </choice>
+   </pe>
+
+   <pe name="db.keycombo.action-enum.attribute"/>
+   <pe name="db.keycombo.action-other.attributes"/>
+
+   <pe name="db.keycombo.action.attrib">
+      <optional>
+         <attdecl name="action">
+            <ref name="db.keycombo.action.enumeration"/>
+         </attdecl>
+      </optional>
+   </pe>
+
+  <!-- Fix caption  -->
+
+   <pe name="db.caption.attlist">
+      <choice>
+         <ref name="db.caption.role.attribute" optional="true"/>
+         <ref name="db.common.linking.attributes"/>
+      </choice>
+   </pe>
+
+  <!-- Fix namest on entry -->
+
+   <pe name="db.specify-span-directly.attributes" depth="1">
+      <attdecl name="nameend"/>
+   </pe>
+
   <!-- Fix limited content model inlines -->
 
   <del-element name="db._foreignphrase"/>
@@ -72,4 +367,88 @@
   <ref-rename name="db.cals.entrytbl.thead" rename="db.thead"/>
   <ref-rename name="db.cals.entrytbl.tbody" rename="db.tbody"/>
 
+   <pe name="db.thead.attlist">
+      <choice>
+         <ref name="db.thead.role.attribute" optional="true"/>
+         <ref name="db.common.attributes"/>
+         <ref name="db.common.linking.attributes"/>
+         <ref name="db.html.coreattrs"/>
+         <ref name="db.html.i18n"/>
+         <ref name="db.html.events"/>
+         <ref name="db.html.cellhalign"/>
+         <ref name="db.html.cellvalign"/>
+      </choice>
+   </pe>
+
+   <pe name="db.tfoot.attlist">
+      <choice>
+         <ref name="db.tfoot.role.attribute" optional="true"/>
+         <ref name="db.common.attributes"/>
+         <ref name="db.common.linking.attributes"/>
+         <ref name="db.html.coreattrs"/>
+         <ref name="db.html.i18n"/>
+         <ref name="db.html.events"/>
+         <ref name="db.html.cellhalign"/>
+         <ref name="db.html.cellvalign"/>
+      </choice>
+   </pe>
+
+   <pe name="db.tbody.attlist">
+      <choice>
+         <ref name="db.tbody.role.attribute" optional="true"/>
+         <ref name="db.common.attributes"/>
+         <ref name="db.common.linking.attributes"/>
+         <ref name="db.html.coreattrs"/>
+         <ref name="db.html.i18n"/>
+         <ref name="db.html.events"/>
+         <ref name="db.html.cellhalign"/>
+         <ref name="db.html.cellvalign"/>
+      </choice>
+   </pe>
+
+   <pe name="db.table.attlist">
+      <choice>
+         <ref name="db.table.role.attribute" optional="true"/>
+         <ref name="db.table.label.attribute" optional="true"/>
+         <ref name="db.common.attributes"/>
+         <ref name="db.common.linking.attributes"/>
+         <ref name="db.tabstyle.attribute" optional="true"/>
+         <ref name="db.floatstyle.attribute" optional="true"/>
+         <ref name="db.orient.attribute" optional="true"/>
+         <ref name="db.colsep.attribute" optional="true"/>
+         <ref name="db.rowsep.attribute" optional="true"/>
+         <ref name="db.pgwide.attribute" optional="true"/>
+         <optional>
+            <attdecl name="shortentry"/>
+         </optional>
+         <optional>
+            <attdecl name="tocentry"/>
+         </optional>
+         <ref name="db.rowheader.attribute" optional="true"/>
+         <ref name="db.html.coreattrs"/>
+         <ref name="db.html.i18n"/>
+         <ref name="db.html.events"/>
+         <ref name="db.html.table.attributes"/>
+      </choice>
+   </pe>
+
+   <pe name="db.informaltable.attlist">
+      <choice>
+         <ref name="db.informaltable.role.attribute" optional="true"/>
+         <ref name="db.common.attributes"/>
+         <ref name="db.common.linking.attributes"/>
+         <ref name="db.tabstyle.attribute" optional="true"/>
+         <ref name="db.floatstyle.attribute" optional="true"/>
+         <ref name="db.orient.attribute" optional="true"/>
+         <ref name="db.colsep.attribute" optional="true"/>
+         <ref name="db.rowsep.attribute" optional="true"/>
+         <ref name="db.pgwide.attribute" optional="true"/>
+         <ref name="db.rowheader.attribute" optional="true"/>
+         <ref name="db.html.coreattrs"/>
+         <ref name="db.html.i18n"/>
+         <ref name="db.html.events"/>
+         <ref name="db.html.table.attributes"/>
+      </choice>
+   </pe>
+
 </dtd>