From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 27 Dec 2002 14:26:45 +0000 (+0000)
Subject: Updated to RELAX NG V1.0; DocBook V4.2
X-Git-Tag: release/1.79.1~6^2~5049
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb4fa85be05a17685c64e07eadd278e64ea4d46d;p=docbook-dsssl

Updated to RELAX NG V1.0; DocBook V4.2
---

diff --git a/schema/relaxng/calstblx.rng b/schema/relaxng/calstbl.rng
similarity index 95%
rename from schema/relaxng/calstblx.rng
rename to schema/relaxng/calstbl.rng
index 644b9c7e8..d06447598 100644
--- a/schema/relaxng/calstblx.rng
+++ b/schema/relaxng/calstbl.rng
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         xmlns="http://relaxng.org/ns/structure/0.9"
-          xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
-
+<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 <!-- ...................................................................... -->
-<!-- DocBook XML CALS Table Model V4.1.2 .................................... -->
+<!-- DocBook CALS Table Model V4.2 ........................................ -->
 <!-- File calstblx.mod .................................................... -->
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      This DTD is based on the CALS Table Model
      PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -24,7 +22,7 @@
      any purpose.  It is provided "as is" without expressed or implied
      warranty.
 
-     If you modify the DocBook XML DTD in any way, except for declaring and
+     If you modify the DocBook DTD in any way, except for declaring and
      referencing additional sets of general entities and declaring
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
@@ -34,17 +32,14 @@
      information, see http://www.oasis-open.org/docbook/.
 -->
 <!-- ...................................................................... -->
-
 <!-- This module contains the definitions for the CALS Table Model
      converted to XML.
 -->
-
-<!-- These definitions are not directly related to the table model, but are 
-     used in the default CALS table model and are usually defined elsewhere 
+<!-- These definitions are not directly related to the table model, but are
+     used in the default CALS table model and are usually defined elsewhere
      (and prior to the inclusion of this table module) in a CALS DTD. -->
 <!-- no if zero(s),
                                 yes if any other digits value -->
-
   <define name="yesorno">
     <data type="string"/>
   </define>
@@ -53,7 +48,6 @@
       <ref name="title"/>
     </optional>
   </define>
-
 <!-- default for use in entry content -->
 <!--
 The parameter entities as defined below provide the CALS table model
@@ -504,6 +498,6 @@ of the current application.
     </optional>
     <ref name="secur"/>
   </define>
-<!-- End of DocBook XML CALS Table Model V4.1.2 ............................. -->
+<!-- End of DocBook CALS Table Model V4.2 ................................. -->
 <!-- ...................................................................... -->
 </grammar>
diff --git a/schema/relaxng/dbcent.rng b/schema/relaxng/dbcent.rng
index 360feb225..dd979d79c 100644
--- a/schema/relaxng/dbcent.rng
+++ b/schema/relaxng/dbcent.rng
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         xmlns="http://relaxng.org/ns/structure/0.9"
-         xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
+         xmlns="http://relaxng.org/ns/structure/1.0"
+         xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 
 <!-- ...................................................................... -->
-<!-- DocBook XML character entities module V4.1.2 ........................... -->
+<!-- DocBook XML character entities module V4.2 ........................... -->
 <!-- File dbcentx.mod ..................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -22,7 +23,7 @@
      any purpose.  It is provided "as is" without expressed or implied
      warranty.
 
-     If you modify the DocBook XML DTD in any way, except for declaring and
+     If you modify the DocBook DTD in any way, except for declaring and
      referencing additional sets of general entities and declaring
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
diff --git a/schema/relaxng/dbgenent.rng b/schema/relaxng/dbgenent.rng
index 0a9fb8912..3f2350946 100644
--- a/schema/relaxng/dbgenent.rng
+++ b/schema/relaxng/dbgenent.rng
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         xmlns="http://relaxng.org/ns/structure/0.9"
-         xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
+         xmlns="http://relaxng.org/ns/structure/1.0"
+         xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 
 <!-- ...................................................................... -->
-<!-- DocBook XML additional general entities V4.1.2 ......................... -->
+<!-- DocBook additional general entities V4.2 ............................. -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, and the Organization for the Advancement of
-     Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      In DTD driver files referring to this module, please use an entity
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbgenent PUBLIC
-     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN"
      "dbgenent.mod">
      %dbgenent;
 -->
@@ -26,7 +27,6 @@
 
      o General entity declarations of any kind.  For example:
 
-       <!ENTITY happyface SDATA "insert-face">    (system-specific data)
        <!ENTITY productname "WinWidget">          (small boilerplate)
        <!ENTITY legal-notice SYSTEM "notice.sgm"> (large boilerplate)
 
@@ -42,7 +42,7 @@
        %all-titles;
 -->
 
-<!-- End of DocBook XML additional general entities V4.1.2 .................. -->
+<!-- End of DocBook additional general entities V4.2 ...................... -->
 <!-- ...................................................................... -->
 
 </grammar>
diff --git a/schema/relaxng/dbhier.rng b/schema/relaxng/dbhier.rng
index e77678a61..32beac03e 100644
--- a/schema/relaxng/dbhier.rng
+++ b/schema/relaxng/dbhier.rng
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         xmlns="http://relaxng.org/ns/structure/0.9"
-         xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
-
+<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 <!-- ...................................................................... -->
-<!-- DocBook XML document hierarchy module V4.1.2 ........................... -->
+<!-- DocBook document hierarchy module V4.2 ............................... -->
 <!-- File dbhierx.mod ..................................................... -->
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -21,7 +19,7 @@
      any purpose.  It is provided "as is" without expressed or implied
      warranty.
 
-     If you modify the DocBook XML DTD in any way, except for declaring and
+     If you modify the DocBook DTD in any way, except for declaring and
      referencing additional sets of general entities and declaring
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
@@ -45,7 +43,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbhier PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
      "dbhierx.mod">
      %dbhier;
 
@@ -113,6 +111,15 @@
       <ref name="local.refentry.class"/>
     </choice>
   </define>
+  <define name="local.section.class">
+    <notAllowed/>
+  </define>
+  <define name="section.class">
+    <choice>
+      <ref name="section"/>
+      <ref name="local.section.class"/>
+    </choice>
+  </define>
   <define name="local.nav.class">
     <notAllowed/>
   </define>
@@ -310,7 +317,7 @@
             <ref name="simplesect"/>
           </zeroOrMore>
           <zeroOrMore>
-            <ref name="section"/>
+            <ref name="section.class"/>
           </zeroOrMore>
         </choice>
       </group>
@@ -324,7 +331,7 @@
         <ref name="simplesect"/>
       </oneOrMore>
       <oneOrMore>
-        <ref name="section"/>
+        <ref name="section.class"/>
       </oneOrMore>
     </choice>
   </define>
@@ -379,21 +386,12 @@
     <element name="setinfo">
       <ref name="setinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
 <!--end of setinfo.element-->
-<!-- Contents: IDs of the ToC, Books, and SetIndex that comprise 
+<!-- Contents: IDs of the ToC, Books, and SetIndex that comprise
 		the set, in the order of their appearance -->
   <define name="setinfo.attlist" combine="interleave">
     <optional>
@@ -468,16 +466,7 @@
     <element name="bookinfo">
       <ref name="bookinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -561,6 +550,9 @@
   <define name="toc">
     <element name="toc">
       <ref name="toc.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="bookcomponent.title.content"/>
       </optional>
@@ -847,6 +839,9 @@
   <define name="lot">
     <element name="lot">
       <ref name="lot.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="bookcomponent.title.content"/>
       </optional>
@@ -879,16 +874,16 @@
     </element>
   </define>
 <!--end of lotentry.element-->
-<!-- SrcCredit: Information about the source of the entry, 
+<!-- SrcCredit: Information about the source of the entry,
 		as for a list of illustrations -->
 <!-- linkend: to element that this entry represents-->
   <define name="lotentry.attlist" combine="interleave">
+    <ref name="linkend.attrib"/>
+    <ref name="pagenum.attrib"/>
     <optional>
       <attribute name="srccredit"/>
     </optional>
-    <ref name="pagenum.attrib"/>
     <ref name="common.attrib"/>
-    <ref name="linkend.attrib"/>
     <ref name="lotentry.role.attrib"/>
     <ref name="local.lotentry.attrib"/>
   </define>
@@ -906,6 +901,9 @@
   <define name="appendix">
     <element name="appendix">
       <ref name="appendix.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="appendixinfo"/>
       </optional>
@@ -941,6 +939,9 @@
   <define name="chapter">
     <element name="chapter">
       <ref name="chapter.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="chapterinfo"/>
       </optional>
@@ -967,7 +968,7 @@
   </define>
 <!--end of chapter.attlist-->
 <!--end of chapter.module-->
-<!-- Note that Part was to have its content model reduced in V4.1.2.  This
+<!-- Note that Part was to have its content model reduced in V4.2.  This
 change will not be made after all. -->
   <define name="local.part.attrib">
     <empty/>
@@ -978,6 +979,9 @@ change will not be made after all. -->
   <define name="part">
     <element name="part">
       <ref name="part.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="partinfo"/>
       </optional>
@@ -1010,6 +1014,9 @@ change will not be made after all. -->
   <define name="preface">
     <element name="preface">
       <ref name="preface.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="prefaceinfo"/>
       </optional>
@@ -1044,6 +1051,9 @@ change will not be made after all. -->
   <define name="reference">
     <element name="reference">
       <ref name="reference.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <optional>
         <ref name="referenceinfo"/>
       </optional>
@@ -1086,8 +1096,8 @@ change will not be made after all. -->
   <define name="partintro.attlist" combine="interleave">
     <ref name="label.attrib"/>
     <ref name="common.attrib"/>
-    <ref name="local.partintro.attrib"/>
     <ref name="partintro.role.attrib"/>
+    <ref name="local.partintro.attrib"/>
   </define>
 <!--end of partintro.attlist-->
 <!--end of partintro.module-->
@@ -1103,16 +1113,7 @@ change will not be made after all. -->
     <element name="appendixinfo">
       <ref name="appendixinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1134,16 +1135,7 @@ change will not be made after all. -->
     <element name="bibliographyinfo">
       <ref name="bibliographyinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1165,16 +1157,7 @@ change will not be made after all. -->
     <element name="chapterinfo">
       <ref name="chapterinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1196,16 +1179,7 @@ change will not be made after all. -->
     <element name="glossaryinfo">
       <ref name="glossaryinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1227,16 +1201,7 @@ change will not be made after all. -->
     <element name="indexinfo">
       <ref name="indexinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1258,16 +1223,7 @@ change will not be made after all. -->
     <element name="setindexinfo">
       <ref name="setindexinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1289,16 +1245,7 @@ change will not be made after all. -->
     <element name="partinfo">
       <ref name="partinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1320,16 +1267,7 @@ change will not be made after all. -->
     <element name="prefaceinfo">
       <ref name="prefaceinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1351,16 +1289,7 @@ change will not be made after all. -->
     <element name="refentryinfo">
       <ref name="refentryinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1372,6 +1301,28 @@ change will not be made after all. -->
   </define>
 <!--end of refentryinfo.attlist-->
 <!--end of refentryinfo.module-->
+  <define name="local.refsectioninfo.attrib">
+    <empty/>
+  </define>
+  <define name="refsectioninfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsectioninfo">
+    <element name="refsectioninfo">
+      <ref name="refsectioninfo.attlist"/>
+      <oneOrMore>
+        <ref name="info.class"/>
+      </oneOrMore>
+    </element>
+  </define>
+<!--end of refsectioninfo.element-->
+  <define name="refsectioninfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refsectioninfo.role.attrib"/>
+    <ref name="local.refsectioninfo.attrib"/>
+  </define>
+<!--end of refsectioninfo.attlist-->
+<!--end of refsectioninfo.module-->
   <define name="local.refsect1info.attrib">
     <empty/>
   </define>
@@ -1382,16 +1333,7 @@ change will not be made after all. -->
     <element name="refsect1info">
       <ref name="refsect1info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1413,16 +1355,7 @@ change will not be made after all. -->
     <element name="refsect2info">
       <ref name="refsect2info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1444,16 +1377,7 @@ change will not be made after all. -->
     <element name="refsect3info">
       <ref name="refsect3info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1475,16 +1399,7 @@ change will not be made after all. -->
     <element name="refsynopsisdivinfo">
       <ref name="refsynopsisdivinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1506,16 +1421,7 @@ change will not be made after all. -->
     <element name="referenceinfo">
       <ref name="referenceinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1537,16 +1443,7 @@ change will not be made after all. -->
     <element name="sect1info">
       <ref name="sect1info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1567,16 +1464,7 @@ change will not be made after all. -->
     <element name="sect2info">
       <ref name="sect2info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1597,16 +1485,7 @@ change will not be made after all. -->
     <element name="sect3info">
       <ref name="sect3info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1627,16 +1506,7 @@ change will not be made after all. -->
     <element name="sect4info">
       <ref name="sect4info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1657,16 +1527,7 @@ change will not be made after all. -->
     <element name="sect5info">
       <ref name="sect5info.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1705,7 +1566,10 @@ change will not be made after all. -->
               <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="section"/>
+              <ref name="section.class"/>
+            </zeroOrMore>
+            <zeroOrMore>
+              <ref name="simplesect"/>
             </zeroOrMore>
           </choice>
         </group>
@@ -1713,7 +1577,10 @@ change will not be made after all. -->
           <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="section"/>
+          <ref name="section.class"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="simplesect"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
@@ -1741,16 +1608,7 @@ change will not be made after all. -->
     <element name="sectioninfo">
       <ref name="sectioninfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -2532,6 +2390,9 @@ change will not be made after all. -->
   <define name="refentry">
     <element name="refentry">
       <ref name="refentry.attlist"/>
+      <optional>
+        <ref name="beginpage"/>
+      </optional>
       <zeroOrMore>
         <ref name="ndxterm.class"/>
       </zeroOrMore>
@@ -2551,9 +2412,14 @@ change will not be made after all. -->
       <optional>
         <ref name="refsynopsisdiv"/>
       </optional>
-      <oneOrMore>
-        <ref name="refsect1"/>
-      </oneOrMore>
+      <choice>
+        <oneOrMore>
+          <ref name="refsect1"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="refsection"/>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
 <!--end of refentry.element-->
@@ -2784,6 +2650,43 @@ change will not be made after all. -->
   </define>
 <!--end of refsynopsisdiv.attlist-->
 <!--end of refsynopsisdiv.module-->
+  <define name="local.refsection.attrib">
+    <empty/>
+  </define>
+  <define name="refsection.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsection">
+    <element name="refsection">
+      <ref name="refsection.attlist"/>
+      <optional>
+        <ref name="refsectioninfo"/>
+      </optional>
+      <ref name="refsect.title.content"/>
+      <choice>
+        <group>
+          <oneOrMore>
+            <ref name="refcomponent.mix"/>
+          </oneOrMore>
+          <zeroOrMore>
+            <ref name="refsection"/>
+          </zeroOrMore>
+        </group>
+        <oneOrMore>
+          <ref name="refsection"/>
+        </oneOrMore>
+      </choice>
+    </element>
+  </define>
+<!--end of refsection.element-->
+  <define name="refsection.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="refsection.role.attrib"/>
+    <ref name="local.refsection.attrib"/>
+  </define>
+<!--end of refsection.attlist-->
+<!--end of refsection.module-->
   <define name="local.refsect1.attrib">
     <empty/>
   </define>
@@ -2951,6 +2854,6 @@ change will not be made after all. -->
   </define>
 <!--end of article.attlist-->
 <!--end of article.module-->
-<!-- End of DocBook XML document hierarchy module V4.1.2 .................... -->
+<!-- End of DocBook document hierarchy module V4.2 ........................ -->
 <!-- ...................................................................... -->
 </grammar>
diff --git a/schema/relaxng/dbnotn.rng b/schema/relaxng/dbnotn.rng
index 5455a08e7..b29851c69 100644
--- a/schema/relaxng/dbnotn.rng
+++ b/schema/relaxng/dbnotn.rng
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/0.9" xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
+<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 <!-- ...................................................................... -->
-<!-- DocBook XML notations module V4.1.2 .................................... -->
+<!-- DocBook notations module V4.2 ........................................ -->
 <!-- File dbnotnx.mod ..................................................... -->
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -35,7 +36,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbnotn PUBLIC
-     "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.2//EN"
      "dbnotnx.mod">
      %dbnotn;
 
@@ -74,11 +75,12 @@
       <value>TIFF</value>
       <value>WMF</value>
       <value>WPG</value>
+      <value>SVG</value>
       <value>linespecific</value>
       <ref name="local.notation.class"/>
     </choice>
   </define>
 <!--WordPerfect Graphic format-->
-<!-- End of DocBook XML notations module V4.1.2 ............................. -->
+<!-- End of DocBook notations module V4.2 ................................. -->
 <!-- ...................................................................... -->
 </grammar>
diff --git a/schema/relaxng/dbpool.rng b/schema/relaxng/dbpool.rng
index 795d60e4f..ce09708f2 100644
--- a/schema/relaxng/dbpool.rng
+++ b/schema/relaxng/dbpool.rng
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         xmlns="http://relaxng.org/ns/structure/0.9"
-         xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
+<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 <!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.1.2 ............................. -->
+<!-- DocBook XML information pool module V4.2 ............................. -->
 <!-- File dbpoolx.mod ..................................................... -->
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -50,7 +49,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbpool PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
      "dbpoolx.mod">
      %dbpool;
 
@@ -258,6 +257,7 @@
       <ref name="quote"/>
       <ref name="trademark"/>
       <ref name="wordasword"/>
+      <ref name="personname"/>
       <ref name="local.gen.char.class"/>
     </choice>
   </define>
@@ -299,6 +299,7 @@
       <ref name="errorcode"/>
       <ref name="errorname"/>
       <ref name="errortype"/>
+      <ref name="errortext"/>
       <ref name="filename"/>
       <ref name="function"/>
       <ref name="guibutton"/>
@@ -386,6 +387,14 @@
       <ref name="local.inlineobj.char.class"/>
     </choice>
   </define>
+<!-- ...................................................................... -->
+<!-- Entities for content models .......................................... -->
+  <define name="formalobject.title.content">
+    <ref name="title"/>
+    <optional>
+      <ref name="titleabbrev"/>
+    </optional>
+  </define>
 <!-- Redeclaration placeholder ............................................ -->
 <!-- For redeclaring entities that are declared after this point while
      retaining their references to the entities that are declared before
@@ -643,10 +652,31 @@ f. Just BlockQuote; no other informal objects.
       <ref name="videoobject"/>
       <ref name="audioobject"/>
       <ref name="imageobject"/>
+      <ref name="textobject"/>
       <ref name="local.mediaobject.mix"/>
     </choice>
   </define>
+  <define name="local.listpreamble.mix">
+    <notAllowed/>
+  </define>
+  <define name="listpreamble.mix">
+    <choice>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="genobj.class"/>
+      <ref name="descobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.listpreamble.mix"/>
+    </choice>
+  </define>
 <!-- Character-level mixtures ............................................. -->
+<!-- sgml.features -->
+<!-- not [sgml.features[ -->
+<!-- ]] not sgml.features -->
 <!--
                     #PCD xref word link cptr base dnfo othr inob (synop)
 para.char.mix         X    X    X    X    X    X    X    X    X
@@ -794,17 +824,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 <!--ENTITY % bibliocomponent.mix (see Bibliographic section, below)-->
 <!--ENTITY % person.ident.mix (see Bibliographic section, below)-->
 <!-- ...................................................................... -->
-<!-- Entities for content models .......................................... -->
-  <define name="formalobject.title.content">
-    <ref name="title"/>
-    <optional>
-      <ref name="titleabbrev"/>
-    </optional>
-  </define>
-<!-- ...................................................................... -->
 <!-- Entities for attributes and attribute components ..................... -->
 <!-- Effectivity attributes ............................................... -->
-<!-- Arch: Computer or chip architecture to which element applies; no 
+<!-- Arch: Computer or chip architecture to which element applies; no
 	default -->
   <define name="arch.attrib">
     <optional>
@@ -843,7 +865,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       <attribute name="security"/>
     </optional>
   </define>
-<!-- UserLevel: Level of user experience to which element applies; no 
+<!-- UserLevel: Level of user experience to which element applies; no
 	default -->
   <define name="userlevel.attrib">
     <optional>
@@ -879,7 +901,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       </attribute>
     </optional>
   </define>
-<!-- Id: Unique identifier of element; a value must be supplied; no 
+<!-- Id: Unique identifier of element; a value must be supplied; no
 	default -->
   <define name="idreq.attrib">
     <attribute name="id">
@@ -956,13 +978,13 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   </define>
 <!-- EntityRef: Name of an external entity containing the content
 	of the graphic -->
-<!-- FileRef: Filename, qualified by a pathname if desired, 
+<!-- FileRef: Filename, qualified by a pathname if desired,
 	designating the file containing the content of the graphic -->
 <!-- Format: Notation of the element content, if any -->
 <!-- SrcCredit: Information about the source of the Graphic -->
 <!-- Width: Same as CALS reprowid (desired width) -->
 <!-- Depth: Same as CALS reprodep (desired depth) -->
-<!-- Align: Same as CALS hplace with 'none' removed; #IMPLIED means 
+<!-- Align: Same as CALS hplace with 'none' removed; #IMPLIED means
 	application-specific -->
 <!-- Scale: Conflation of CALS hscale and vscale -->
 <!-- Scalefit: Same as CALS scalefit -->
@@ -988,9 +1010,15 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="contentwidth"/>
+    </optional>
     <optional>
       <attribute name="depth"/>
     </optional>
+    <optional>
+      <attribute name="contentdepth"/>
+    </optional>
     <optional>
       <attribute name="align">
         <choice>
@@ -1000,6 +1028,15 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="scale"/>
     </optional>
@@ -1013,8 +1050,8 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="local.keyaction.attrib">
     <empty/>
   </define>
-<!-- Action: Key combination type; default is unspecified if one 
-	child element, Simul if there is more than one; if value is 
+<!-- Action: Key combination type; default is unspecified if one
+	child element, Simul if there is more than one; if value is
 	Other, the OtherAction attribute must have a nonempty value -->
 <!-- OtherAction: User-defined key combination type -->
   <define name="keyaction.attrib">
@@ -1075,7 +1112,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       <data type="IDREF"/>
     </attribute>
   </define>
-<!-- Linkends: link to one or more sets of related information; no 
+<!-- Linkends: link to one or more sets of related information; no
 	default -->
   <define name="linkends.attrib">
     <optional>
@@ -1248,6 +1285,11 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       <ref name="issn"/>
       <ref name="issuenum"/>
       <ref name="orgname"/>
+      <ref name="biblioid"/>
+      <ref name="citebiblioid"/>
+      <ref name="bibliosource"/>
+      <ref name="bibliorelation"/>
+      <ref name="bibliocoverage"/>
       <ref name="othercredit"/>
       <ref name="pagenums"/>
       <ref name="printhistory"/>
@@ -1265,11 +1307,30 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       <ref name="titleabbrev"/>
       <ref name="volumenum"/>
       <ref name="citetitle"/>
+      <ref name="personname"/>
       <ref name="person.ident.mix"/>
       <ref name="ndxterm.class"/>
       <ref name="local.bibliocomponent.mix"/>
     </choice>
   </define>
+<!-- I don't think this is well placed, but it needs to be here because of -->
+<!-- the reference to bibliocomponent.mix -->
+  <define name="local.info.class">
+    <notAllowed/>
+  </define>
+  <define name="info.class">
+    <choice>
+      <ref name="graphic"/>
+      <ref name="mediaobject"/>
+      <ref name="legalnotice"/>
+      <ref name="modespec"/>
+      <ref name="subjectset"/>
+      <ref name="keywordset"/>
+      <ref name="itermset"/>
+      <ref name="bibliocomponent.mix"/>
+      <ref name="local.info.class"/>
+    </choice>
+  </define>
   <define name="local.biblioentry.attrib">
     <empty/>
   </define>
@@ -1331,16 +1392,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     <element name="articleinfo">
       <ref name="articleinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -1402,8 +1454,8 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     <optional>
       <attribute name="relation"/>
     </optional>
-    <ref name="bibliomset.role.attrib"/>
     <ref name="common.attrib"/>
+    <ref name="bibliomset.role.attrib"/>
     <ref name="local.bibliomset.attrib"/>
   </define>
 <!--end of bibliomset.attlist-->
@@ -1475,7 +1527,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     </element>
   </define>
 <!--end of subject.element-->
-<!-- Weight: Ranking of this group of SubjectTerms relative 
+<!-- Weight: Ranking of this group of SubjectTerms relative
 		to others, 0 is low, no highest value specified -->
   <define name="subject.attlist" combine="interleave">
     <optional>
@@ -1573,6 +1625,29 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   </define>
 <!--end of itermset.attlist-->
 <!--end of itermset.module-->
+<!-- Bibliographic info for "blocks" -->
+  <define name="local.blockinfo.attrib">
+    <empty/>
+  </define>
+  <define name="blockinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="blockinfo">
+    <element name="blockinfo">
+      <ref name="blockinfo.attlist"/>
+      <oneOrMore>
+        <ref name="info.class"/>
+      </oneOrMore>
+    </element>
+  </define>
+<!--end of blockinfo.element-->
+  <define name="blockinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="blockinfo.role.attrib"/>
+    <ref name="local.blockinfo.attrib"/>
+  </define>
+<!--end of blockinfo.attlist-->
+<!--end of blockinfo.module-->
 <!-- ...................................................................... -->
 <!-- Compound (section-ish) elements ...................................... -->
 <!-- Message set ...................... -->
@@ -1585,6 +1660,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="msgset">
     <element name="msgset">
       <ref name="msgset.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
@@ -1644,14 +1722,13 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     <element name="simplemsgentry">
       <ref name="simplemsgentry.attlist"/>
       <ref name="msgtext"/>
-      <ref name="msgexplan"/>
+      <oneOrMore>
+        <ref name="msgexplan"/>
+      </oneOrMore>
     </element>
   </define>
 <!--end of simplemsgentry.element-->
   <define name="simplemsgentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="simplemsgentry.role.attrib"/>
-    <ref name="local.simplemsgentry.attrib"/>
     <optional>
       <attribute name="audience"/>
     </optional>
@@ -1661,6 +1738,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     <optional>
       <attribute name="origin"/>
     </optional>
+    <ref name="common.attrib"/>
+    <ref name="simplemsgentry.role.attrib"/>
+    <ref name="local.simplemsgentry.attrib"/>
   </define>
 <!--end of simplemsgentry.attlist-->
 <!--end of simplemsgentry.module-->
@@ -1882,15 +1962,18 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 <!--end of msgexplan.module-->
 <!--end of msgset.content.module-->
 <!-- QandASet ........................ -->
-  <define name="local.qandset.attrib">
+  <define name="local.qandaset.attrib">
     <empty/>
   </define>
-  <define name="qandset.role.attrib">
+  <define name="qandaset.role.attrib">
     <ref name="role.attrib"/>
   </define>
   <define name="qandaset">
     <element name="qandaset">
       <ref name="qandaset.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
@@ -1907,7 +1990,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       </choice>
     </element>
   </define>
-<!--end of qandset.element-->
+<!--end of qandaset.element-->
   <define name="qandaset.attlist" combine="interleave">
     <optional>
       <attribute name="defaultlabel">
@@ -1919,11 +2002,11 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       </attribute>
     </optional>
     <ref name="common.attrib"/>
-    <ref name="qandset.role.attrib"/>
-    <ref name="local.qandset.attrib"/>
+    <ref name="qandaset.role.attrib"/>
+    <ref name="local.qandaset.attrib"/>
   </define>
-<!--end of qandset.attlist-->
-<!--end of qandset.module-->
+<!--end of qandaset.attlist-->
+<!--end of qandaset.module-->
   <define name="local.qandadiv.attrib">
     <empty/>
   </define>
@@ -1933,6 +2016,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="qandadiv">
     <element name="qandadiv">
       <ref name="qandadiv.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
@@ -1966,6 +2052,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="qandaentry">
     <element name="qandaentry">
       <ref name="qandaentry.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="revhistory"/>
       </optional>
@@ -2058,7 +2147,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   </define>
 <!--end of label.attlist-->
 <!--end of label.module-->
-<!--end of qandset.content.module-->
+<!--end of qandaset.content.module-->
 <!-- Procedure ........................ -->
   <define name="local.procedure.attrib">
     <empty/>
@@ -2069,6 +2158,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="procedure">
     <element name="procedure">
       <ref name="procedure.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
@@ -2183,16 +2275,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
     <element name="sidebarinfo">
       <ref name="sidebarinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -2285,6 +2368,31 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   </define>
 <!--end of authorblurb.attlist-->
 <!--end of authorblurb.module-->
+  <define name="local.personblurb.attrib">
+    <empty/>
+  </define>
+  <define name="personblurb.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="personblurb">
+    <element name="personblurb">
+      <ref name="personblurb.attlist"/>
+      <optional>
+        <ref name="title"/>
+      </optional>
+      <oneOrMore>
+        <ref name="para.class"/>
+      </oneOrMore>
+    </element>
+  </define>
+<!--end of personblurb.element-->
+  <define name="personblurb.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="personblurb.role.attrib"/>
+    <ref name="local.personblurb.attrib"/>
+  </define>
+<!--end of personblurb.attlist-->
+<!--end of personblurb.module-->
   <define name="local.blockquote.attrib">
     <empty/>
   </define>
@@ -2406,7 +2514,10 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
         <ref name="attribution"/>
       </optional>
       <oneOrMore>
-        <ref name="para.class"/>
+        <choice>
+          <ref name="para.class"/>
+          <ref name="literallayout"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -2799,9 +2910,15 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="itemizedlist">
     <element name="itemizedlist">
       <ref name="itemizedlist.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
+      <zeroOrMore>
+        <ref name="listpreamble.mix"/>
+      </zeroOrMore>
       <oneOrMore>
         <ref name="listitem"/>
       </oneOrMore>
@@ -2837,9 +2954,15 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="orderedlist">
     <element name="orderedlist">
       <ref name="orderedlist.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
+      <zeroOrMore>
+        <ref name="listpreamble.mix"/>
+      </zeroOrMore>
       <oneOrMore>
         <ref name="listitem"/>
       </oneOrMore>
@@ -2853,7 +2976,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 		within which they are nested (e.g., 1a and 1b within 1,
 		rather than a and b) -->
 <!-- Continuation: Where list numbering begins afresh (Restarts,
-		the default) or continues that of the immediately preceding 
+		the default) or continues that of the immediately preceding
 		list (Continues) -->
 <!-- Spacing: Whether the vertical space in the list should be
 		compressed -->
@@ -2940,7 +3063,6 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
-      <ref name="segtitle"/>
       <oneOrMore>
         <ref name="segtitle"/>
       </oneOrMore>
@@ -2988,7 +3110,6 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="seglistitem">
     <element name="seglistitem">
       <ref name="seglistitem.attlist"/>
-      <ref name="seg"/>
       <oneOrMore>
         <ref name="seg"/>
       </oneOrMore>
@@ -3100,9 +3221,15 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="variablelist">
     <element name="variablelist">
       <ref name="variablelist.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
+      <zeroOrMore>
+        <ref name="listpreamble.mix"/>
+      </zeroOrMore>
       <oneOrMore>
         <ref name="varlistentry"/>
       </oneOrMore>
@@ -3235,6 +3362,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="example">
     <element name="example">
       <ref name="example.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <ref name="formalobject.title.content"/>
       <oneOrMore>
         <ref name="example.mix"/>
@@ -3260,6 +3390,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="informalexample">
     <element name="informalexample">
       <ref name="informalexample.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <oneOrMore>
         <ref name="example.mix"/>
       </oneOrMore>
@@ -3320,9 +3453,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 <!-- Units: global unit of measure in which coordinates in
 		this spec are expressed:
 
-		- CALSPair "x1,y1 x2,y2": lower-left and upper-right 
-		coordinates in a rectangle describing repro area in which 
-		graphic is placed, where X and Y dimensions are each some 
+		- CALSPair "x1,y1 x2,y2": lower-left and upper-right
+		coordinates in a rectangle describing repro area in which
+		graphic is placed, where X and Y dimensions are each some
 		number 0..10000 (taken from CALS graphic attributes)
 
 		- LineColumn "line column": line number and column number
@@ -3339,7 +3472,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 		- Other: directive to look at value of OtherUnits attribute
 		to get implementation-specific keyword
 
-		The default is implementation-specific; usually dependent on 
+		The default is implementation-specific; usually dependent on
 		the parent element (GraphicCO gets CALSPair, ProgramListingCO
 		and ScreenCO get LineColumn) -->
 <!-- OtherUnits: User-defined units -->
@@ -3467,7 +3600,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
         <choice>
           <ref name="para.char.mix"/>
           <ref name="co"/>
+          <ref name="coref"/>
           <ref name="lineannotation"/>
+          <ref name="textobject"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -3494,8 +3629,10 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
       <zeroOrMore>
         <choice>
           <ref name="para.char.mix"/>
-          <ref name="lineannotation"/>
           <ref name="co"/>
+          <ref name="coref"/>
+          <ref name="textobject"/>
+          <ref name="lineannotation"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -3558,6 +3695,8 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
         <choice>
           <ref name="para.char.mix"/>
           <ref name="co"/>
+          <ref name="coref"/>
+          <ref name="textobject"/>
           <ref name="lineannotation"/>
         </choice>
       </zeroOrMore>
@@ -3634,6 +3773,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="figure">
     <element name="figure">
       <ref name="figure.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <ref name="formalobject.title.content"/>
       <oneOrMore>
         <choice>
@@ -3674,6 +3816,9 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
   <define name="informalfigure">
     <element name="informalfigure">
       <ref name="informalfigure.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="figure.mix"/>
@@ -3789,13 +3934,9 @@ in the text (no (0) value, the default)
       <optional>
         <ref name="objectinfo"/>
       </optional>
-      <ref name="mediaobject.mix"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="mediaobject.mix"/>
-          <ref name="textobject"/>
-        </choice>
-      </zeroOrMore>
+      <oneOrMore>
+        <ref name="mediaobject.mix"/>
+      </oneOrMore>
       <optional>
         <ref name="caption"/>
       </optional>
@@ -3821,13 +3962,9 @@ in the text (no (0) value, the default)
       <optional>
         <ref name="objectinfo"/>
       </optional>
-      <ref name="mediaobject.mix"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="mediaobject.mix"/>
-          <ref name="textobject"/>
-        </choice>
-      </zeroOrMore>
+      <oneOrMore>
+        <ref name="mediaobject.mix"/>
+      </oneOrMore>
     </element>
   </define>
 <!--end of inlinemediaobject.element-->
@@ -3921,6 +4058,7 @@ in the text (no (0) value, the default)
       </optional>
       <choice>
         <ref name="phrase"/>
+        <ref name="textdata"/>
         <oneOrMore>
           <ref name="textobject.mix"/>
         </oneOrMore>
@@ -3945,16 +4083,7 @@ in the text (no (0) value, the default)
     <element name="objectinfo">
       <ref name="objectinfo.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="legalnotice"/>
-          <ref name="modespec"/>
-          <ref name="subjectset"/>
-          <ref name="keywordset"/>
-          <ref name="itermset"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="info.class"/>
       </oneOrMore>
     </element>
   </define>
@@ -3968,7 +4097,7 @@ in the text (no (0) value, the default)
 <!--end of objectinfo.module-->
 <!--EntityRef: Name of an external entity containing the content
 	of the object data-->
-<!--FileRef: Filename, qualified by a pathname if desired, 
+<!--FileRef: Filename, qualified by a pathname if desired,
 	designating the file containing the content of the object data-->
 <!--Format: Notation of the element content, if any-->
 <!--SrcCredit: Information about the source of the image-->
@@ -4011,19 +4140,23 @@ in the text (no (0) value, the default)
 <!--end of videodata.element-->
 <!--Width: Same as CALS reprowid (desired width)-->
 <!--Depth: Same as CALS reprodep (desired depth)-->
-<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means 
+<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means
 	application-specific-->
 <!--Scale: Conflation of CALS hscale and vscale-->
 <!--Scalefit: Same as CALS scalefit-->
   <define name="videodata.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="objectdata.attrib"/>
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="contentwidth"/>
+    </optional>
     <optional>
       <attribute name="depth"/>
     </optional>
+    <optional>
+      <attribute name="contentdepth"/>
+    </optional>
     <optional>
       <attribute name="align">
         <choice>
@@ -4033,6 +4166,15 @@ in the text (no (0) value, the default)
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="scale"/>
     </optional>
@@ -4041,6 +4183,8 @@ in the text (no (0) value, the default)
         <ref name="yesorno.attvals"/>
       </attribute>
     </optional>
+    <ref name="objectdata.attrib"/>
+    <ref name="common.attrib"/>
     <ref name="videodata.role.attrib"/>
     <ref name="local.videodata.attrib"/>
   </define>
@@ -4060,10 +4204,10 @@ in the text (no (0) value, the default)
   </define>
 <!--end of audiodata.element-->
   <define name="audiodata.attlist" combine="interleave">
-    <ref name="common.attrib"/>
     <ref name="objectdata.attrib"/>
-    <ref name="local.audiodata.attrib"/>
+    <ref name="common.attrib"/>
     <ref name="audiodata.role.attrib"/>
+    <ref name="local.audiodata.attrib"/>
   </define>
 <!--end of audiodata.attlist-->
 <!--end of audiodata.module-->
@@ -4082,19 +4226,23 @@ in the text (no (0) value, the default)
 <!--end of imagedata.element-->
 <!--Width: Same as CALS reprowid (desired width)-->
 <!--Depth: Same as CALS reprodep (desired depth)-->
-<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means 
+<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means
 	application-specific-->
 <!--Scale: Conflation of CALS hscale and vscale-->
 <!--Scalefit: Same as CALS scalefit-->
   <define name="imagedata.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="objectdata.attrib"/>
     <optional>
       <attribute name="width"/>
     </optional>
+    <optional>
+      <attribute name="contentwidth"/>
+    </optional>
     <optional>
       <attribute name="depth"/>
     </optional>
+    <optional>
+      <attribute name="contentdepth"/>
+    </optional>
     <optional>
       <attribute name="align">
         <choice>
@@ -4104,6 +4252,15 @@ in the text (no (0) value, the default)
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="scale"/>
     </optional>
@@ -4112,11 +4269,37 @@ in the text (no (0) value, the default)
         <ref name="yesorno.attvals"/>
       </attribute>
     </optional>
-    <ref name="local.imagedata.attrib"/>
+    <ref name="objectdata.attrib"/>
+    <ref name="common.attrib"/>
     <ref name="imagedata.role.attrib"/>
+    <ref name="local.imagedata.attrib"/>
   </define>
 <!--end of imagedata.attlist-->
 <!--end of imagedata.module-->
+  <define name="local.textdata.attrib">
+    <empty/>
+  </define>
+  <define name="textdata.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="textdata">
+    <element name="textdata">
+      <ref name="textdata.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of textdata.element-->
+  <define name="textdata.attlist" combine="interleave">
+    <optional>
+      <attribute name="encoding"/>
+    </optional>
+    <ref name="objectdata.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="textdata.role.attrib"/>
+    <ref name="local.textdata.attrib"/>
+  </define>
+<!--end of textdata.attlist-->
+<!--end of textdata.module-->
   <define name="local.caption.attrib">
     <empty/>
   </define>
@@ -4134,8 +4317,8 @@ in the text (no (0) value, the default)
 <!--end of caption.element-->
   <define name="caption.attlist" combine="interleave">
     <ref name="common.attrib"/>
-    <ref name="local.caption.attrib"/>
     <ref name="caption.role.attrib"/>
+    <ref name="local.caption.attrib"/>
   </define>
 <!--end of caption.attlist-->
 <!--end of caption.module-->
@@ -4231,6 +4414,9 @@ in the text (no (0) value, the default)
   <define name="equation">
     <element name="equation">
       <ref name="equation.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="formalobject.title.content"/>
       </optional>
@@ -4258,6 +4444,9 @@ in the text (no (0) value, the default)
   <define name="informalequation">
     <element name="informalequation">
       <ref name="informalequation.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <ref name="equation.content"/>
     </element>
   </define>
@@ -4318,7 +4507,7 @@ in the text (no (0) value, the default)
   <define name="bodyatt">
     <ref name="label.attrib"/>
   </define>
-<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row, 
+<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
      EntryTbl, and Entry (and InformalTable element). -->
   <define name="secur">
     <ref name="common.attrib"/>
@@ -4330,10 +4519,16 @@ in the text (no (0) value, the default)
   </define>
 <!-- Content model for Table. -->
   <define name="tbl.table.mdl">
+    <optional>
+      <ref name="blockinfo"/>
+    </optional>
     <ref name="formalobject.title.content"/>
     <zeroOrMore>
       <ref name="ndxterm.class"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="textobject"/>
+    </zeroOrMore>
     <choice>
       <oneOrMore>
         <ref name="graphic"/>
@@ -4354,7 +4549,7 @@ in the text (no (0) value, the default)
     </choice>
   </define>
 <!-- Reference CALS Table Model -->
-  <include href="calstblx.rng"/>
+  <include href="calstbl.rng"/>
 <!--end of table.module-->
 <!-- Note that InformalTable is dependent on some of the entity
      declarations that customize Table. -->
@@ -4364,6 +4559,12 @@ in the text (no (0) value, the default)
   <define name="informaltable">
     <element name="informaltable">
       <ref name="informaltable.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="textobject"/>
+      </zeroOrMore>
       <choice>
         <oneOrMore>
           <ref name="graphic"/>
@@ -4380,7 +4581,7 @@ in the text (no (0) value, the default)
 <!--end of informaltable.element-->
 <!-- Frame, Colsep, and Rowsep must be repeated because
 		they are not in entities in the table module. -->
-<!-- includes TabStyle, ToCentry, ShortEntry, 
+<!-- includes TabStyle, ToCentry, ShortEntry,
 				Orient, PgWide -->
 <!-- includes Label -->
 <!-- includes common attributes -->
@@ -4430,8 +4631,10 @@ in the text (no (0) value, the default)
           <ref name="para.char.mix"/>
           <ref name="graphic"/>
           <ref name="mediaobject"/>
-          <ref name="lineannotation"/>
           <ref name="co"/>
+          <ref name="coref"/>
+          <ref name="textobject"/>
+          <ref name="lineannotation"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -4471,7 +4674,7 @@ in the text (no (0) value, the default)
     </element>
   </define>
 <!--end of cmdsynopsis.element-->
-<!-- Sepchar: Character that should separate command and all 
+<!-- Sepchar: Character that should separate command and all
 		top-level arguments; alternate value might be e.g., &Delta; -->
   <define name="cmdsynopsis.attlist" combine="interleave">
     <ref name="label.attrib"/>
@@ -4510,10 +4713,10 @@ in the text (no (0) value, the default)
     </element>
   </define>
 <!--end of arg.element-->
-<!-- Choice: Whether Arg must be supplied: Opt (optional to 
-		supply, e.g. [arg]; the default), Req (required to supply, 
+<!-- Choice: Whether Arg must be supplied: Opt (optional to
+		supply, e.g. [arg]; the default), Req (required to supply,
 		e.g. {arg}), or Plain (required to supply, e.g. arg) -->
-<!-- Rep: whether Arg is repeatable: Norepeat (e.g. arg without 
+<!-- Rep: whether Arg is repeatable: Norepeat (e.g. arg without
 		ellipsis; the default), or Repeat (e.g. arg...) -->
   <define name="arg.attlist" combine="interleave">
     <optional>
@@ -4567,7 +4770,7 @@ in the text (no (0) value, the default)
 		e.g.  g1|g2|g3), OptMult (can supply zero or more, e.g.
 		[[g1|g2|g3]]), or ReqMult (must supply one or more, e.g.
 		{{g1|g2|g3}}) -->
-<!-- Rep: whether Group is repeatable: Norepeat (e.g. group 
+<!-- Rep: whether Group is repeatable: Norepeat (e.g. group
 		without ellipsis; the default), or Repeat (e.g. group...) -->
   <define name="group.attlist" combine="interleave">
     <optional>
@@ -4705,6 +4908,7 @@ in the text (no (0) value, the default)
       <zeroOrMore>
         <choice>
           <ref name="cptr.char.mix"/>
+          <ref name="textobject"/>
           <ref name="lineannotation"/>
         </choice>
       </zeroOrMore>
@@ -4758,6 +4962,7 @@ in the text (no (0) value, the default)
       <zeroOrMore>
         <choice>
           <text/>
+          <ref name="type"/>
           <ref name="replaceable"/>
           <ref name="function"/>
         </choice>
@@ -4828,6 +5033,7 @@ in the text (no (0) value, the default)
       <zeroOrMore>
         <choice>
           <text/>
+          <ref name="type"/>
           <ref name="replaceable"/>
           <ref name="parameter"/>
           <ref name="funcparams"/>
@@ -4898,9 +5104,6 @@ in the text (no (0) value, the default)
   </define>
 <!--end of classsynopsis.element-->
   <define name="classsynopsis.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="classsynopsis.role.attrib"/>
-    <ref name="local.classsynopsis.attrib"/>
     <optional>
       <attribute name="language"/>
     </optional>
@@ -4912,6 +5115,9 @@ in the text (no (0) value, the default)
         </choice>
       </attribute>
     </optional>
+    <ref name="common.attrib"/>
+    <ref name="classsynopsis.role.attrib"/>
+    <ref name="local.classsynopsis.attrib"/>
   </define>
 <!--end of classsynopsis.attlist-->
 <!--end of classsynopsis.module-->
@@ -4927,6 +5133,7 @@ in the text (no (0) value, the default)
       <zeroOrMore>
         <choice>
           <ref name="cptr.char.mix"/>
+          <ref name="textobject"/>
           <ref name="lineannotation"/>
         </choice>
       </zeroOrMore>
@@ -5042,7 +5249,7 @@ in the text (no (0) value, the default)
     <element name="interfacename">
       <ref name="interfacename.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -5099,6 +5306,9 @@ in the text (no (0) value, the default)
   </define>
 <!--end of fieldsynopsis.element-->
   <define name="fieldsynopsis.attlist" combine="interleave">
+    <optional>
+      <attribute name="language"/>
+    </optional>
     <ref name="common.attrib"/>
     <ref name="fieldsynopsis.role.attrib"/>
     <ref name="local.fieldsynopsis.attrib"/>
@@ -5155,6 +5365,9 @@ in the text (no (0) value, the default)
   </define>
 <!--end of constructorsynopsis.element-->
   <define name="constructorsynopsis.attlist" combine="interleave">
+    <optional>
+      <attribute name="language"/>
+    </optional>
     <ref name="common.attrib"/>
     <ref name="constructorsynopsis.role.attrib"/>
     <ref name="local.constructorsynopsis.attrib"/>
@@ -5189,6 +5402,9 @@ in the text (no (0) value, the default)
   </define>
 <!--end of destructorsynopsis.element-->
   <define name="destructorsynopsis.attlist" combine="interleave">
+    <optional>
+      <attribute name="language"/>
+    </optional>
     <ref name="common.attrib"/>
     <ref name="destructorsynopsis.role.attrib"/>
     <ref name="local.destructorsynopsis.attrib"/>
@@ -5230,6 +5446,9 @@ in the text (no (0) value, the default)
   </define>
 <!--end of methodsynopsis.element-->
   <define name="methodsynopsis.attlist" combine="interleave">
+    <optional>
+      <attribute name="language"/>
+    </optional>
     <ref name="common.attrib"/>
     <ref name="methodsynopsis.role.attrib"/>
     <ref name="local.methodsynopsis.attrib"/>
@@ -5289,9 +5508,6 @@ in the text (no (0) value, the default)
   </define>
 <!--end of methodparam.element-->
   <define name="methodparam.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="methodparam.role.attrib"/>
-    <ref name="local.methodparam.attrib"/>
     <optional>
       <attribute name="choice" a:defaultValue="req">
         <choice>
@@ -5309,6 +5525,9 @@ in the text (no (0) value, the default)
         </choice>
       </attribute>
     </optional>
+    <ref name="common.attrib"/>
+    <ref name="methodparam.role.attrib"/>
+    <ref name="local.methodparam.attrib"/>
   </define>
 <!--end of methodparam.attlist-->
 <!--end of methodparam.module-->
@@ -5356,6 +5575,7 @@ in the text (no (0) value, the default)
       <zeroOrMore>
         <choice>
           <text/>
+          <ref name="personname"/>
           <ref name="person.ident.mix"/>
           <ref name="street"/>
           <ref name="pob"/>
@@ -5707,6 +5927,35 @@ in the text (no (0) value, the default)
   </define>
 <!--end of artpagenums.attlist-->
 <!--end of artpagenums.module-->
+<!-- PersonName -->
+  <define name="local.personname.attrib">
+    <empty/>
+  </define>
+  <define name="personname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="personname">
+    <element name="personname">
+      <ref name="personname.attlist"/>
+      <oneOrMore>
+        <choice>
+          <ref name="honorific"/>
+          <ref name="firstname"/>
+          <ref name="surname"/>
+          <ref name="lineage"/>
+          <ref name="othername"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
+<!--end of personname.element-->
+  <define name="personname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="personname.role.attrib"/>
+    <ref name="local.personname.attrib"/>
+  </define>
+<!--end of personname.attlist-->
+<!--end of personname.module-->
 <!-- Author ........................... -->
   <define name="local.author.attrib">
     <empty/>
@@ -5717,9 +5966,19 @@ in the text (no (0) value, the default)
   <define name="author">
     <element name="author">
       <ref name="author.attlist"/>
-      <oneOrMore>
-        <ref name="person.ident.mix"/>
-      </oneOrMore>
+      <choice>
+        <ref name="personname"/>
+        <oneOrMore>
+          <ref name="person.ident.mix"/>
+        </oneOrMore>
+      </choice>
+      <zeroOrMore>
+        <choice>
+          <ref name="personblurb"/>
+          <ref name="email"/>
+          <ref name="address"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
 <!--end of author.element-->
@@ -6173,9 +6432,19 @@ in the text (no (0) value, the default)
   <define name="editor">
     <element name="editor">
       <ref name="editor.attlist"/>
-      <oneOrMore>
-        <ref name="person.ident.mix"/>
-      </oneOrMore>
+      <choice>
+        <ref name="personname"/>
+        <oneOrMore>
+          <ref name="person.ident.mix"/>
+        </oneOrMore>
+      </choice>
+      <zeroOrMore>
+        <choice>
+          <ref name="personblurb"/>
+          <ref name="email"/>
+          <ref name="address"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
 <!--end of editor.element-->
@@ -6233,6 +6502,198 @@ in the text (no (0) value, the default)
   </define>
 <!--end of issn.attlist-->
 <!--end of issn.module-->
+<!-- BiblioId ................. -->
+  <define name="biblio.class.attrib">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>uri</value>
+          <value>doi</value>
+          <value>isbn</value>
+          <value>issn</value>
+          <value>libraryofcongress</value>
+          <value>pubnumber</value>
+          <value>other</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otherclass"/>
+    </optional>
+  </define>
+  <define name="local.biblioid.attrib">
+    <empty/>
+  </define>
+  <define name="biblioid.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="biblioid">
+    <element name="biblioid">
+      <ref name="biblioid.attlist"/>
+      <zeroOrMore>
+        <ref name="docinfo.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of biblioid.element-->
+  <define name="biblioid.attlist" combine="interleave">
+    <ref name="biblio.class.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="biblioid.role.attrib"/>
+    <ref name="local.biblioid.attrib"/>
+  </define>
+<!--end of biblioid.attlist-->
+<!--end of biblioid.module-->
+<!-- CiteBiblioId ................. -->
+  <define name="local.citebiblioid.attrib">
+    <empty/>
+  </define>
+  <define name="citebiblioid.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="citebiblioid">
+    <element name="citebiblioid">
+      <ref name="citebiblioid.attlist"/>
+      <zeroOrMore>
+        <ref name="docinfo.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of citebiblioid.element-->
+  <define name="citebiblioid.attlist" combine="interleave">
+    <ref name="biblio.class.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="citebiblioid.role.attrib"/>
+    <ref name="local.citebiblioid.attrib"/>
+  </define>
+<!--end of citebiblioid.attlist-->
+<!--end of citebiblioid.module-->
+<!-- BiblioSource ................. -->
+  <define name="local.bibliosource.attrib">
+    <empty/>
+  </define>
+  <define name="bibliosource.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliosource">
+    <element name="bibliosource">
+      <ref name="bibliosource.attlist"/>
+      <zeroOrMore>
+        <ref name="docinfo.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of bibliosource.element-->
+  <define name="bibliosource.attlist" combine="interleave">
+    <ref name="biblio.class.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="bibliosource.role.attrib"/>
+    <ref name="local.bibliosource.attrib"/>
+  </define>
+<!--end of bibliosource.attlist-->
+<!--end of bibliosource.module-->
+<!-- BiblioRelation ................. -->
+  <define name="local.bibliorelation.attrib">
+    <empty/>
+  </define>
+  <define name="local.bibliorelation.types">
+    <notAllowed/>
+  </define>
+  <define name="bibliorelation.type.attrib">
+    <optional>
+      <attribute name="type">
+        <choice>
+          <value>isversionof</value>
+          <value>hasversion</value>
+          <value>isreplacedby</value>
+          <value>replaces</value>
+          <value>isrequiredby</value>
+          <value>requires</value>
+          <value>ispartof</value>
+          <value>haspart</value>
+          <value>isreferencedby</value>
+          <value>references</value>
+          <value>isformatof</value>
+          <value>hasformat</value>
+          <value>othertype</value>
+          <ref name="local.bibliorelation.types"/>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="othertype"/>
+    </optional>
+  </define>
+  <define name="bibliorelation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliorelation">
+    <element name="bibliorelation">
+      <ref name="bibliorelation.attlist"/>
+      <zeroOrMore>
+        <ref name="docinfo.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of bibliorelation.element-->
+  <define name="bibliorelation.attlist" combine="interleave">
+    <ref name="biblio.class.attrib"/>
+    <ref name="bibliorelation.type.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="bibliorelation.role.attrib"/>
+    <ref name="local.bibliorelation.attrib"/>
+  </define>
+<!--end of bibliorelation.attlist-->
+<!--end of bibliorelation.module-->
+<!-- BiblioCoverage ................. -->
+  <define name="local.bibliocoverage.attrib">
+    <empty/>
+  </define>
+  <define name="bibliocoverage.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliocoverage">
+    <element name="bibliocoverage">
+      <ref name="bibliocoverage.attlist"/>
+      <zeroOrMore>
+        <ref name="docinfo.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of bibliocoverage.element-->
+  <define name="bibliocoverage.attlist" combine="interleave">
+    <optional>
+      <attribute name="spatial">
+        <choice>
+          <value>dcmipoint</value>
+          <value>iso3166</value>
+          <value>dcmibox</value>
+          <value>tgn</value>
+          <value>otherspatial</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otherspatial"/>
+    </optional>
+    <optional>
+      <attribute name="temporal">
+        <choice>
+          <value>dcmiperiod</value>
+          <value>w3c-dtf</value>
+          <value>othertemporal</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="othertemporal"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="bibliocoverage.role.attrib"/>
+    <ref name="local.bibliocoverage.attrib"/>
+  </define>
+<!--end of bibliocoverage.attlist-->
+<!--end of bibliocoverage.module-->
 <!-- InvPartNumber .................... -->
   <define name="local.invpartnumber.attrib">
     <empty/>
@@ -6289,6 +6750,9 @@ in the text (no (0) value, the default)
   <define name="legalnotice">
     <element name="legalnotice">
       <ref name="legalnotice.attlist"/>
+      <optional>
+        <ref name="blockinfo"/>
+      </optional>
       <optional>
         <ref name="title"/>
       </optional>
@@ -6356,6 +6820,20 @@ in the text (no (0) value, the default)
 <!--end of orgname.element-->
   <define name="orgname.attlist" combine="interleave">
     <ref name="common.attrib"/>
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>corporation</value>
+          <value>nonprofit</value>
+          <value>consortium</value>
+          <value>informal</value>
+          <value>other</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otherclass"/>
+    </optional>
     <ref name="orgname.role.attrib"/>
     <ref name="local.orgname.attrib"/>
   </define>
@@ -6371,9 +6849,19 @@ in the text (no (0) value, the default)
   <define name="othercredit">
     <element name="othercredit">
       <ref name="othercredit.attlist"/>
-      <oneOrMore>
-        <ref name="person.ident.mix"/>
-      </oneOrMore>
+      <choice>
+        <ref name="personname"/>
+        <oneOrMore>
+          <ref name="person.ident.mix"/>
+        </oneOrMore>
+      </choice>
+      <zeroOrMore>
+        <choice>
+          <ref name="personblurb"/>
+          <ref name="email"/>
+          <ref name="address"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
 <!--end of othercredit.element-->
@@ -6409,7 +6897,7 @@ in the text (no (0) value, the default)
 <!--end of pagenums.attlist-->
 <!--end of pagenums.module-->
 <!-- Personal identity elements ....... -->
-<!-- These elements are used only within Author, Editor, and 
+<!-- These elements are used only within Author, Editor, and
 OtherCredit. -->
   <define name="local.contrib.attrib">
     <empty/>
@@ -6946,7 +7434,7 @@ OtherCredit. -->
     <element name="action">
       <ref name="action.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7015,7 +7503,7 @@ OtherCredit. -->
   <define name="local.co.attrib">
     <empty/>
   </define>
-<!-- CO is a callout area of the LineColumn unit type (a single character 
+<!-- CO is a callout area of the LineColumn unit type (a single character
      position); the position is directly indicated by the location of CO. -->
   <define name="co.role.attrib">
     <ref name="role.attrib"/>
@@ -7038,6 +7526,31 @@ OtherCredit. -->
   </define>
 <!--end of co.attlist-->
 <!--end of co.module-->
+  <define name="local.coref.attrib">
+    <empty/>
+  </define>
+<!-- COREF is a reference to a CO -->
+  <define name="coref.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="coref">
+    <element name="coref">
+      <ref name="coref.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of coref.element-->
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+  <define name="coref.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="linkendreq.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="coref.role.attrib"/>
+    <ref name="local.coref.attrib"/>
+  </define>
+<!--end of coref.attlist-->
+<!--end of coref.module-->
   <define name="local.command.attrib">
     <empty/>
   </define>
@@ -7071,7 +7584,10 @@ OtherCredit. -->
     <element name="computeroutput">
       <ref name="computeroutput.attlist"/>
       <zeroOrMore>
-        <ref name="cptr.char.mix"/>
+        <choice>
+          <ref name="cptr.char.mix"/>
+          <ref name="co"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -7094,7 +7610,7 @@ OtherCredit. -->
     <element name="database">
       <ref name="database.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7209,6 +7725,28 @@ OtherCredit. -->
   </define>
 <!--end of errorname.attlist-->
 <!--end of errorname.module-->
+  <define name="local.errortext.attrib">
+    <empty/>
+  </define>
+  <define name="errortext.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="errortext">
+    <element name="errortext">
+      <ref name="errortext.attlist"/>
+      <zeroOrMore>
+        <ref name="smallcptr.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of errortext.element-->
+  <define name="errortext.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="errortext.role.attrib"/>
+    <ref name="local.errortext.attrib"/>
+  </define>
+<!--end of errortext.attlist-->
+<!--end of errortext.module-->
   <define name="local.errortype.attrib">
     <empty/>
   </define>
@@ -7241,22 +7779,24 @@ OtherCredit. -->
     <element name="filename">
       <ref name="filename.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
 <!--end of filename.element-->
 <!-- Class: Type of filename the element names; no default -->
-<!-- Path: Search path (possibly system-specific) in which 
+<!-- Path: Search path (possibly system-specific) in which
 		file can be found -->
   <define name="filename.attlist" combine="interleave">
     <optional>
       <attribute name="class">
         <choice>
           <value>headerfile</value>
+          <value>partition</value>
           <value>devicefile</value>
           <value>libraryfile</value>
           <value>directory</value>
+          <value>extension</value>
           <value>symlink</value>
         </choice>
       </attribute>
@@ -7460,7 +8000,7 @@ OtherCredit. -->
     <element name="hardware">
       <ref name="hardware.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7510,7 +8050,7 @@ OtherCredit. -->
     <element name="keycap">
       <ref name="keycap.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7657,9 +8197,6 @@ OtherCredit. -->
   </define>
 <!--end of constant.element-->
   <define name="constant.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="constant.role.attrib"/>
-    <ref name="local.constant.attrib"/>
     <optional>
       <attribute name="class">
         <choice>
@@ -7667,6 +8204,9 @@ OtherCredit. -->
         </choice>
       </attribute>
     </optional>
+    <ref name="common.attrib"/>
+    <ref name="constant.role.attrib"/>
+    <ref name="local.constant.attrib"/>
   </define>
 <!--end of constant.attlist-->
 <!--end of constant.module-->
@@ -7867,7 +8407,7 @@ OtherCredit. -->
     <element name="option">
       <ref name="option.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7911,7 +8451,7 @@ OtherCredit. -->
     <element name="parameter">
       <ref name="parameter.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7944,7 +8484,10 @@ OtherCredit. -->
     <element name="prompt">
       <ref name="prompt.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="co"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -7967,7 +8510,7 @@ OtherCredit. -->
     <element name="property">
       <ref name="property.attlist"/>
       <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
+        <ref name="cptr.char.mix"/>
       </zeroOrMore>
     </element>
   </define>
@@ -7998,6 +8541,7 @@ OtherCredit. -->
           <ref name="other.char.class"/>
           <ref name="inlinegraphic"/>
           <ref name="inlinemediaobject"/>
+          <ref name="co"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -8170,8 +8714,9 @@ OtherCredit. -->
       <ref name="systemitem.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="smallcptr.char.mix"/>
+          <ref name="cptr.char.mix"/>
           <ref name="acronym"/>
+          <ref name="co"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -8183,13 +8728,22 @@ OtherCredit. -->
       <attribute name="class">
         <choice>
           <value>constant</value>
+          <value>event</value>
+          <value>eventhandler</value>
+          <value>domainname</value>
+          <value>fqdomainname</value>
+          <value>ipaddress</value>
+          <value>netmask</value>
+          <value>etheraddress</value>
           <value>groupname</value>
           <value>library</value>
           <value>macro</value>
           <value>osname</value>
+          <value>filesystem</value>
           <value>resource</value>
           <value>systemname</value>
           <value>username</value>
+          <value>newsgroup</value>
         </choice>
       </attribute>
     </optional>
@@ -8254,7 +8808,10 @@ OtherCredit. -->
     <element name="userinput">
       <ref name="userinput.attlist"/>
       <zeroOrMore>
-        <ref name="cptr.char.mix"/>
+        <choice>
+          <ref name="cptr.char.mix"/>
+          <ref name="co"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -8776,6 +9333,12 @@ OtherCredit. -->
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="targetdoc"/>
+    </optional>
+    <optional>
+      <attribute name="targetptr"/>
+    </optional>
     <ref name="common.attrib"/>
     <ref name="olink.role.attrib"/>
     <ref name="local.olink.attrib"/>
@@ -8965,10 +9528,10 @@ OtherCredit. -->
 		document only), or All (both) -->
 <!-- Significance: Whether this IndexTerm is the most pertinent
 		of its series (Preferred) or not (Normal, the default) -->
-<!-- Class: Indicates type of IndexTerm; default is Singular, 
-		or EndOfRange if StartRef is supplied; StartOfRange value 
+<!-- Class: Indicates type of IndexTerm; default is Singular,
+		or EndOfRange if StartRef is supplied; StartOfRange value
 		must be supplied explicitly on starts of ranges -->
-<!-- StartRef: ID of the IndexTerm that starts the indexing 
+<!-- StartRef: ID of the IndexTerm that starts the indexing
 		range ended by this IndexTerm -->
 <!-- Zone: IDs of the elements to which the IndexTerm applies,
 		and indicates that the IndexTerm applies to those entire
@@ -9123,6 +9686,6 @@ OtherCredit. -->
 <!--end of seealso.attlist-->
 <!--end of seeseealso.module-->
 <!--end of indexterm.content.module-->
-<!-- End of DocBook XML information pool module V4.1.2 ...................... -->
+<!-- End of DocBook XML information pool module V4.2 ...................... -->
 <!-- ...................................................................... -->
 </grammar>
diff --git a/schema/relaxng/docbook.rng b/schema/relaxng/docbook.rng
index 5f2f985fc..a160bcc80 100644
--- a/schema/relaxng/docbook.rng
+++ b/schema/relaxng/docbook.rng
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-         xmlns="http://relaxng.org/ns/structure/0.9"
-         xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
+<!-- Generated by DTDinst version 2002-07-24. -->
+<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 
   <start>
     <choice>
@@ -27,13 +26,15 @@
     </choice>
   </start>
 
+
 <!-- ...................................................................... -->
-<!-- DocBook XML DTD V4.1.2 ................................................. -->
+<!-- DocBook XML DTD V4.2 ................................................. -->
 <!-- File docbookx.dtd .................................................... -->
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -50,29 +51,29 @@
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
 
-     Please direct all questions, bug reports, or suggestions for 
+     Please direct all questions, bug reports, or suggestions for
      changes to the docbook@lists.oasis-open.org mailing list. For more
      information, see http://www.oasis-open.org/docbook/.
 -->
 <!-- ...................................................................... -->
-<!-- This is the driver file for V4.1.2 of the DocBook DTD.
+<!-- This is the driver file for V4.2 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook XML V4.1.2//EN"
+     "-//OASIS//DTD DocBook XML V4.2//EN"
 
      For example, if your document's top-level element is Book, and
      you are using DocBook directly, use the FPI in the DOCTYPE
      declaration:
 
-     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                    "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
                     [...]>
 
      Or, if you have a higher-level driver file that customizes DocBook,
      use the FPI in the parameter entity declaration:
 
-     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
      %DocBookDTD;
 
      See the documentation for detailed information on the parameter
@@ -81,7 +82,8 @@
      of DocBook.
 -->
 <!-- ...................................................................... -->
-
+<!-- Enable SGML features ................................................. -->
+<!-- ...................................................................... -->
 <!-- Notation declarations ................................................ -->
   <include href="dbnotn.rng"/>
 
@@ -90,17 +92,17 @@
 <!-- euro sign, U+20AC NEW -->
   <include href="dbcent.rng"/>
 
+<!-- ...................................................................... -->
 <!-- DTD modules .......................................................... -->
 <!-- Information pool .............. -->
   <include href="dbpool.rng"/>
 
+<!-- Redeclaration placeholder ..... -->
 <!-- Document hierarchy ............ -->
   <include href="dbhier.rng"/>
-
 <!-- ...................................................................... -->
 <!-- Other general entities ............................................... -->
-  <include href="dbgenent.rng"/>
-
-<!-- End of DocBook XML DTD V4.1.2 .......................................... -->
+<!-- End of DocBook XML DTD V4.2 .......................................... -->
 <!-- ...................................................................... -->
+
 </grammar>
diff --git a/schema/relaxng/soextbl-dbpool.patch b/schema/relaxng/soextbl-dbpool.patch
new file mode 100644
index 000000000..ffe372aac
--- /dev/null
+++ b/schema/relaxng/soextbl-dbpool.patch
@@ -0,0 +1,81 @@
+*** /sourceforge/docbook/schema/relaxng/dbpool.rng	Fri Dec 13 11:53:45 2002
+--- dbpoolx.mod	Fri Dec 27 09:10:39 2002
+***************
+*** 4504,4520 ****
+      <ref name="role.attrib"/>
+    </define>
+! <!-- Add label and role attributes to table and informaltable -->
+    <define name="bodyatt">
+-     <ref name="label.attrib"/>
+-   </define>
+- <!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
+-      EntryTbl, and Entry (and InformalTable element). -->
+-   <define name="secur">
+      <ref name="common.attrib"/>
+      <ref name="tables.role.attrib"/>
+    </define>
+    <define name="common.table.attribs">
+      <ref name="bodyatt"/>
+!     <ref name="secur"/>
+    </define>
+  <!-- Content model for Table. -->
+--- 4504,4535 ----
+      <ref name="role.attrib"/>
+    </define>
+! <!-- Add common attributes and the Label attribute to Table and -->
+! <!-- InformalTable.                                             -->
+    <define name="bodyatt">
+      <ref name="common.attrib"/>
++     <ref name="label.attrib"/>
+      <ref name="tables.role.attrib"/>
+    </define>
+    <define name="common.table.attribs">
+      <ref name="bodyatt"/>
+!   </define>
+! <!-- Add common attributes to TGroup, ColSpec, TBody, THead, Row, Entry -->
+!   <define name="tbl.tgroup.att">
+!     <ref name="common.attrib"/>
+!   </define>
+!   <define name="tbl.colspec.att">
+!     <ref name="common.attrib"/>
+!   </define>
+!   <define name="tbl.tbody.att">
+!     <ref name="common.attrib"/>
+!   </define>
+!   <define name="tbl.thead.att">
+!     <ref name="common.attrib"/>
+!   </define>
+!   <define name="tbl.row.att">
+!     <ref name="common.attrib"/>
+!   </define>
+!   <define name="tbl.entry.att">
+!     <ref name="common.attrib"/>
+    </define>
+  <!-- Content model for Table. -->
+***************
+*** 4544,4554 ****
+  <!-- Allow either objects or inlines; beware of REs between elements. -->
+    <define name="tbl.entry.mdl">
+!     <choice>
+!       <ref name="para.char.mix"/>
+!       <ref name="tabentry.mix"/>
+!     </choice>
+    </define>
+! <!-- Reference CALS Table Model -->
+!   <include href="calstbl.rng"/>
+  <!--end of table.module-->
+  <!-- Note that InformalTable is dependent on some of the entity
+--- 4559,4571 ----
+  <!-- Allow either objects or inlines; beware of REs between elements. -->
+    <define name="tbl.entry.mdl">
+!     <zeroOrMore>
+!       <choice>
+!         <ref name="para.char.mix"/>
+!         <ref name="tabentry.mix"/>
+!       </choice>
+!     </zeroOrMore>
+    </define>
+! <!-- Reference OASIS Exchange Table Model -->
+!   <include href="soextblx.rng"/>
+  <!--end of table.module-->
+  <!-- Note that InformalTable is dependent on some of the entity
diff --git a/schema/relaxng/soextblx.rng b/schema/relaxng/soextbl.rng
similarity index 99%
rename from schema/relaxng/soextblx.rng
rename to schema/relaxng/soextbl.rng
index fc1c5db65..d0866291e 100644
--- a/schema/relaxng/soextblx.rng
+++ b/schema/relaxng/soextbl.rng
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/0.9" xmlns:a="http://relaxng.org/ns/compatibility/annotations/0.9">
+<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
 <!-- XML EXCHANGE TABLE MODEL DECLARATION MODULE -->
 <!-- This set of declarations defines the XML version of the Exchange
      Table Model as of the date shown in the Formal Public Identifier