From: Norman Walsh <ndw@nwalsh.com>
Date: Mon, 12 Nov 2001 21:05:09 +0000 (+0000)
Subject: Updated with DTDinst to at least be valid RELAX NG
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1672885ca56353d5a5c3d76bdb305e195c55ba35;p=docbook-dsssl

Updated with DTDinst to at least be valid RELAX NG
---

diff --git a/docbook/relaxng/README b/docbook/relaxng/README
index 2cc4cc373..db9aab4ce 100644
--- a/docbook/relaxng/README
+++ b/docbook/relaxng/README
@@ -1,2 +1,4 @@
-This is a work in progress. IT IS ABSOLUTELY BROKEN AT THE MOMENT.
-IT ISN'T TREX, IT ISN'T RELAX, IT ISN'T RELAX NG.
+This is a work in progress.
+
+These files were generated automatically with http://www.thaiopensource.com/dtdinst/
+
diff --git a/docbook/relaxng/calstblx.rng b/docbook/relaxng/calstblx.rng
new file mode 100644
index 000000000..644b9c7e8
--- /dev/null
+++ b/docbook/relaxng/calstblx.rng
@@ -0,0 +1,509 @@
+<?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">
+
+<!-- ...................................................................... -->
+<!-- DocBook XML CALS Table Model V4.1.2 .................................... -->
+<!-- File calstblx.mod .................................................... -->
+<!-- Copyright 1992-2000 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).
+
+     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
+     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
+     holders make no representation about the suitability of the DTD for
+     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
+     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.
+
+     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 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 
+     (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>
+  <define name="titles">
+    <optional>
+      <ref name="title"/>
+    </optional>
+  </define>
+
+<!-- default for use in entry content -->
+<!--
+The parameter entities as defined below provide the CALS table model
+as published (as part of the Example DTD) in MIL-HDBK-28001.
+
+These following declarations provide the CALS-compliant default definitions
+for these entities.  However, these entities can and should be redefined
+(by giving the appropriate parameter entity declaration(s) prior to the
+reference to this Table Model declaration set entity) to fit the needs
+of the current application.
+-->
+  <define name="tbl.table-titles.mdl">
+    <ref name="titles"/>
+  </define>
+  <define name="tbl.table-main.mdl">
+    <choice>
+      <oneOrMore>
+        <ref name="tgroup"/>
+      </oneOrMore>
+      <oneOrMore>
+        <ref name="graphic"/>
+      </oneOrMore>
+    </choice>
+  </define>
+  <define name="tbl.table.att">
+    <optional>
+      <attribute name="tabstyle"/>
+    </optional>
+    <optional>
+      <attribute name="tocentry">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="shortentry">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="orient">
+        <choice>
+          <value>port</value>
+          <value>land</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="pgwide">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+  </define>
+  <define name="tbl.tgroup.mdl">
+    <zeroOrMore>
+      <ref name="colspec"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="spanspec"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="thead"/>
+    </optional>
+    <optional>
+      <ref name="tfoot"/>
+    </optional>
+    <ref name="tbody"/>
+  </define>
+  <define name="tbl.tgroup.att">
+    <optional>
+      <attribute name="tgroupstyle"/>
+    </optional>
+  </define>
+  <define name="tbl.hdft.mdl">
+    <zeroOrMore>
+      <ref name="colspec"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="row"/>
+    </oneOrMore>
+  </define>
+  <define name="tbl.row.mdl">
+    <oneOrMore>
+      <choice>
+        <ref name="entry"/>
+        <ref name="entrytbl"/>
+      </choice>
+    </oneOrMore>
+  </define>
+  <define name="tbl.entrytbl.mdl">
+    <zeroOrMore>
+      <ref name="colspec"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="spanspec"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="thead"/>
+    </optional>
+    <ref name="tbody"/>
+  </define>
+<!-- =====  Element and attribute declarations follow. =====  -->
+  <define name="table">
+    <element name="table">
+      <ref name="table.attlist"/>
+      <ref name="tbl.table.mdl"/>
+    </element>
+  </define>
+  <define name="table.attlist" combine="interleave">
+    <optional>
+      <attribute name="frame">
+        <choice>
+          <value>top</value>
+          <value>bottom</value>
+          <value>topbot</value>
+          <value>all</value>
+          <value>sides</value>
+          <value>none</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <ref name="tbl.table.att"/>
+    <ref name="bodyatt"/>
+    <ref name="secur"/>
+  </define>
+  <define name="tgroup">
+    <element name="tgroup">
+      <ref name="tgroup.attlist"/>
+      <ref name="tbl.tgroup.mdl"/>
+    </element>
+  </define>
+  <define name="tgroup.attlist" combine="interleave">
+    <attribute name="cols"/>
+    <ref name="tbl.tgroup.att"/>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff"/>
+    </optional>
+    <ref name="secur"/>
+  </define>
+  <define name="colspec">
+    <element name="colspec">
+      <ref name="colspec.attlist"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="colspec.attlist" combine="interleave">
+    <optional>
+      <attribute name="colnum"/>
+    </optional>
+    <optional>
+      <attribute name="colname"/>
+    </optional>
+    <optional>
+      <attribute name="colwidth"/>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff"/>
+    </optional>
+  </define>
+  <define name="spanspec">
+    <element name="spanspec">
+      <ref name="spanspec.attlist"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="spanspec.attlist" combine="interleave">
+    <attribute name="namest"/>
+    <attribute name="nameend"/>
+    <attribute name="spanname"/>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff"/>
+    </optional>
+  </define>
+  <define name="thead">
+    <element name="thead">
+      <ref name="thead.attlist"/>
+      <ref name="tbl.hdft.mdl"/>
+    </element>
+  </define>
+  <define name="thead.attlist" combine="interleave">
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="secur"/>
+  </define>
+  <define name="tfoot">
+    <element name="tfoot">
+      <ref name="tfoot.attlist"/>
+      <ref name="tbl.hdft.mdl"/>
+    </element>
+  </define>
+  <define name="tfoot.attlist" combine="interleave">
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="secur"/>
+  </define>
+  <define name="tbody">
+    <element name="tbody">
+      <ref name="tbody.attlist"/>
+      <oneOrMore>
+        <ref name="row"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="tbody.attlist" combine="interleave">
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="secur"/>
+  </define>
+  <define name="row">
+    <element name="row">
+      <ref name="row.attlist"/>
+      <ref name="tbl.row.mdl"/>
+    </element>
+  </define>
+  <define name="row.attlist" combine="interleave">
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="secur"/>
+  </define>
+  <define name="entrytbl">
+    <element name="entrytbl">
+      <ref name="entrytbl.attlist"/>
+      <ref name="tbl.entrytbl.mdl"/>
+    </element>
+  </define>
+  <define name="entrytbl.attlist" combine="interleave">
+    <attribute name="cols"/>
+    <ref name="tbl.tgroup.att"/>
+    <optional>
+      <attribute name="colname"/>
+    </optional>
+    <optional>
+      <attribute name="spanname"/>
+    </optional>
+    <optional>
+      <attribute name="namest"/>
+    </optional>
+    <optional>
+      <attribute name="nameend"/>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff"/>
+    </optional>
+    <ref name="secur"/>
+  </define>
+  <define name="entry">
+    <element name="entry">
+      <ref name="entry.attlist"/>
+      <zeroOrMore>
+        <ref name="tbl.entry.mdl"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="entry.attlist" combine="interleave">
+    <optional>
+      <attribute name="colname"/>
+    </optional>
+    <optional>
+      <attribute name="namest"/>
+    </optional>
+    <optional>
+      <attribute name="nameend"/>
+    </optional>
+    <optional>
+      <attribute name="spanname"/>
+    </optional>
+    <optional>
+      <attribute name="morerows"/>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff"/>
+    </optional>
+    <optional>
+      <attribute name="rotate">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="secur"/>
+  </define>
+<!-- End of DocBook XML CALS Table Model V4.1.2 ............................. -->
+<!-- ...................................................................... -->
+</grammar>
diff --git a/docbook/relaxng/dbcent.rng b/docbook/relaxng/dbcent.rng
index 1f4b890b1..360feb225 100644
--- a/docbook/relaxng/dbcent.rng
+++ b/docbook/relaxng/dbcent.rng
@@ -1,15 +1,14 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
+<?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">
 
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DocBook XML character entities module V4.1.2 ........................... </dtd:comment>
-<dtd:comment> File dbcentx.mod ..................................................... </dtd:comment>
+<!-- ...................................................................... -->
+<!-- DocBook XML character entities module V4.1.2 ........................... -->
+<!-- File dbcentx.mod ..................................................... -->
 
-<dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc.,
-     O'Reilly &#38; Associates, Inc., ArborText, Inc., Fujitsu Software
+<!-- Copyright 1992-2000 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).
 
@@ -31,182 +30,12 @@
      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/.
-</dtd:comment>
+-->
 
-<dtd:comment> ...................................................................... </dtd:comment>
+<!-- ...................................................................... -->
 
-<dtd:comment> This module contains the entity declarations for the standard ISO
-     entity sets used by DocBook.
+<!-- This module usually contains the entity declarations for the
+     standard ISO entity sets used by DocBook. However, there is no
+     RELAX NG equivalent, so this file is empty. -->
 
-     In DTD driver files referring to this module, please use an entity
-     declaration that uses the public identifier shown below:
-
-     &#60;!ENTITY % dbcent PUBLIC
-     "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
-     "dbcentx.mod">
-     %dbcent;
-
-     See the documentation for detailed information on the parameter
-     entity and module scheme used in DocBook, customizing DocBook and
-     planning for interchange, and changes made since the last release
-     of DocBook.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-
-<dtd:pe-decl name="ISOamsa.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOamsa.module"/>
-<dtd:pe-decl name="ISOamsa"
-             public="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
-             system="ent/iso-amsa.ent"/>
-<dtd:pe-ref name="ISOamsa"/>
-<dtd:marked-section end="ISOamsa.module"/>
-
-<dtd:pe-decl name="ISOamsb.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOamsb.module"/>
-<dtd:pe-decl name="ISOamsb"
-             public="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
-             system="ent/iso-amsb.ent"/>
-<dtd:pe-ref name="ISOamsb"/>
-<dtd:marked-section end="ISOamsb.module"/>
-
-<dtd:pe-decl name="ISOamsc.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOamsc.module"/>
-<dtd:pe-decl name="ISOamsc"
-             public="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
-             system="ent/iso-amsc.ent"/>
-<dtd:pe-ref name="ISOamsc"/>
-<dtd:marked-section end="ISOamsc.module"/>
-
-<dtd:pe-decl name="ISOamsn.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOamsn.module"/>
-<dtd:pe-decl name="ISOamsn"
-             public="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
-             system="ent/iso-amsn.ent"/>
-<dtd:pe-ref name="ISOamsn"/>
-<dtd:marked-section end="ISOamsn.module"/>
-
-<dtd:pe-decl name="ISOamso.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOamso.module"/>
-<dtd:pe-decl name="ISOamso"
-             public="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
-             system="ent/iso-amso.ent"/>
-<dtd:pe-ref name="ISOamso"/>
-<dtd:marked-section end="ISOamso.module"/>
-
-<dtd:pe-decl name="ISOamsr.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOamsr.module"/>
-<dtd:pe-decl name="ISOamsr"
-             public="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
-             system="ent/iso-amsr.ent"/>
-<dtd:pe-ref name="ISOamsr"/>
-<dtd:marked-section end="ISOamsr.module"/>
-
-<dtd:pe-decl name="ISObox.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISObox.module"/>
-<dtd:pe-decl name="ISObox"
-             public="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
-             system="ent/iso-box.ent"/>
-<dtd:pe-ref name="ISObox"/>
-<dtd:marked-section end="ISObox.module"/>
-
-<dtd:pe-decl name="ISOcyr1.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOcyr1.module"/>
-<dtd:pe-decl name="ISOcyr1"
-             public="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
-             system="ent/iso-cyr1.ent"/>
-<dtd:pe-ref name="ISOcyr1"/>
-<dtd:marked-section end="ISOcyr1.module"/>
-
-<dtd:pe-decl name="ISOcyr2.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOcyr2.module"/>
-<dtd:pe-decl name="ISOcyr2"
-             public="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
-             system="ent/iso-cyr2.ent"/>
-<dtd:pe-ref name="ISOcyr2"/>
-<dtd:marked-section end="ISOcyr2.module"/>
-
-<dtd:pe-decl name="ISOdia.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOdia.module"/>
-<dtd:pe-decl name="ISOdia"
-             public="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
-             system="ent/iso-dia.ent"/>
-<dtd:pe-ref name="ISOdia"/>
-<dtd:marked-section end="ISOdia.module"/>
-
-<dtd:pe-decl name="ISOgrk1.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOgrk1.module"/>
-<dtd:pe-decl name="ISOgrk1"
-             public="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
-             system="ent/iso-grk1.ent"/>
-<dtd:pe-ref name="ISOgrk1"/>
-<dtd:marked-section end="ISOgrk1.module"/>
-
-<dtd:pe-decl name="ISOgrk2.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOgrk2.module"/>
-<dtd:pe-decl name="ISOgrk2"
-             public="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
-             system="ent/iso-grk2.ent"/>
-<dtd:pe-ref name="ISOgrk2"/>
-<dtd:marked-section end="ISOgrk2.module"/>
-
-<dtd:pe-decl name="ISOgrk3.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOgrk3.module"/>
-<dtd:pe-decl name="ISOgrk3"
-             public="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
-             system="ent/iso-grk3.ent"/>
-<dtd:pe-ref name="ISOgrk3"/>
-<dtd:marked-section end="ISOgrk3.module"/>
-
-<dtd:pe-decl name="ISOgrk4.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOgrk4.module"/>
-<dtd:pe-decl name="ISOgrk4"
-             public="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
-             system="ent/iso-grk4.ent"/>
-<dtd:pe-ref name="ISOgrk4"/>
-<dtd:marked-section end="ISOgrk4.module"/>
-
-<dtd:pe-decl name="ISOlat1.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOlat1.module"/>
-<dtd:pe-decl name="ISOlat1"
-             public="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-             system="ent/iso-lat1.ent"/>
-<dtd:pe-ref name="ISOlat1"/>
-<dtd:marked-section end="ISOlat1.module"/>
-
-<dtd:pe-decl name="ISOlat2.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOlat2.module"/>
-<dtd:pe-decl name="ISOlat2"
-             public="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
-             system="ent/iso-lat2.ent"/>
-<dtd:pe-ref name="ISOlat2"/>
-<dtd:marked-section end="ISOlat2.module"/>
-
-<dtd:pe-decl name="ISOnum.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOnum.module"/>
-<dtd:pe-decl name="ISOnum"
-             public="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
-             system="ent/iso-num.ent"/>
-<dtd:pe-ref name="ISOnum"/>
-<dtd:marked-section end="ISOnum.module"/>
-
-<dtd:pe-decl name="ISOpub.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOpub.module"/>
-<dtd:pe-decl name="ISOpub"
-             public="ISO 8879:1986//ENTITIES Publishing//EN//XML"
-             system="ent/iso-pub.ent"/>
-<dtd:pe-ref name="ISOpub"/>
-<dtd:marked-section end="ISOpub.module"/>
-
-<dtd:pe-decl name="ISOtech.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="ISOtech.module"/>
-<dtd:pe-decl name="ISOtech"
-             public="ISO 8879:1986//ENTITIES General Technical//EN//XML"
-             system="ent/iso-tech.ent"/>
-<dtd:pe-ref name="ISOtech"/>
-<dtd:marked-section end="ISOtech.module"/>
-
-<dtd:comment> End of DocBook XML character entity sets module V4.1.2 ................. </dtd:comment>
-<dtd:comment> ...................................................................... </dtd:comment>
-
-</grammar>
\ No newline at end of file
+</grammar>
diff --git a/docbook/relaxng/dbgenent.rng b/docbook/relaxng/dbgenent.rng
index 62cdf1c75..0a9fb8912 100644
--- a/docbook/relaxng/dbgenent.rng
+++ b/docbook/relaxng/dbgenent.rng
@@ -1,49 +1,48 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
+<?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">
 
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DocBook XML additional general entities V4.1.2 ......................... </dtd:comment>
+<!-- ...................................................................... -->
+<!-- DocBook XML additional general entities V4.1.2 ......................... -->
 
-<dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc.,
-     O'Reilly &amp; Associates, Inc., ArborText, Inc., Fujitsu Software
+<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
      Corporation, 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:
 
-     &lt;!ENTITY % dbgenent PUBLIC
+     <!ENTITY % dbgenent PUBLIC
      "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
      "dbgenent.mod">
      %dbgenent;
-</dtd:comment>
+-->
 
-<dtd:comment> File dbgenent.mod .................................................... </dtd:comment>
+<!-- File dbgenent.mod .................................................... -->
 
-<dtd:comment> You can edit this file to add the following:
+<!-- You can edit this file to add the following:
 
      o General entity declarations of any kind.  For example:
 
-       &lt;!ENTITY happyface SDATA "insert-face">    (system-specific data)
-       &lt;!ENTITY productname "WinWidget">          (small boilerplate)
-       &lt;!ENTITY legal-notice SYSTEM "notice.sgm"> (large boilerplate)
+       <!ENTITY happyface SDATA "insert-face">    (system-specific data)
+       <!ENTITY productname "WinWidget">          (small boilerplate)
+       <!ENTITY legal-notice SYSTEM "notice.sgm"> (large boilerplate)
 
      o Notation declarations.  For example:
 
-       &lt;!NOTATION chicken-scratch SYSTEM>
+       <!NOTATION chicken-scratch SYSTEM>
 
      o Declarations for and references to external parameter entities
        containing collections of any of the above.  For example:
 
-       &lt;!ENTITY % all-titles PUBLIC "-//DocTools//ELEMENTS Book Titles//EN"
+       <!ENTITY % all-titles PUBLIC "-//DocTools//ELEMENTS Book Titles//EN"
            "booktitles.ent">
        %all-titles;
-</dtd:comment>
+-->
 
-<dtd:comment> End of DocBook XML additional general entities V4.1.2 .................. </dtd:comment>
-<dtd:comment> ...................................................................... </dtd:comment>
+<!-- End of DocBook XML additional general entities V4.1.2 .................. -->
+<!-- ...................................................................... -->
 
 </grammar>
diff --git a/docbook/relaxng/dbhier.rng b/docbook/relaxng/dbhier.rng
index df19893fe..e77678a61 100644
--- a/docbook/relaxng/dbhier.rng
+++ b/docbook/relaxng/dbhier.rng
@@ -1,15 +1,13 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DocBook XML document hierarchy module V4.1.2 ........................... </dtd:comment>
-<dtd:comment> File dbhierx.mod ..................................................... </dtd:comment>
-
-<dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc.,
-     O'Reilly &#38; Associates, Inc., ArborText, Inc., Fujitsu Software
+<?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">
+
+<!-- ...................................................................... -->
+<!-- DocBook XML document hierarchy module V4.1.2 ........................... -->
+<!-- File dbhierx.mod ..................................................... -->
+<!-- Copyright 1992-2000 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).
 
@@ -31,11 +29,9 @@
      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/.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-
-<dtd:comment> This module contains the definitions for the overall document
+-->
+<!-- ...................................................................... -->
+<!-- This module contains the definitions for the overall document
      hierarchies of DocBook documents.  It covers computer documentation
      manuals and manual fragments, as well as reference entries (such as
      man pages) and technical journals or anthologies containing
@@ -48,7 +44,7 @@
      In DTD driver files referring to this module, please use an entity
      declaration that uses the public identifier shown below:
 
-     &#60;!ENTITY % dbhier PUBLIC
+     <!ENTITY % dbhier PUBLIC
      "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN"
      "dbhierx.mod">
      %dbhier;
@@ -57,4001 +53,2904 @@
      entity and module scheme used in DocBook, customizing DocBook and
      planning for interchange, and changes made since the last release
      of DocBook.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for module inclusions ....................................... </dtd:comment>
-
-<dtd:pe-decl name="dbhier.redecl.module">IGNORE</dtd:pe-decl>
-<dtd:pe-decl name="dbhier.redecl2.module">IGNORE</dtd:pe-decl>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for element classes ......................................... </dtd:comment>
-
-<define name="local.appendix.class">
-  <notAllowed/>
-</define>
-<define name="appendix.class">
-  <ref name="appendix.element"/>
-  <ref name="local.appendix.class"/>
-</define>
-
-<define name="local.article.class">
-  <notAllowed/>
-</define>
-<define name="article.class">
-  <ref name="article.element"/>
-  <ref name="local.article.class"/>
-</define>
-
-<define name="local.book.class">
-  <notAllowed/>
-</define>
-<define name="book.class">
-  <ref name="book.element"/>
-  <ref name="local.book.class"/>
-</define>
-
-<define name="local.chapter.class">
-  <notAllowed/>
-</define>
-<define name="chapter.class">
-  <ref name="chapter.element"/>
-  <ref name="local.chapter.class"/>
-</define>
-
-<define name="local.index.class">
-  <notAllowed/>
-</define>
-<define name="index.class">
-  <ref name="index.element"/>
-  <ref name="setindex.element"/>
-  <ref name="local.index.class"/>
-</define>
-
-<define name="local.refentry.class">
-  <notAllowed/>
-</define>
-<define name="refentry.class">
-  <ref name="refentry.element"/>
-  <ref name="local.refentry.class"/>
-</define>
-
-<define name="local.nav.class">
-  <notAllowed/>
-</define>
-<define name="nav.class">
-  <ref name="toc.element"/>
-  <ref name="lot.element"/>
-  <ref name="index.element"/>
-  <ref name="glossary.element"/>
-  <ref name="bibliography.element"/>
-  <ref name="local.nav.class"/>
-</define>
-
-<dtd:comment> Redeclaration placeholder ............................................ </dtd:comment>
-
-<dtd:comment> For redeclaring entities that are declared after this point while
+-->
+<!-- ...................................................................... -->
+<!-- Entities for module inclusions ....................................... -->
+<!-- ...................................................................... -->
+<!-- Entities for element classes ......................................... -->
+  <define name="local.appendix.class">
+    <notAllowed/>
+  </define>
+  <define name="appendix.class">
+    <choice>
+      <ref name="appendix"/>
+      <ref name="local.appendix.class"/>
+    </choice>
+  </define>
+  <define name="local.article.class">
+    <notAllowed/>
+  </define>
+  <define name="article.class">
+    <choice>
+      <ref name="article"/>
+      <ref name="local.article.class"/>
+    </choice>
+  </define>
+  <define name="local.book.class">
+    <notAllowed/>
+  </define>
+  <define name="book.class">
+    <choice>
+      <ref name="book"/>
+      <ref name="local.book.class"/>
+    </choice>
+  </define>
+  <define name="local.chapter.class">
+    <notAllowed/>
+  </define>
+  <define name="chapter.class">
+    <choice>
+      <ref name="chapter"/>
+      <ref name="local.chapter.class"/>
+    </choice>
+  </define>
+  <define name="local.index.class">
+    <notAllowed/>
+  </define>
+  <define name="index.class">
+    <choice>
+      <ref name="index"/>
+      <ref name="setindex"/>
+      <ref name="local.index.class"/>
+    </choice>
+  </define>
+  <define name="local.refentry.class">
+    <notAllowed/>
+  </define>
+  <define name="refentry.class">
+    <choice>
+      <ref name="refentry"/>
+      <ref name="local.refentry.class"/>
+    </choice>
+  </define>
+  <define name="local.nav.class">
+    <notAllowed/>
+  </define>
+  <define name="nav.class">
+    <choice>
+      <ref name="toc"/>
+      <ref name="lot"/>
+      <ref name="index"/>
+      <ref name="glossary"/>
+      <ref name="bibliography"/>
+      <ref name="local.nav.class"/>
+    </choice>
+  </define>
+<!-- Redeclaration placeholder ............................................ -->
+<!-- For redeclaring entities that are declared after this point while
      retaining their references to the entities that are declared before
-     this point </dtd:comment>
-
-<dtd:marked-section start="dbhier.redecl.module"/>
-<dtd:comment> Defining rdbhier here makes some buggy XML parsers happy. </dtd:comment>
-<dtd:pe-decl name="rdbhier"/>
-<dtd:pe-ref name="rdbhier"/>
-<dtd:marked-section end="dbhier.redecl.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for element mixtures ........................................ </dtd:comment>
-
-<dtd:comment> The DocBook TC may produce an official forms module for DocBook. </dtd:comment>
-<dtd:comment> This PE provides the hook by which it can be inserted into the DTD. </dtd:comment>
-<define name="forms.hook">
-  <notAllowed/>
-</define>
-
-<define name="local.divcomponent.mix">
-  <notAllowed/>
-</define>
-<define name="divcomponent.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="compound.class"/>
-  <ref name="genobj.class"/>
-  <ref name="descobj.class"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="forms.hook"/>
-</define>
-
-<define name="local.refcomponent.mix">
-  <notAllowed/>
-</define>
-<define name="refcomponent.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="compound.class"/>
-  <ref name="genobj.class"/>
-  <ref name="descobj.class"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.refcomponent.mix"/>
-</define>
-
-<define name="local.indexdivcomponent.mix">
-  <notAllowed/>
-</define>
-<define name="indexdivcomponent.mix">
-  <ref name="itemizedlist.element"/>
-  <ref name="orderedlist.element"/>
-  <ref name="variablelist.element"/>
-  <ref name="simplelist.element"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="anchor.element"/>
-  <ref name="remark.element"/>
-  <ref name="link.char.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.indexdivcomponent.mix"/>
-</define>
-
-<define name="local.refname.char.mix">
-  <notAllowed/>
-</define>
-
-<define name="refname.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="tech.char.class"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.partcontent.mix">
-  <notAllowed/>
-</define>
-<define name="partcontent.mix">
-  <ref name="appendix.class"/>
-  <ref name="chapter.class"/>
-  <ref name="nav.class"/>
-  <ref name="article.class"/>
-  <ref name="preface.element"/>
-  <ref name="refentry.class"/>
-  <ref name="reference.element"/>
-  <ref name="local.partcontent.mix"/>
-</define>
-
-<define name="local.refinline.char.mix">
-  <notAllowed/>
-</define>
-<define name="refinline.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="xref.char.class"/>
-        <ref name="gen.char.class"/>
-        <ref name="link.char.class"/>
-        <ref name="tech.char.class"/>
-        <ref name="base.char.class"/>
-        <ref name="docinfo.char.class"/>
-        <ref name="other.char.class"/>
-        <ref name="ndxterm.class"/>
-        <ref name="beginpage.element"/>
-        <ref name="local.refinline.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.refclass.char.mix">
-  <notAllowed/>
-</define>
-<define name="refclass.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="application.element"/>
-        <ref name="local.refclass.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<dtd:comment> Redeclaration placeholder 2 .......................................... </dtd:comment>
-
-<dtd:comment> For redeclaring entities that are declared after this point while
+     this point -->
+<!-- ...................................................................... -->
+<!-- Entities for element mixtures ........................................ -->
+<!-- The DocBook TC may produce an official forms module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+  <define name="forms.hook">
+    <notAllowed/>
+  </define>
+  <define name="local.divcomponent.mix">
+    <notAllowed/>
+  </define>
+  <define name="divcomponent.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="compound.class"/>
+      <ref name="genobj.class"/>
+      <ref name="descobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="forms.hook"/>
+      <ref name="local.divcomponent.mix"/>
+    </choice>
+  </define>
+  <define name="local.refcomponent.mix">
+    <notAllowed/>
+  </define>
+  <define name="refcomponent.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="compound.class"/>
+      <ref name="genobj.class"/>
+      <ref name="descobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.refcomponent.mix"/>
+    </choice>
+  </define>
+  <define name="local.indexdivcomponent.mix">
+    <notAllowed/>
+  </define>
+  <define name="indexdivcomponent.mix">
+    <choice>
+      <ref name="itemizedlist"/>
+      <ref name="orderedlist"/>
+      <ref name="variablelist"/>
+      <ref name="simplelist"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="anchor"/>
+      <ref name="remark"/>
+      <ref name="link.char.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.indexdivcomponent.mix"/>
+    </choice>
+  </define>
+  <define name="local.refname.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="refname.char.mix">
+    <choice>
+      <text/>
+      <ref name="tech.char.class"/>
+      <ref name="local.refname.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.partcontent.mix">
+    <notAllowed/>
+  </define>
+  <define name="partcontent.mix">
+    <choice>
+      <ref name="appendix.class"/>
+      <ref name="chapter.class"/>
+      <ref name="nav.class"/>
+      <ref name="article.class"/>
+      <ref name="preface"/>
+      <ref name="refentry.class"/>
+      <ref name="reference"/>
+      <ref name="local.partcontent.mix"/>
+    </choice>
+  </define>
+  <define name="local.refinline.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="refinline.char.mix">
+    <choice>
+      <text/>
+      <ref name="xref.char.class"/>
+      <ref name="gen.char.class"/>
+      <ref name="link.char.class"/>
+      <ref name="tech.char.class"/>
+      <ref name="base.char.class"/>
+      <ref name="docinfo.char.class"/>
+      <ref name="other.char.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.refinline.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.refclass.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="refclass.char.mix">
+    <choice>
+      <text/>
+      <ref name="application"/>
+      <ref name="local.refclass.char.mix"/>
+    </choice>
+  </define>
+<!-- Redeclaration placeholder 2 .......................................... -->
+<!-- For redeclaring entities that are declared after this point while
      retaining their references to the entities that are declared before
-     this point </dtd:comment>
-
-<dtd:marked-section start="dbhier.redecl2.module"/>
-<dtd:comment> Defining rdbhier2 here makes some buggy XML parsers happy. </dtd:comment>
-<dtd:pe-decl name="rdbhier2"/>
-<dtd:pe-ref name="rdbhier2"/>
-<dtd:marked-section end="dbhier.redecl2.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for content models .......................................... </dtd:comment>
-
-<define name="div.title.content">
-  <ref name="title.element"/>
-  <optional>
-    <ref name="subtitle.element"/>
-  </optional>
-  <optional>
-    <ref name="titleabbrev.element"/>
-  </optional>
-</define>
-
-<define name="bookcomponent.title.content">
-  <ref name="title.element"/>
-  <optional>
-    <ref name="subtitle.element"/>
-  </optional>
-  <optional>
-    <ref name="titleabbrev.element"/>
-  </optional>
-</define>
-
-<define name="sect.title.content">
-  <ref name="title.element"/>
-  <optional>
-    <ref name="subtitle.element"/>
-  </optional>
-  <optional>
-    <ref name="titleabbrev.element"/>
-  </optional>
-</define>
-
-<define name="refsect.title.content">
-  <ref name="title.element"/>
-  <optional>
-    <ref name="subtitle.element"/>
-  </optional>
-  <optional>
-    <ref name="titleabbrev.element"/>
-  </optional>
-</define>
-
-<define name="bookcomponent.content">
-  <group>
-    <oneOrMore>
-      <choice>
-        <ref name="divcomponent.mix"/>
-      </choice>
-    </oneOrMore>
+     this point -->
+<!-- ...................................................................... -->
+<!-- Entities for content models .......................................... -->
+  <define name="div.title.content">
+    <ref name="title"/>
+    <optional>
+      <ref name="subtitle"/>
+    </optional>
+    <optional>
+      <ref name="titleabbrev"/>
+    </optional>
+  </define>
+  <define name="bookcomponent.title.content">
+    <ref name="title"/>
+    <optional>
+      <ref name="subtitle"/>
+    </optional>
+    <optional>
+      <ref name="titleabbrev"/>
+    </optional>
+  </define>
+  <define name="sect.title.content">
+    <ref name="title"/>
+    <optional>
+      <ref name="subtitle"/>
+    </optional>
+    <optional>
+      <ref name="titleabbrev"/>
+    </optional>
+  </define>
+  <define name="refsect.title.content">
+    <ref name="title"/>
+    <optional>
+      <ref name="subtitle"/>
+    </optional>
+    <optional>
+      <ref name="titleabbrev"/>
+    </optional>
+  </define>
+  <define name="bookcomponent.content">
     <choice>
-      <zeroOrMore>
-        <ref name="sect1.element"/>
-      </zeroOrMore>
-      <zeroOrMore>
+      <group>
+        <oneOrMore>
+          <ref name="divcomponent.mix"/>
+        </oneOrMore>
         <choice>
-          <ref name="refentry.class"/>
+          <zeroOrMore>
+            <ref name="sect1"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="refentry.class"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="simplesect"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="section"/>
+          </zeroOrMore>
         </choice>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="simplesect.element"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="section.element"/>
-      </zeroOrMore>
-    </choice>
-  </group>
-  <choice>
-    <oneOrMore>
-      <ref name="sect1.element"/>
-    </oneOrMore>
-    <oneOrMore>
-      <choice>
+      </group>
+      <oneOrMore>
+        <ref name="sect1"/>
+      </oneOrMore>
+      <oneOrMore>
         <ref name="refentry.class"/>
-      </choice>
-    </oneOrMore>
-    <oneOrMore>
-      <ref name="simplesect.element"/>
-    </oneOrMore>
-    <oneOrMore>
-      <ref name="section.element"/>
-    </oneOrMore>
-  </choice>
-</define>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Set and SetInfo ...................................................... </dtd:comment>
-
-<dtd:pe-decl name="set.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="set.content.module"/>
-<dtd:pe-decl name="set.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="set.module"/>
-<define name="local.set.attrib">
-  <notAllowed/>
-</define>
-<define name="set.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="set.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="set.element"/>
-<define name="set.element">
-  <element name="set">
-    <group>
+      </oneOrMore>
+      <oneOrMore>
+        <ref name="simplesect"/>
+      </oneOrMore>
+      <oneOrMore>
+        <ref name="section"/>
+      </oneOrMore>
+    </choice>
+  </define>
+<!-- ...................................................................... -->
+<!-- Set and SetInfo ...................................................... -->
+  <define name="local.set.attrib">
+    <empty/>
+  </define>
+  <define name="set.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="set">
+    <element name="set">
+      <ref name="set.attlist"/>
       <optional>
-        <group>
-          <ref name="div.title.content"/>
-        </group>
+        <ref name="div.title.content"/>
       </optional>
       <optional>
-        <ref name="setinfo.element"/>
+        <ref name="setinfo"/>
       </optional>
       <optional>
-        <ref name="toc.element"/>
+        <ref name="toc"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="book.class"/>
-        </choice>
+        <ref name="book.class"/>
       </oneOrMore>
       <optional>
-        <ref name="setindex.element"/>
+        <ref name="setindex"/>
       </optional>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="set.element"/>
-
-<dtd:comment> FPI: SGML formal public identifier </dtd:comment>
-
-
-<dtd:pe-decl name="set.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="set.attlist"/>
-<define name="set.attlist">
-  <optional>
-    <attribute name="fpi"/>
-  </optional>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="set.role.attrib"/>
-  <ref name="local.set.attrib"/>
-</define>
-<dtd:marked-section end="set.attlist"/>
-<dtd:marked-section end="set.module"/>
-
-<dtd:pe-decl name="setinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setinfo.module"/>
-<define name="local.setinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="setinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="setinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setinfo.element"/>
-<define name="setinfo.element">
-  <element name="setinfo">
-    <group>
+    </element>
+  </define>
+<!--end of set.element-->
+<!-- FPI: SGML formal public identifier -->
+  <define name="set.attlist" combine="interleave">
+    <optional>
+      <attribute name="fpi"/>
+    </optional>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="set.role.attrib"/>
+    <ref name="local.set.attrib"/>
+  </define>
+<!--end of set.attlist-->
+<!--end of set.module-->
+  <define name="local.setinfo.attrib">
+    <empty/>
+  </define>
+  <define name="setinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="setinfo">
+    <element name="setinfo">
+      <ref name="setinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="setinfo.element"/>
-
-<dtd:comment> Contents: IDs of the ToC, Books, and SetIndex that comprise 
-		the set, in the order of their appearance </dtd:comment>
-
-
-<dtd:pe-decl name="setinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setinfo.attlist"/>
-<define name="setinfo.attlist">
-  <optional>
-    <attribute name="contents" a:attributeType="IDREFS">
-      <list>
-        <oneOrMore>
-          <data type="token"/>
-        </oneOrMore>
-      </list>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="setinfo.role.attrib"/>
-  <ref name="local.setinfo.attrib"/>
-</define>
-<dtd:marked-section end="setinfo.attlist"/>
-<dtd:marked-section end="setinfo.module"/>
-<dtd:marked-section end="set.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Book and BookInfo .................................................... </dtd:comment>
-
-<dtd:pe-decl name="book.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="book.content.module"/>
-<dtd:pe-decl name="book.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="book.module"/>
-
-<define name="local.book.attrib">
-  <notAllowed/>
-</define>
-<define name="book.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="book.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="book.element"/>
-<define name="book.element">
-  <element name="book">
-    <group>
+    </element>
+  </define>
+<!--end of setinfo.element-->
+<!-- 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>
+      <attribute name="contents">
+        <data type="IDREFS"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="setinfo.role.attrib"/>
+    <ref name="local.setinfo.attrib"/>
+  </define>
+<!--end of setinfo.attlist-->
+<!--end of setinfo.module-->
+<!--end of set.content.module-->
+<!-- ...................................................................... -->
+<!-- Book and BookInfo .................................................... -->
+  <define name="local.book.attrib">
+    <empty/>
+  </define>
+  <define name="book.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="book">
+    <element name="book">
+      <ref name="book.attlist"/>
       <optional>
-        <group>
-          <ref name="div.title.content"/>
-        </group>
+        <ref name="div.title.content"/>
       </optional>
       <optional>
-        <ref name="bookinfo.element"/>
+        <ref name="bookinfo"/>
       </optional>
       <zeroOrMore>
         <choice>
-          <ref name="dedication.element"/>
-          <ref name="toc.element"/>
-          <ref name="lot.element"/>
-          <ref name="glossary.element"/>
-          <ref name="bibliography.element"/>
-          <ref name="preface.element"/>
+          <ref name="dedication"/>
+          <ref name="toc"/>
+          <ref name="lot"/>
+          <ref name="glossary"/>
+          <ref name="bibliography"/>
+          <ref name="preface"/>
           <ref name="chapter.class"/>
-          <ref name="reference.element"/>
-          <ref name="part.element"/>
+          <ref name="reference"/>
+          <ref name="part"/>
           <ref name="article.class"/>
           <ref name="appendix.class"/>
           <ref name="index.class"/>
-          <ref name="colophon.element"/>
+          <ref name="colophon"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="book.element"/>
-
-<dtd:comment> FPI: SGML formal public identifier </dtd:comment>
-
-
-<dtd:pe-decl name="book.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="book.attlist"/>
-<define name="book.attlist">
-  <optional>
-    <attribute name="fpi"/>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="book.role.attrib"/>
-  <ref name="local.book.attrib"/>
-</define>
-<dtd:marked-section end="book.attlist"/>
-<dtd:marked-section end="book.module"/>
-
-<dtd:pe-decl name="bookinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bookinfo.module"/>
-<define name="local.bookinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="bookinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bookinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bookinfo.element"/>
-<define name="bookinfo.element">
-  <element name="bookinfo">
-    <group>
+    </element>
+  </define>
+<!--end of book.element-->
+<!-- FPI: SGML formal public identifier -->
+  <define name="book.attlist" combine="interleave">
+    <optional>
+      <attribute name="fpi"/>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="book.role.attrib"/>
+    <ref name="local.book.attrib"/>
+  </define>
+<!--end of book.attlist-->
+<!--end of book.module-->
+  <define name="local.bookinfo.attrib">
+    <empty/>
+  </define>
+  <define name="bookinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bookinfo">
+    <element name="bookinfo">
+      <ref name="bookinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="bookinfo.element"/>
-
-<dtd:comment> Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
+    </element>
+  </define>
+<!--end of bookinfo.element-->
+<!-- Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
 		Appendixes, References, GLossary, Bibliography, and indexes
-		comprising the Book, in the order of their appearance </dtd:comment>
-
-
-<dtd:pe-decl name="bookinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bookinfo.attlist"/>
-<define name="bookinfo.attlist">
-  <optional>
-    <attribute name="contents" a:attributeType="IDREFS">
-      <list>
-        <oneOrMore>
-          <data type="token"/>
-        </oneOrMore>
-      </list>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="bookinfo.role.attrib"/>
-  <ref name="local.bookinfo.attrib"/>
-</define>
-<dtd:marked-section end="bookinfo.attlist"/>
-<dtd:marked-section end="bookinfo.module"/>
-<dtd:marked-section end="book.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Dedication, ToC, and LoT ............................................. </dtd:comment>
-
-<dtd:pe-decl name="dedication.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dedication.module"/>
-<define name="local.dedication.attrib">
-  <notAllowed/>
-</define>
-<define name="dedication.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="dedication.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dedication.element"/>
-<define name="dedication.element">
-  <element name="dedication">
-    <group>
+		comprising the Book, in the order of their appearance -->
+  <define name="bookinfo.attlist" combine="interleave">
+    <optional>
+      <attribute name="contents">
+        <data type="IDREFS"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="bookinfo.role.attrib"/>
+    <ref name="local.bookinfo.attrib"/>
+  </define>
+<!--end of bookinfo.attlist-->
+<!--end of bookinfo.module-->
+<!--end of book.content.module-->
+<!-- ...................................................................... -->
+<!-- Dedication, ToC, and LoT ............................................. -->
+  <define name="local.dedication.attrib">
+    <empty/>
+  </define>
+  <define name="dedication.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="dedication">
+    <element name="dedication">
+      <ref name="dedication.attlist"/>
       <optional>
-        <group>
-          <ref name="sect.title.content"/>
-        </group>
+        <ref name="sect.title.content"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="legalnotice.mix"/>
-        </choice>
+        <ref name="legalnotice.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="dedication.element"/>
-
-<dtd:pe-decl name="dedication.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dedication.attlist"/>
-<define name="dedication.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="dedication.role.attrib"/>
-  <ref name="local.dedication.attrib"/>
-</define>
-<dtd:marked-section end="dedication.attlist"/>
-<dtd:marked-section end="dedication.module"/>
-
-<dtd:pe-decl name="colophon.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="colophon.module"/>
-<define name="local.colophon.attrib">
-  <notAllowed/>
-</define>
-<define name="colophon.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="colophon.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="colophon.element"/>
-<define name="colophon.element">
-  <element name="colophon">
-    <group>
+    </element>
+  </define>
+<!--end of dedication.element-->
+  <define name="dedication.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="dedication.role.attrib"/>
+    <ref name="local.dedication.attrib"/>
+  </define>
+<!--end of dedication.attlist-->
+<!--end of dedication.module-->
+  <define name="local.colophon.attrib">
+    <empty/>
+  </define>
+  <define name="colophon.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="colophon">
+    <element name="colophon">
+      <ref name="colophon.attlist"/>
       <optional>
-        <group>
-          <ref name="sect.title.content"/>
-        </group>
+        <ref name="sect.title.content"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="textobject.mix"/>
-        </choice>
+        <ref name="textobject.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="colophon.element"/>
-
-<dtd:pe-decl name="colophon.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="colophon.attlist"/>
-<define name="colophon.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="colophon.role.attrib"/>
-  <ref name="local.colophon.attrib"/>
-</define>
-<dtd:marked-section end="colophon.attlist"/>
-<dtd:marked-section end="colophon.module"/>
-
-<dtd:pe-decl name="toc.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toc.content.module"/>
-<dtd:pe-decl name="toc.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toc.module"/>
-<define name="local.toc.attrib">
-  <notAllowed/>
-</define>
-<define name="toc.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="toc.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toc.element"/>
-<define name="toc.element">
-  <element name="toc">
-    <group>
-      <optional>
-        <ref name="beginpage.element"/>
-      </optional>
+    </element>
+  </define>
+<!--end of colophon.element-->
+  <define name="colophon.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="colophon.role.attrib"/>
+    <ref name="local.colophon.attrib"/>
+  </define>
+<!--end of colophon.attlist-->
+<!--end of colophon.module-->
+  <define name="local.toc.attrib">
+    <empty/>
+  </define>
+  <define name="toc.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="toc.attlist"/>
       <optional>
-        <group>
-          <ref name="bookcomponent.title.content"/>
-        </group>
+        <ref name="bookcomponent.title.content"/>
       </optional>
       <zeroOrMore>
-        <ref name="tocfront.element"/>
+        <ref name="tocfront"/>
       </zeroOrMore>
       <zeroOrMore>
         <choice>
-          <ref name="tocpart.element"/>
-          <ref name="tocchap.element"/>
+          <ref name="tocpart"/>
+          <ref name="tocchap"/>
         </choice>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="tocback.element"/>
+        <ref name="tocback"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="toc.element"/>
-
-<dtd:pe-decl name="toc.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toc.attlist"/>
-<define name="toc.attlist">
-  <ref name="pagenum.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="toc.role.attrib"/>
-  <ref name="local.toc.attrib"/>
-</define>
-<dtd:marked-section end="toc.attlist"/>
-<dtd:marked-section end="toc.module"/>
-
-<dtd:pe-decl name="tocfront.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocfront.module"/>
-<define name="local.tocfront.attrib">
-  <notAllowed/>
-</define>
-<define name="tocfront.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="tocfront.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocfront.element"/>
-<define name="tocfront.element">
-  <element name="tocfront">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of toc.element-->
+  <define name="toc.attlist" combine="interleave">
+    <ref name="pagenum.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="toc.role.attrib"/>
+    <ref name="local.toc.attrib"/>
+  </define>
+<!--end of toc.attlist-->
+<!--end of toc.module-->
+  <define name="local.tocfront.attrib">
+    <empty/>
+  </define>
+  <define name="tocfront.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="tocfront">
+    <element name="tocfront">
+      <ref name="tocfront.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="tocfront.element"/>
-
-<dtd:comment> to element that this entry represents </dtd:comment>
-
-
-<dtd:pe-decl name="tocfront.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocfront.attlist"/>
-<define name="tocfront.attlist">
-  <ref name="label.attrib"/>
-  <ref name="linkend.attrib"/>
-  <ref name="pagenum.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="tocfront.role.attrib"/>
-  <ref name="local.tocfront.attrib"/>
-</define>
-<dtd:marked-section end="tocfront.attlist"/>
-<dtd:marked-section end="tocfront.module"/>
-
-<dtd:pe-decl name="tocentry.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocentry.module"/>
-<define name="local.tocentry.attrib">
-  <notAllowed/>
-</define>
-<define name="tocentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="tocentry.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocentry.element"/>
-<define name="tocentry.element">
-  <element name="tocentry">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of tocfront.element-->
+<!-- to element that this entry represents -->
+  <define name="tocfront.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="linkend.attrib"/>
+    <ref name="pagenum.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="tocfront.role.attrib"/>
+    <ref name="local.tocfront.attrib"/>
+  </define>
+<!--end of tocfront.attlist-->
+<!--end of tocfront.module-->
+  <define name="local.tocentry.attrib">
+    <empty/>
+  </define>
+  <define name="tocentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="tocentry">
+    <element name="tocentry">
+      <ref name="tocentry.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="tocentry.element"/>
-
-<dtd:comment> to element that this entry represents </dtd:comment>
-
-
-<dtd:pe-decl name="tocentry.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocentry.attlist"/>
-<define name="tocentry.attlist">
-  <ref name="linkend.attrib"/>
-  <ref name="pagenum.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="tocentry.role.attrib"/>
-  <ref name="local.tocentry.attrib"/>
-</define>
-<dtd:marked-section end="tocentry.attlist"/>
-<dtd:marked-section end="tocentry.module"/>
-
-<dtd:pe-decl name="tocpart.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocpart.module"/>
-<define name="local.tocpart.attrib">
-  <notAllowed/>
-</define>
-<define name="tocpart.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="tocpart.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocpart.element"/>
-<define name="tocpart.element">
-  <element name="tocpart">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of tocentry.element-->
+<!-- to element that this entry represents -->
+  <define name="tocentry.attlist" combine="interleave">
+    <ref name="linkend.attrib"/>
+    <ref name="pagenum.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="tocentry.role.attrib"/>
+    <ref name="local.tocentry.attrib"/>
+  </define>
+<!--end of tocentry.attlist-->
+<!--end of tocentry.module-->
+  <define name="local.tocpart.attrib">
+    <empty/>
+  </define>
+  <define name="tocpart.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="tocpart">
+    <element name="tocpart">
+      <ref name="tocpart.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="tocchap.element"/>
+        <ref name="tocchap"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="tocpart.element"/>
-
-<dtd:pe-decl name="tocpart.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocpart.attlist"/>
-<define name="tocpart.attlist">
-  <ref name="common.attrib"/>
-  <ref name="tocpart.role.attrib"/>
-  <ref name="local.tocpart.attrib"/>
-</define>
-<dtd:marked-section end="tocpart.attlist"/>
-<dtd:marked-section end="tocpart.module"/>
-
-<dtd:pe-decl name="tocchap.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocchap.module"/>
-<define name="local.tocchap.attrib">
-  <notAllowed/>
-</define>
-<define name="tocchap.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="tocchap.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocchap.element"/>
-<define name="tocchap.element">
-  <element name="tocchap">
-    <group>
+    </element>
+  </define>
+<!--end of tocpart.element-->
+  <define name="tocpart.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="tocpart.role.attrib"/>
+    <ref name="local.tocpart.attrib"/>
+  </define>
+<!--end of tocpart.attlist-->
+<!--end of tocpart.module-->
+  <define name="local.tocchap.attrib">
+    <empty/>
+  </define>
+  <define name="tocchap.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="tocchap">
+    <element name="tocchap">
+      <ref name="tocchap.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="toclevel1.element"/>
+        <ref name="toclevel1"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="tocchap.element"/>
-
-<dtd:pe-decl name="tocchap.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocchap.attlist"/>
-<define name="tocchap.attlist">
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="tocchap.role.attrib"/>
-  <ref name="local.tocchap.attrib"/>
-</define>
-<dtd:marked-section end="tocchap.attlist"/>
-<dtd:marked-section end="tocchap.module"/>
-
-<dtd:pe-decl name="toclevel1.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel1.module"/>
-<define name="local.toclevel1.attrib">
-  <notAllowed/>
-</define>
-<define name="toclevel1.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="toclevel1.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel1.element"/>
-<define name="toclevel1.element">
-  <element name="toclevel1">
-    <group>
+    </element>
+  </define>
+<!--end of tocchap.element-->
+  <define name="tocchap.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="tocchap.role.attrib"/>
+    <ref name="local.tocchap.attrib"/>
+  </define>
+<!--end of tocchap.attlist-->
+<!--end of tocchap.module-->
+  <define name="local.toclevel1.attrib">
+    <empty/>
+  </define>
+  <define name="toclevel1.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="toclevel1">
+    <element name="toclevel1">
+      <ref name="toclevel1.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="toclevel2.element"/>
+        <ref name="toclevel2"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="toclevel1.element"/>
-
-<dtd:pe-decl name="toclevel1.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel1.attlist"/>
-<define name="toclevel1.attlist">
-  <ref name="common.attrib"/>
-  <ref name="toclevel1.role.attrib"/>
-  <ref name="local.toclevel1.attrib"/>
-</define>
-<dtd:marked-section end="toclevel1.attlist"/>
-<dtd:marked-section end="toclevel1.module"/>
-
-<dtd:pe-decl name="toclevel2.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel2.module"/>
-<define name="local.toclevel2.attrib">
-  <notAllowed/>
-</define>
-<define name="toclevel2.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="toclevel2.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel2.element"/>
-<define name="toclevel2.element">
-  <element name="toclevel2">
-    <group>
+    </element>
+  </define>
+<!--end of toclevel1.element-->
+  <define name="toclevel1.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="toclevel1.role.attrib"/>
+    <ref name="local.toclevel1.attrib"/>
+  </define>
+<!--end of toclevel1.attlist-->
+<!--end of toclevel1.module-->
+  <define name="local.toclevel2.attrib">
+    <empty/>
+  </define>
+  <define name="toclevel2.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="toclevel2">
+    <element name="toclevel2">
+      <ref name="toclevel2.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="toclevel3.element"/>
+        <ref name="toclevel3"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="toclevel2.element"/>
-
-<dtd:pe-decl name="toclevel2.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel2.attlist"/>
-<define name="toclevel2.attlist">
-  <ref name="common.attrib"/>
-  <ref name="toclevel2.role.attrib"/>
-  <ref name="local.toclevel2.attrib"/>
-</define>
-<dtd:marked-section end="toclevel2.attlist"/>
-<dtd:marked-section end="toclevel2.module"/>
-
-<dtd:pe-decl name="toclevel3.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel3.module"/>
-<define name="local.toclevel3.attrib">
-  <notAllowed/>
-</define>
-<define name="toclevel3.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="toclevel3.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel3.element"/>
-<define name="toclevel3.element">
-  <element name="toclevel3">
-    <group>
+    </element>
+  </define>
+<!--end of toclevel2.element-->
+  <define name="toclevel2.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="toclevel2.role.attrib"/>
+    <ref name="local.toclevel2.attrib"/>
+  </define>
+<!--end of toclevel2.attlist-->
+<!--end of toclevel2.module-->
+  <define name="local.toclevel3.attrib">
+    <empty/>
+  </define>
+  <define name="toclevel3.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="toclevel3">
+    <element name="toclevel3">
+      <ref name="toclevel3.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="toclevel4.element"/>
+        <ref name="toclevel4"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="toclevel3.element"/>
-
-<dtd:pe-decl name="toclevel3.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel3.attlist"/>
-<define name="toclevel3.attlist">
-  <ref name="common.attrib"/>
-  <ref name="toclevel3.role.attrib"/>
-  <ref name="local.toclevel3.attrib"/>
-</define>
-<dtd:marked-section end="toclevel3.attlist"/>
-<dtd:marked-section end="toclevel3.module"/>
-
-<dtd:pe-decl name="toclevel4.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel4.module"/>
-<define name="local.toclevel4.attrib">
-  <notAllowed/>
-</define>
-<define name="toclevel4.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="toclevel4.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel4.element"/>
-<define name="toclevel4.element">
-  <element name="toclevel4">
-    <group>
+    </element>
+  </define>
+<!--end of toclevel3.element-->
+  <define name="toclevel3.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="toclevel3.role.attrib"/>
+    <ref name="local.toclevel3.attrib"/>
+  </define>
+<!--end of toclevel3.attlist-->
+<!--end of toclevel3.module-->
+  <define name="local.toclevel4.attrib">
+    <empty/>
+  </define>
+  <define name="toclevel4.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="toclevel4">
+    <element name="toclevel4">
+      <ref name="toclevel4.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="toclevel5.element"/>
+        <ref name="toclevel5"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="toclevel4.element"/>
-
-<dtd:pe-decl name="toclevel4.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel4.attlist"/>
-<define name="toclevel4.attlist">
-  <ref name="common.attrib"/>
-  <ref name="toclevel4.role.attrib"/>
-  <ref name="local.toclevel4.attrib"/>
-</define>
-<dtd:marked-section end="toclevel4.attlist"/>
-<dtd:marked-section end="toclevel4.module"/>
-
-<dtd:pe-decl name="toclevel5.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel5.module"/>
-<define name="local.toclevel5.attrib">
-  <notAllowed/>
-</define>
-<define name="toclevel5.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="toclevel5.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel5.element"/>
-<define name="toclevel5.element">
-  <element name="toclevel5">
-    <group>
+    </element>
+  </define>
+<!--end of toclevel4.element-->
+  <define name="toclevel4.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="toclevel4.role.attrib"/>
+    <ref name="local.toclevel4.attrib"/>
+  </define>
+<!--end of toclevel4.attlist-->
+<!--end of toclevel4.module-->
+  <define name="local.toclevel5.attrib">
+    <empty/>
+  </define>
+  <define name="toclevel5.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="toclevel5">
+    <element name="toclevel5">
+      <ref name="toclevel5.attlist"/>
       <oneOrMore>
-        <ref name="tocentry.element"/>
+        <ref name="tocentry"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="toclevel5.element"/>
-
-<dtd:pe-decl name="toclevel5.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="toclevel5.attlist"/>
-<define name="toclevel5.attlist">
-  <ref name="common.attrib"/>
-  <ref name="toclevel5.role.attrib"/>
-  <ref name="local.toclevel5.attrib"/>
-</define>
-<dtd:marked-section end="toclevel5.attlist"/>
-<dtd:marked-section end="toclevel5.module"/>
-
-<dtd:pe-decl name="tocback.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocback.module"/>
-<define name="local.tocback.attrib">
-  <notAllowed/>
-</define>
-<define name="tocback.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="tocback.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocback.element"/>
-<define name="tocback.element">
-  <element name="tocback">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of toclevel5.element-->
+  <define name="toclevel5.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="toclevel5.role.attrib"/>
+    <ref name="local.toclevel5.attrib"/>
+  </define>
+<!--end of toclevel5.attlist-->
+<!--end of toclevel5.module-->
+  <define name="local.tocback.attrib">
+    <empty/>
+  </define>
+  <define name="tocback.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="tocback">
+    <element name="tocback">
+      <ref name="tocback.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="tocback.element"/>
-
-<dtd:comment> to element that this entry represents </dtd:comment>
-
-
-<dtd:pe-decl name="tocback.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tocback.attlist"/>
-<define name="tocback.attlist">
-  <ref name="label.attrib"/>
-  <ref name="linkend.attrib"/>
-  <ref name="pagenum.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="tocback.role.attrib"/>
-  <ref name="local.tocback.attrib"/>
-</define>
-<dtd:marked-section end="tocback.attlist"/>
-<dtd:marked-section end="tocback.module"/>
-<dtd:marked-section end="toc.content.module"/>
-
-<dtd:pe-decl name="lot.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lot.content.module"/>
-<dtd:pe-decl name="lot.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lot.module"/>
-<define name="local.lot.attrib">
-  <notAllowed/>
-</define>
-<define name="lot.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="lot.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lot.element"/>
-<define name="lot.element">
-  <element name="lot">
-    <group>
-      <optional>
-        <ref name="beginpage.element"/>
-      </optional>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of tocback.element-->
+<!-- to element that this entry represents -->
+  <define name="tocback.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="linkend.attrib"/>
+    <ref name="pagenum.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="tocback.role.attrib"/>
+    <ref name="local.tocback.attrib"/>
+  </define>
+<!--end of tocback.attlist-->
+<!--end of tocback.module-->
+<!--end of toc.content.module-->
+  <define name="local.lot.attrib">
+    <empty/>
+  </define>
+  <define name="lot.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="lot">
+    <element name="lot">
+      <ref name="lot.attlist"/>
       <optional>
-        <group>
-          <ref name="bookcomponent.title.content"/>
-        </group>
+        <ref name="bookcomponent.title.content"/>
       </optional>
       <zeroOrMore>
-        <ref name="lotentry.element"/>
+        <ref name="lotentry"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="lot.element"/>
-
-<dtd:pe-decl name="lot.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lot.attlist"/>
-<define name="lot.attlist">
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="lot.role.attrib"/>
-  <ref name="local.lot.attrib"/>
-</define>
-<dtd:marked-section end="lot.attlist"/>
-<dtd:marked-section end="lot.module"/>
-
-<dtd:pe-decl name="lotentry.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lotentry.module"/>
-<define name="local.lotentry.attrib">
-  <notAllowed/>
-</define>
-<define name="lotentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="lotentry.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lotentry.element"/>
-<define name="lotentry.element">
-  <element name="lotentry">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of lot.element-->
+  <define name="lot.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="lot.role.attrib"/>
+    <ref name="local.lot.attrib"/>
+  </define>
+<!--end of lot.attlist-->
+<!--end of lot.module-->
+  <define name="local.lotentry.attrib">
+    <empty/>
+  </define>
+  <define name="lotentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="lotentry">
+    <element name="lotentry">
+      <ref name="lotentry.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="lotentry.element"/>
-
-<dtd:comment> SrcCredit: Information about the source of the entry, 
-		as for a list of illustrations </dtd:comment>
-<dtd:comment> linkend: to element that this entry represents</dtd:comment>
-<dtd:pe-decl name="lotentry.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="lotentry.attlist"/>
-<define name="lotentry.attlist">
-  <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>
-<dtd:marked-section end="lotentry.attlist"/>
-<dtd:marked-section end="lotentry.module"/>
-<dtd:marked-section end="lot.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Appendix, Chapter, Part, Preface, Reference, PartIntro ............... </dtd:comment>
-
-<dtd:pe-decl name="appendix.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="appendix.module"/>
-<define name="local.appendix.attrib">
-  <notAllowed/>
-</define>
-<define name="appendix.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="appendix.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="appendix.element"/>
-<define name="appendix.element">
-  <element name="appendix">
-    <group>
-      <optional>
-        <ref name="beginpage.element"/>
-      </optional>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of lotentry.element-->
+<!-- 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">
+    <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>
+<!--end of lotentry.attlist-->
+<!--end of lotentry.module-->
+<!--end of lot.content.module-->
+<!-- ...................................................................... -->
+<!-- Appendix, Chapter, Part, Preface, Reference, PartIntro ............... -->
+  <define name="local.appendix.attrib">
+    <empty/>
+  </define>
+  <define name="appendix.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="appendix">
+    <element name="appendix">
+      <ref name="appendix.attlist"/>
       <optional>
-        <ref name="appendixinfo.element"/>
+        <ref name="appendixinfo"/>
       </optional>
-      <group>
-        <ref name="bookcomponent.title.content"/>
-      </group>
+      <ref name="bookcomponent.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <optional>
-        <ref name="tocchap.element"/>
+        <ref name="tocchap"/>
       </optional>
-      <group>
-        <ref name="bookcomponent.content"/>
-      </group>
+      <ref name="bookcomponent.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="appendix.element"/>
-
-<dtd:pe-decl name="appendix.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="appendix.attlist"/>
-<define name="appendix.attlist">
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="appendix.role.attrib"/>
-  <ref name="local.appendix.attrib"/>
-</define>
-<dtd:marked-section end="appendix.attlist"/>
-<dtd:marked-section end="appendix.module"/>
-
-<dtd:pe-decl name="chapter.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="chapter.module"/>
-<define name="local.chapter.attrib">
-  <notAllowed/>
-</define>
-<define name="chapter.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="chapter.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="chapter.element"/>
-<define name="chapter.element">
-  <element name="chapter">
-    <group>
+    </element>
+  </define>
+<!--end of appendix.element-->
+  <define name="appendix.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="appendix.role.attrib"/>
+    <ref name="local.appendix.attrib"/>
+  </define>
+<!--end of appendix.attlist-->
+<!--end of appendix.module-->
+  <define name="local.chapter.attrib">
+    <empty/>
+  </define>
+  <define name="chapter.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="chapter">
+    <element name="chapter">
+      <ref name="chapter.attlist"/>
       <optional>
-        <ref name="beginpage.element"/>
+        <ref name="chapterinfo"/>
       </optional>
-      <optional>
-        <ref name="chapterinfo.element"/>
-      </optional>
-      <group>
-        <ref name="bookcomponent.title.content"/>
-      </group>
+      <ref name="bookcomponent.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <optional>
-        <ref name="tocchap.element"/>
+        <ref name="tocchap"/>
       </optional>
-      <group>
-        <ref name="bookcomponent.content"/>
-      </group>
+      <ref name="bookcomponent.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="chapter.element"/>
-
-<dtd:pe-decl name="chapter.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="chapter.attlist"/>
-<define name="chapter.attlist">
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="chapter.role.attrib"/>
-  <ref name="local.chapter.attrib"/>
-</define>
-<dtd:marked-section end="chapter.attlist"/>
-<dtd:marked-section end="chapter.module"/>
-
-<dtd:pe-decl name="part.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="part.module"/>
-
-<dtd:comment> Note that Part was to have its content model reduced in V4.1.2.  This
-change will not be made after all. </dtd:comment>
-
-<define name="local.part.attrib">
-  <notAllowed/>
-</define>
-<define name="part.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="part.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="part.element"/>
-<define name="part.element">
-  <element name="part">
-    <group>
+    </element>
+  </define>
+<!--end of chapter.element-->
+  <define name="chapter.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="chapter.role.attrib"/>
+    <ref name="local.chapter.attrib"/>
+  </define>
+<!--end of chapter.attlist-->
+<!--end of chapter.module-->
+<!-- Note that Part was to have its content model reduced in V4.1.2.  This
+change will not be made after all. -->
+  <define name="local.part.attrib">
+    <empty/>
+  </define>
+  <define name="part.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="part">
+    <element name="part">
+      <ref name="part.attlist"/>
       <optional>
-        <ref name="beginpage.element"/>
+        <ref name="partinfo"/>
       </optional>
+      <ref name="bookcomponent.title.content"/>
       <optional>
-        <ref name="partinfo.element"/>
-      </optional>
-      <group>
-        <ref name="bookcomponent.title.content"/>
-      </group>
-      <optional>
-        <ref name="partintro.element"/>
+        <ref name="partintro"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="partcontent.mix"/>
-        </choice>
+        <ref name="partcontent.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="part.element"/>
-
-<dtd:pe-decl name="part.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="part.attlist"/>
-<define name="part.attlist">
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="part.role.attrib"/>
-  <ref name="local.part.attrib"/>
-</define>
-<dtd:marked-section end="part.attlist"/>
-<dtd:comment>ELEMENT PartIntro (defined below)</dtd:comment>
-<dtd:marked-section end="part.module"/>
-
-<dtd:pe-decl name="preface.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="preface.module"/>
-<define name="local.preface.attrib">
-  <notAllowed/>
-</define>
-<define name="preface.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="preface.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="preface.element"/>
-<define name="preface.element">
-  <element name="preface">
-    <group>
-      <optional>
-        <ref name="beginpage.element"/>
-      </optional>
+    </element>
+  </define>
+<!--end of part.element-->
+  <define name="part.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="part.role.attrib"/>
+    <ref name="local.part.attrib"/>
+  </define>
+<!--end of part.attlist-->
+<!--ELEMENT PartIntro (defined below)-->
+<!--end of part.module-->
+  <define name="local.preface.attrib">
+    <empty/>
+  </define>
+  <define name="preface.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="preface">
+    <element name="preface">
+      <ref name="preface.attlist"/>
       <optional>
-        <ref name="prefaceinfo.element"/>
+        <ref name="prefaceinfo"/>
       </optional>
-      <group>
-        <ref name="bookcomponent.title.content"/>
-      </group>
+      <ref name="bookcomponent.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <optional>
-        <ref name="tocchap.element"/>
+        <ref name="tocchap"/>
       </optional>
-      <group>
-        <ref name="bookcomponent.content"/>
-      </group>
+      <ref name="bookcomponent.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="preface.element"/>
-
-<dtd:pe-decl name="preface.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="preface.attlist"/>
-<define name="preface.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="preface.role.attrib"/>
-  <ref name="local.preface.attrib"/>
-</define>
-<dtd:marked-section end="preface.attlist"/>
-<dtd:marked-section end="preface.module"/>
-
-<dtd:pe-decl name="reference.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="reference.module"/>
-<define name="local.reference.attrib">
-  <notAllowed/>
-</define>
-<define name="reference.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="reference.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="reference.element"/>
-<define name="reference.element">
-  <element name="reference">
-    <group>
+    </element>
+  </define>
+<!--end of preface.element-->
+  <define name="preface.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="preface.role.attrib"/>
+    <ref name="local.preface.attrib"/>
+  </define>
+<!--end of preface.attlist-->
+<!--end of preface.module-->
+  <define name="local.reference.attrib">
+    <empty/>
+  </define>
+  <define name="reference.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="reference">
+    <element name="reference">
+      <ref name="reference.attlist"/>
       <optional>
-        <ref name="beginpage.element"/>
+        <ref name="referenceinfo"/>
       </optional>
+      <ref name="bookcomponent.title.content"/>
       <optional>
-        <ref name="referenceinfo.element"/>
-      </optional>
-      <group>
-        <ref name="bookcomponent.title.content"/>
-      </group>
-      <optional>
-        <ref name="partintro.element"/>
+        <ref name="partintro"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="refentry.class"/>
-        </choice>
+        <ref name="refentry.class"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="reference.element"/>
-
-<dtd:pe-decl name="reference.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="reference.attlist"/>
-<define name="reference.attlist">
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="reference.role.attrib"/>
-  <ref name="local.reference.attrib"/>
-</define>
-<dtd:marked-section end="reference.attlist"/>
-<dtd:comment>ELEMENT PartIntro (defined below)</dtd:comment>
-<dtd:marked-section end="reference.module"/>
-
-<dtd:pe-decl name="partintro.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="partintro.module"/>
-<define name="local.partintro.attrib">
-  <notAllowed/>
-</define>
-<define name="partintro.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="partintro.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="partintro.element"/>
-<define name="partintro.element">
-  <element name="partintro">
-    <group>
+    </element>
+  </define>
+<!--end of reference.element-->
+  <define name="reference.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="reference.role.attrib"/>
+    <ref name="local.reference.attrib"/>
+  </define>
+<!--end of reference.attlist-->
+<!--ELEMENT PartIntro (defined below)-->
+<!--end of reference.module-->
+  <define name="local.partintro.attrib">
+    <empty/>
+  </define>
+  <define name="partintro.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="partintro">
+    <element name="partintro">
+      <ref name="partintro.attlist"/>
       <optional>
-        <group>
-          <ref name="div.title.content"/>
-        </group>
+        <ref name="div.title.content"/>
       </optional>
-      <group>
-        <ref name="bookcomponent.content"/>
-      </group>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="partintro.element"/>
-
-<dtd:pe-decl name="partintro.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="partintro.attlist"/>
-<define name="partintro.attlist">	
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="local.partintro.attrib"/>
-  <ref name="partintro.role.attrib"/>
-</define>
-<dtd:marked-section end="partintro.attlist"/>
-<dtd:marked-section end="partintro.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Other Info elements .................................................. </dtd:comment>
-
-<dtd:pe-decl name="appendixinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="appendixinfo.module"/>
-<define name="local.appendixinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="appendixinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="appendixinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="appendixinfo.element"/>
-<define name="appendixinfo.element">
-  <element name="appendixinfo">
-    <group>
+      <ref name="bookcomponent.content"/>
+    </element>
+  </define>
+<!--end of partintro.element-->
+  <define name="partintro.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="local.partintro.attrib"/>
+    <ref name="partintro.role.attrib"/>
+  </define>
+<!--end of partintro.attlist-->
+<!--end of partintro.module-->
+<!-- ...................................................................... -->
+<!-- Other Info elements .................................................. -->
+  <define name="local.appendixinfo.attrib">
+    <empty/>
+  </define>
+  <define name="appendixinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="appendixinfo">
+    <element name="appendixinfo">
+      <ref name="appendixinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="appendixinfo.element"/>
-
-<dtd:pe-decl name="appendixinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="appendixinfo.attlist"/>
-<define name="appendixinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="appendixinfo.role.attrib"/>
-  <ref name="local.appendixinfo.attrib"/>
-</define>
-<dtd:marked-section end="appendixinfo.attlist"/>
-<dtd:marked-section end="appendixinfo.module"/>
-
-<dtd:pe-decl name="bibliographyinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliographyinfo.module"/>
-<define name="local.bibliographyinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="bibliographyinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bibliographyinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliographyinfo.element"/>
-<define name="bibliographyinfo.element">
-  <element name="bibliographyinfo">
-    <group>
+    </element>
+  </define>
+<!--end of appendixinfo.element-->
+  <define name="appendixinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="appendixinfo.role.attrib"/>
+    <ref name="local.appendixinfo.attrib"/>
+  </define>
+<!--end of appendixinfo.attlist-->
+<!--end of appendixinfo.module-->
+  <define name="local.bibliographyinfo.attrib">
+    <empty/>
+  </define>
+  <define name="bibliographyinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliographyinfo">
+    <element name="bibliographyinfo">
+      <ref name="bibliographyinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="bibliographyinfo.element"/>
-
-<dtd:pe-decl name="bibliographyinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliographyinfo.attlist"/>
-<define name="bibliographyinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="bibliographyinfo.role.attrib"/>
-  <ref name="local.bibliographyinfo.attrib"/>
-</define>
-<dtd:marked-section end="bibliographyinfo.attlist"/>
-<dtd:marked-section end="bibliographyinfo.module"/>
-
-<dtd:pe-decl name="chapterinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="chapterinfo.module"/>
-<define name="local.chapterinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="chapterinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="chapterinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="chapterinfo.element"/>
-<define name="chapterinfo.element">
-  <element name="chapterinfo">
-    <group>
+    </element>
+  </define>
+<!--end of bibliographyinfo.element-->
+  <define name="bibliographyinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="bibliographyinfo.role.attrib"/>
+    <ref name="local.bibliographyinfo.attrib"/>
+  </define>
+<!--end of bibliographyinfo.attlist-->
+<!--end of bibliographyinfo.module-->
+  <define name="local.chapterinfo.attrib">
+    <empty/>
+  </define>
+  <define name="chapterinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="chapterinfo">
+    <element name="chapterinfo">
+      <ref name="chapterinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="chapterinfo.element"/>
-
-<dtd:pe-decl name="chapterinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="chapterinfo.attlist"/>
-<define name="chapterinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="chapterinfo.role.attrib"/>
-  <ref name="local.chapterinfo.attrib"/>
-</define>
-<dtd:marked-section end="chapterinfo.attlist"/>
-<dtd:marked-section end="chapterinfo.module"/>
-
-<dtd:pe-decl name="glossaryinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossaryinfo.module"/>
-<define name="local.glossaryinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="glossaryinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossaryinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossaryinfo.element"/>
-<define name="glossaryinfo.element">
-  <element name="glossaryinfo">
-    <group>
+    </element>
+  </define>
+<!--end of chapterinfo.element-->
+  <define name="chapterinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="chapterinfo.role.attrib"/>
+    <ref name="local.chapterinfo.attrib"/>
+  </define>
+<!--end of chapterinfo.attlist-->
+<!--end of chapterinfo.module-->
+  <define name="local.glossaryinfo.attrib">
+    <empty/>
+  </define>
+  <define name="glossaryinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossaryinfo">
+    <element name="glossaryinfo">
+      <ref name="glossaryinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="glossaryinfo.element"/>
-
-<dtd:pe-decl name="glossaryinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossaryinfo.attlist"/>
-<define name="glossaryinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="glossaryinfo.role.attrib"/>
-  <ref name="local.glossaryinfo.attrib"/>
-</define>
-<dtd:marked-section end="glossaryinfo.attlist"/>
-<dtd:marked-section end="glossaryinfo.module"/>
-
-<dtd:pe-decl name="indexinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexinfo.module"/>
-<define name="local.indexinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="indexinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="indexinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexinfo.element"/>
-<define name="indexinfo.element">
-  <element name="indexinfo">
-    <group>
+    </element>
+  </define>
+<!--end of glossaryinfo.element-->
+  <define name="glossaryinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="glossaryinfo.role.attrib"/>
+    <ref name="local.glossaryinfo.attrib"/>
+  </define>
+<!--end of glossaryinfo.attlist-->
+<!--end of glossaryinfo.module-->
+  <define name="local.indexinfo.attrib">
+    <empty/>
+  </define>
+  <define name="indexinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="indexinfo">
+    <element name="indexinfo">
+      <ref name="indexinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="indexinfo.element"/>
-
-<dtd:pe-decl name="indexinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexinfo.attlist"/>
-<define name="indexinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="indexinfo.role.attrib"/>
-  <ref name="local.indexinfo.attrib"/>
-</define>
-<dtd:marked-section end="indexinfo.attlist"/>
-<dtd:marked-section end="indexinfo.module"/>
-
-<dtd:pe-decl name="setindexinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setindexinfo.module"/>
-<define name="local.setindexinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="setindexinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="setindexinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setindexinfo.element"/>
-<define name="setindexinfo.element">
-  <element name="setindexinfo">
-    <group>
+    </element>
+  </define>
+<!--end of indexinfo.element-->
+  <define name="indexinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="indexinfo.role.attrib"/>
+    <ref name="local.indexinfo.attrib"/>
+  </define>
+<!--end of indexinfo.attlist-->
+<!--end of indexinfo.module-->
+  <define name="local.setindexinfo.attrib">
+    <empty/>
+  </define>
+  <define name="setindexinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="setindexinfo">
+    <element name="setindexinfo">
+      <ref name="setindexinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="setindexinfo.element"/>
-
-<dtd:pe-decl name="setindexinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setindexinfo.attlist"/>
-<define name="setindexinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="setindexinfo.role.attrib"/>
-  <ref name="local.setindexinfo.attrib"/>
-</define>
-<dtd:marked-section end="setindexinfo.attlist"/>
-<dtd:marked-section end="setindexinfo.module"/>
-
-<dtd:pe-decl name="partinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="partinfo.module"/>
-<define name="local.partinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="partinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="partinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="partinfo.element"/>
-<define name="partinfo.element">
-  <element name="partinfo">
-    <group>
+    </element>
+  </define>
+<!--end of setindexinfo.element-->
+  <define name="setindexinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="setindexinfo.role.attrib"/>
+    <ref name="local.setindexinfo.attrib"/>
+  </define>
+<!--end of setindexinfo.attlist-->
+<!--end of setindexinfo.module-->
+  <define name="local.partinfo.attrib">
+    <empty/>
+  </define>
+  <define name="partinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="partinfo">
+    <element name="partinfo">
+      <ref name="partinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="partinfo.element"/>
-
-<dtd:pe-decl name="partinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="partinfo.attlist"/>
-<define name="partinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="partinfo.role.attrib"/>
-  <ref name="local.partinfo.attrib"/>
-</define>
-<dtd:marked-section end="partinfo.attlist"/>
-<dtd:marked-section end="partinfo.module"/>
-
-<dtd:pe-decl name="prefaceinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="prefaceinfo.module"/>
-<define name="local.prefaceinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="prefaceinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="prefaceinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="prefaceinfo.element"/>
-<define name="prefaceinfo.element">
-  <element name="prefaceinfo">
-    <group>
+    </element>
+  </define>
+<!--end of partinfo.element-->
+  <define name="partinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="partinfo.role.attrib"/>
+    <ref name="local.partinfo.attrib"/>
+  </define>
+<!--end of partinfo.attlist-->
+<!--end of partinfo.module-->
+  <define name="local.prefaceinfo.attrib">
+    <empty/>
+  </define>
+  <define name="prefaceinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="prefaceinfo">
+    <element name="prefaceinfo">
+      <ref name="prefaceinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="prefaceinfo.element"/>
-
-<dtd:pe-decl name="prefaceinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="prefaceinfo.attlist"/>
-<define name="prefaceinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="prefaceinfo.role.attrib"/>
-  <ref name="local.prefaceinfo.attrib"/>
-</define>
-<dtd:marked-section end="prefaceinfo.attlist"/>
-<dtd:marked-section end="prefaceinfo.module"/>
-
-<dtd:pe-decl name="refentryinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentryinfo.module"/>
-<define name="local.refentryinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="refentryinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refentryinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentryinfo.element"/>
-<define name="refentryinfo.element">
-  <element name="refentryinfo">
-    <group>
+    </element>
+  </define>
+<!--end of prefaceinfo.element-->
+  <define name="prefaceinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="prefaceinfo.role.attrib"/>
+    <ref name="local.prefaceinfo.attrib"/>
+  </define>
+<!--end of prefaceinfo.attlist-->
+<!--end of prefaceinfo.module-->
+  <define name="local.refentryinfo.attrib">
+    <empty/>
+  </define>
+  <define name="refentryinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refentryinfo">
+    <element name="refentryinfo">
+      <ref name="refentryinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refentryinfo.element"/>
-
-<dtd:pe-decl name="refentryinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentryinfo.attlist"/>
-<define name="refentryinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refentryinfo.role.attrib"/>
-  <ref name="local.refentryinfo.attrib"/>
-</define>
-<dtd:marked-section end="refentryinfo.attlist"/>
-<dtd:marked-section end="refentryinfo.module"/>
-
-<dtd:pe-decl name="refsect1info.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect1info.module"/>
-<define name="local.refsect1info.attrib">
-  <notAllowed/>
-</define>
-<define name="refsect1info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsect1info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect1info.element"/>
-<define name="refsect1info.element">
-  <element name="refsect1info">
-    <group>
+    </element>
+  </define>
+<!--end of refentryinfo.element-->
+  <define name="refentryinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refentryinfo.role.attrib"/>
+    <ref name="local.refentryinfo.attrib"/>
+  </define>
+<!--end of refentryinfo.attlist-->
+<!--end of refentryinfo.module-->
+  <define name="local.refsect1info.attrib">
+    <empty/>
+  </define>
+  <define name="refsect1info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsect1info">
+    <element name="refsect1info">
+      <ref name="refsect1info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsect1info.element"/>
-
-<dtd:pe-decl name="refsect1info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect1info.attlist"/>
-<define name="refsect1info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refsect1info.role.attrib"/>
-  <ref name="local.refsect1info.attrib"/>
-</define>
-<dtd:marked-section end="refsect1info.attlist"/>
-<dtd:marked-section end="refsect1info.module"/>
-
-<dtd:pe-decl name="refsect2info.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect2info.module"/>
-<define name="local.refsect2info.attrib">
-  <notAllowed/>
-</define>
-<define name="refsect2info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsect2info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect2info.element"/>
-<define name="refsect2info.element">
-  <element name="refsect2info">
-    <group>
+    </element>
+  </define>
+<!--end of refsect1info.element-->
+  <define name="refsect1info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refsect1info.role.attrib"/>
+    <ref name="local.refsect1info.attrib"/>
+  </define>
+<!--end of refsect1info.attlist-->
+<!--end of refsect1info.module-->
+  <define name="local.refsect2info.attrib">
+    <empty/>
+  </define>
+  <define name="refsect2info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsect2info">
+    <element name="refsect2info">
+      <ref name="refsect2info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsect2info.element"/>
-
-<dtd:pe-decl name="refsect2info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect2info.attlist"/>
-<define name="refsect2info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refsect2info.role.attrib"/>
-  <ref name="local.refsect2info.attrib"/>
-</define>
-<dtd:marked-section end="refsect2info.attlist"/>
-<dtd:marked-section end="refsect2info.module"/>
-
-<dtd:pe-decl name="refsect3info.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect3info.module"/>
-<define name="local.refsect3info.attrib">
-  <notAllowed/>
-</define>
-<define name="refsect3info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsect3info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect3info.element"/>
-<define name="refsect3info.element">
-  <element name="refsect3info">
-    <group>
+    </element>
+  </define>
+<!--end of refsect2info.element-->
+  <define name="refsect2info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refsect2info.role.attrib"/>
+    <ref name="local.refsect2info.attrib"/>
+  </define>
+<!--end of refsect2info.attlist-->
+<!--end of refsect2info.module-->
+  <define name="local.refsect3info.attrib">
+    <empty/>
+  </define>
+  <define name="refsect3info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsect3info">
+    <element name="refsect3info">
+      <ref name="refsect3info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsect3info.element"/>
-
-<dtd:pe-decl name="refsect3info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect3info.attlist"/>
-<define name="refsect3info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refsect3info.role.attrib"/>
-  <ref name="local.refsect3info.attrib"/>
-</define>
-<dtd:marked-section end="refsect3info.attlist"/>
-<dtd:marked-section end="refsect3info.module"/>
-
-<dtd:pe-decl name="refsynopsisdivinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsynopsisdivinfo.module"/>
-<define name="local.refsynopsisdivinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="refsynopsisdivinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsynopsisdivinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsynopsisdivinfo.element"/>
-<define name="refsynopsisdivinfo.element">
-  <element name="refsynopsisdivinfo">
-    <group>
+    </element>
+  </define>
+<!--end of refsect3info.element-->
+  <define name="refsect3info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refsect3info.role.attrib"/>
+    <ref name="local.refsect3info.attrib"/>
+  </define>
+<!--end of refsect3info.attlist-->
+<!--end of refsect3info.module-->
+  <define name="local.refsynopsisdivinfo.attrib">
+    <empty/>
+  </define>
+  <define name="refsynopsisdivinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsynopsisdivinfo">
+    <element name="refsynopsisdivinfo">
+      <ref name="refsynopsisdivinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsynopsisdivinfo.element"/>
-
-<dtd:pe-decl name="refsynopsisdivinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsynopsisdivinfo.attlist"/>
-<define name="refsynopsisdivinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refsynopsisdivinfo.role.attrib"/>
-  <ref name="local.refsynopsisdivinfo.attrib"/>
-</define>
-<dtd:marked-section end="refsynopsisdivinfo.attlist"/>
-<dtd:marked-section end="refsynopsisdivinfo.module"/>
-
-<dtd:pe-decl name="referenceinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="referenceinfo.module"/>
-<define name="local.referenceinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="referenceinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="referenceinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="referenceinfo.element"/>
-<define name="referenceinfo.element">
-  <element name="referenceinfo">
-    <group>
+    </element>
+  </define>
+<!--end of refsynopsisdivinfo.element-->
+  <define name="refsynopsisdivinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refsynopsisdivinfo.role.attrib"/>
+    <ref name="local.refsynopsisdivinfo.attrib"/>
+  </define>
+<!--end of refsynopsisdivinfo.attlist-->
+<!--end of refsynopsisdivinfo.module-->
+  <define name="local.referenceinfo.attrib">
+    <empty/>
+  </define>
+  <define name="referenceinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="referenceinfo">
+    <element name="referenceinfo">
+      <ref name="referenceinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="referenceinfo.element"/>
-
-<dtd:pe-decl name="referenceinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="referenceinfo.attlist"/>
-<define name="referenceinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="referenceinfo.role.attrib"/>
-  <ref name="local.referenceinfo.attrib"/>
-</define>
-<dtd:marked-section end="referenceinfo.attlist"/>
-<dtd:marked-section end="referenceinfo.module"/>
-
-<define name="local.sect1info.attrib">
-  <notAllowed/>
-</define>
-<define name="sect1info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect1info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect1info.element"/>
-<define name="sect1info.element">
-  <element name="sect1info">
-    <group>
+    </element>
+  </define>
+<!--end of referenceinfo.element-->
+  <define name="referenceinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="referenceinfo.role.attrib"/>
+    <ref name="local.referenceinfo.attrib"/>
+  </define>
+<!--end of referenceinfo.attlist-->
+<!--end of referenceinfo.module-->
+  <define name="local.sect1info.attrib">
+    <empty/>
+  </define>
+  <define name="sect1info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect1info">
+    <element name="sect1info">
+      <ref name="sect1info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect1info.element"/>
-
-<dtd:pe-decl name="sect1info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect1info.attlist"/>
-<define name="sect1info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sect1info.role.attrib"/>
-  <ref name="local.sect1info.attrib"/>
-</define>
-<dtd:marked-section end="sect1info.attlist"/>
-
-<define name="local.sect2info.attrib">
-  <notAllowed/>
-</define>
-<define name="sect2info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect2info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect2info.element"/>
-<define name="sect2info.element">
-  <element name="sect2info">
-    <group>
+    </element>
+  </define>
+<!--end of sect1info.element-->
+  <define name="sect1info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sect1info.role.attrib"/>
+    <ref name="local.sect1info.attrib"/>
+  </define>
+<!--end of sect1info.attlist-->
+  <define name="local.sect2info.attrib">
+    <empty/>
+  </define>
+  <define name="sect2info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect2info">
+    <element name="sect2info">
+      <ref name="sect2info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect2info.element"/>
-
-<dtd:pe-decl name="sect2info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect2info.attlist"/>
-<define name="sect2info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sect2info.role.attrib"/>
-  <ref name="local.sect2info.attrib"/>
-</define>
-<dtd:marked-section end="sect2info.attlist"/>
-
-<define name="local.sect3info.attrib">
-  <notAllowed/>
-</define>
-<define name="sect3info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect3info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect3info.element"/>
-<define name="sect3info.element">
-  <element name="sect3info">
-    <group>
+    </element>
+  </define>
+<!--end of sect2info.element-->
+  <define name="sect2info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sect2info.role.attrib"/>
+    <ref name="local.sect2info.attrib"/>
+  </define>
+<!--end of sect2info.attlist-->
+  <define name="local.sect3info.attrib">
+    <empty/>
+  </define>
+  <define name="sect3info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect3info">
+    <element name="sect3info">
+      <ref name="sect3info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect3info.element"/>
-
-<dtd:pe-decl name="sect3info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect3info.attlist"/>
-<define name="sect3info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sect3info.role.attrib"/>
-  <ref name="local.sect3info.attrib"/>
-</define>
-<dtd:marked-section end="sect3info.attlist"/>
-
-<define name="local.sect4info.attrib">
-  <notAllowed/>
-</define>
-<define name="sect4info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect4info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect4info.element"/>
-<define name="sect4info.element">
-  <element name="sect4info">
-    <group>
+    </element>
+  </define>
+<!--end of sect3info.element-->
+  <define name="sect3info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sect3info.role.attrib"/>
+    <ref name="local.sect3info.attrib"/>
+  </define>
+<!--end of sect3info.attlist-->
+  <define name="local.sect4info.attrib">
+    <empty/>
+  </define>
+  <define name="sect4info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect4info">
+    <element name="sect4info">
+      <ref name="sect4info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect4info.element"/>
-
-<dtd:pe-decl name="sect4info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect4info.attlist"/>
-<define name="sect4info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sect4info.role.attrib"/>
-  <ref name="local.sect4info.attrib"/>
-</define>
-<dtd:marked-section end="sect4info.attlist"/>
-
-<define name="local.sect5info.attrib">
-  <notAllowed/>
-</define>
-<define name="sect5info.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect5info.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect5info.element"/>
-<define name="sect5info.element">
-  <element name="sect5info">
-    <group>
+    </element>
+  </define>
+<!--end of sect4info.element-->
+  <define name="sect4info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sect4info.role.attrib"/>
+    <ref name="local.sect4info.attrib"/>
+  </define>
+<!--end of sect4info.attlist-->
+  <define name="local.sect5info.attrib">
+    <empty/>
+  </define>
+  <define name="sect5info.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect5info">
+    <element name="sect5info">
+      <ref name="sect5info.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect5info.element"/>
-
-<dtd:pe-decl name="sect5info.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect5info.attlist"/>
-<define name="sect5info.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sect5info.role.attrib"/>
-  <ref name="local.sect5info.attrib"/>
-</define>
-<dtd:marked-section end="sect5info.attlist"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Section (parallel to Sect*) ......................................... </dtd:comment>
-
-<dtd:pe-decl name="section.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="section.content.module"/>
-<dtd:pe-decl name="section.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="section.module"/>
-<define name="local.section.attrib">
-  <notAllowed/>
-</define>
-<define name="section.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="section.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="section.element"/>
-<define name="section.element">
-  <element name="section">
-    <group>
+    </element>
+  </define>
+<!--end of sect5info.element-->
+  <define name="sect5info.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sect5info.role.attrib"/>
+    <ref name="local.sect5info.attrib"/>
+  </define>
+<!--end of sect5info.attlist-->
+<!-- ...................................................................... -->
+<!-- Section (parallel to Sect*) ......................................... -->
+  <define name="local.section.attrib">
+    <empty/>
+  </define>
+  <define name="section.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="section">
+    <element name="section">
+      <ref name="section.attlist"/>
       <optional>
-        <ref name="sectioninfo.element"/>
+        <ref name="sectioninfo"/>
       </optional>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="divcomponent.mix"/>
-            </choice>
+            <ref name="divcomponent.mix"/>
           </oneOrMore>
           <choice>
             <zeroOrMore>
-              <choice>
-                <ref name="refentry.class"/>
-              </choice>
+              <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="section.element"/>
+              <ref name="section"/>
             </zeroOrMore>
           </choice>
         </group>
         <oneOrMore>
-          <choice>
-            <ref name="refentry.class"/>
-          </choice>
+          <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="section.element"/>
+          <ref name="section"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="section.element"/>
-
-<dtd:pe-decl name="section.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="section.attlist"/>
-<define name="section.attlist">
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="section.role.attrib"/>
-  <ref name="local.section.attrib"/>
-</define>
-<dtd:marked-section end="section.attlist"/>
-<dtd:marked-section end="section.module"/>
-
-<dtd:pe-decl name="sectioninfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sectioninfo.module"/>
-<define name="sectioninfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-<define name="local.sectioninfo.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:pe-decl name="sectioninfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sectioninfo.element"/>
-<define name="sectioninfo.element">
-  <element name="sectioninfo">
-    <group>
+    </element>
+  </define>
+<!--end of section.element-->
+  <define name="section.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="section.role.attrib"/>
+    <ref name="local.section.attrib"/>
+  </define>
+<!--end of section.attlist-->
+<!--end of section.module-->
+  <define name="sectioninfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="local.sectioninfo.attrib">
+    <empty/>
+  </define>
+  <define name="sectioninfo">
+    <element name="sectioninfo">
+      <ref name="sectioninfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sectioninfo.element"/>
-
-<dtd:pe-decl name="sectioninfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sectioninfo.attlist"/>
-<define name="sectioninfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sectioninfo.role.attrib"/>
-  <ref name="local.sectioninfo.attrib"/>
-</define>
-<dtd:marked-section end="sectioninfo.attlist"/>
-<dtd:marked-section end="sectioninfo.module"/>
-<dtd:marked-section end="section.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Sect1, Sect2, Sect3, Sect4, Sect5 .................................... </dtd:comment>
-
-<dtd:pe-decl name="sect1.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect1.module"/>
-<define name="local.sect1.attrib">
-  <notAllowed/>
-</define>
-<define name="sect1.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect1.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect1.element"/>
-<define name="sect1.element">
-  <element name="sect1">
-    <group>
+    </element>
+  </define>
+<!--end of sectioninfo.element-->
+  <define name="sectioninfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sectioninfo.role.attrib"/>
+    <ref name="local.sectioninfo.attrib"/>
+  </define>
+<!--end of sectioninfo.attlist-->
+<!--end of sectioninfo.module-->
+<!--end of section.content.module-->
+<!-- ...................................................................... -->
+<!-- Sect1, Sect2, Sect3, Sect4, Sect5 .................................... -->
+  <define name="local.sect1.attrib">
+    <empty/>
+  </define>
+  <define name="sect1.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect1">
+    <element name="sect1">
+      <ref name="sect1.attlist"/>
       <optional>
-        <ref name="sect1info.element"/>
+        <ref name="sect1info"/>
       </optional>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="divcomponent.mix"/>
-            </choice>
+            <ref name="divcomponent.mix"/>
           </oneOrMore>
           <choice>
             <zeroOrMore>
-              <choice>
-                <ref name="refentry.class"/>
-              </choice>
+              <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="sect2.element"/>
+              <ref name="sect2"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="simplesect.element"/>
+              <ref name="simplesect"/>
             </zeroOrMore>
           </choice>
         </group>
         <oneOrMore>
-          <choice>
-            <ref name="refentry.class"/>
-          </choice>
+          <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="sect2.element"/>
+          <ref name="sect2"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="simplesect.element"/>
+          <ref name="simplesect"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect1.element"/>
-
-<dtd:comment> Renderas: Indicates the format in which the heading should
-		appear </dtd:comment>
-
-
-<dtd:pe-decl name="sect1.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect1.attlist"/>
-<define name="sect1.attlist">
-  <optional>
-    <attribute name="renderas">
-      <choice>
-        <value>sect2</value>
-        <value>sect3</value>
-        <value>sect4</value>
-        <value>sect5</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="sect1.role.attrib"/>
-  <ref name="local.sect1.attrib"/>
-</define>
-<dtd:marked-section end="sect1.attlist"/>
-<dtd:marked-section end="sect1.module"/>
-
-<dtd:pe-decl name="sect2.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect2.module"/>
-<define name="local.sect2.attrib">
-  <notAllowed/>
-</define>
-<define name="sect2.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect2.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect2.element"/>
-<define name="sect2.element">
-  <element name="sect2">
-    <group>
+    </element>
+  </define>
+<!--end of sect1.element-->
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+  <define name="sect1.attlist" combine="interleave">
+    <optional>
+      <attribute name="renderas">
+        <choice>
+          <value>sect2</value>
+          <value>sect3</value>
+          <value>sect4</value>
+          <value>sect5</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="sect1.role.attrib"/>
+    <ref name="local.sect1.attrib"/>
+  </define>
+<!--end of sect1.attlist-->
+<!--end of sect1.module-->
+  <define name="local.sect2.attrib">
+    <empty/>
+  </define>
+  <define name="sect2.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect2">
+    <element name="sect2">
+      <ref name="sect2.attlist"/>
       <optional>
-        <ref name="sect2info.element"/>
+        <ref name="sect2info"/>
       </optional>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="divcomponent.mix"/>
-            </choice>
+            <ref name="divcomponent.mix"/>
           </oneOrMore>
           <choice>
             <zeroOrMore>
-              <choice>
-                <ref name="refentry.class"/>
-              </choice>
+              <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="sect3.element"/>
+              <ref name="sect3"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="simplesect.element"/>
+              <ref name="simplesect"/>
             </zeroOrMore>
           </choice>
         </group>
         <oneOrMore>
-          <choice>
-            <ref name="refentry.class"/>
-          </choice>
+          <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="sect3.element"/>
+          <ref name="sect3"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="simplesect.element"/>
+          <ref name="simplesect"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect2.element"/>
-
-<dtd:comment> Renderas: Indicates the format in which the heading should
-		appear </dtd:comment>
-
-
-<dtd:pe-decl name="sect2.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect2.attlist"/>
-<define name="sect2.attlist">
-  <optional>
-    <attribute name="renderas">
-      <choice>
-        <value>sect1</value>
-        <value>sect3</value>
-        <value>sect4</value>
-        <value>sect5</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="sect2.role.attrib"/>
-  <ref name="local.sect2.attrib"/>
-</define>
-<dtd:marked-section end="sect2.attlist"/>
-<dtd:marked-section end="sect2.module"/>
-
-<dtd:pe-decl name="sect3.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect3.module"/>
-<define name="local.sect3.attrib">
-  <notAllowed/>
-</define>
-<define name="sect3.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect3.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect3.element"/>
-<define name="sect3.element">
-  <element name="sect3">
-    <group>
+    </element>
+  </define>
+<!--end of sect2.element-->
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+  <define name="sect2.attlist" combine="interleave">
+    <optional>
+      <attribute name="renderas">
+        <choice>
+          <value>sect1</value>
+          <value>sect3</value>
+          <value>sect4</value>
+          <value>sect5</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="sect2.role.attrib"/>
+    <ref name="local.sect2.attrib"/>
+  </define>
+<!--end of sect2.attlist-->
+<!--end of sect2.module-->
+  <define name="local.sect3.attrib">
+    <empty/>
+  </define>
+  <define name="sect3.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect3">
+    <element name="sect3">
+      <ref name="sect3.attlist"/>
       <optional>
-        <ref name="sect3info.element"/>
+        <ref name="sect3info"/>
       </optional>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="divcomponent.mix"/>
-            </choice>
+            <ref name="divcomponent.mix"/>
           </oneOrMore>
           <choice>
             <zeroOrMore>
-              <choice>
-                <ref name="refentry.class"/>
-              </choice>
+              <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="sect4.element"/>
+              <ref name="sect4"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="simplesect.element"/>
+              <ref name="simplesect"/>
             </zeroOrMore>
           </choice>
         </group>
         <oneOrMore>
-          <choice>
-            <ref name="refentry.class"/>
-          </choice>
+          <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="sect4.element"/>
+          <ref name="sect4"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="simplesect.element"/>
+          <ref name="simplesect"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect3.element"/>
-
-<dtd:comment> Renderas: Indicates the format in which the heading should
-		appear </dtd:comment>
-
-
-<dtd:pe-decl name="sect3.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect3.attlist"/>
-<define name="sect3.attlist">
-  <optional>
-    <attribute name="renderas">
-      <choice>
-        <value>sect1</value>
-        <value>sect2</value>
-        <value>sect4</value>
-        <value>sect5</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="sect3.role.attrib"/>
-  <ref name="local.sect3.attrib"/>
-</define>
-<dtd:marked-section end="sect3.attlist"/>
-<dtd:marked-section end="sect3.module"/>
-
-<dtd:pe-decl name="sect4.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect4.module"/>
-<define name="local.sect4.attrib">
-  <notAllowed/>
-</define>
-<define name="sect4.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect4.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect4.element"/>
-<define name="sect4.element">
-  <element name="sect4">
-    <group>
+    </element>
+  </define>
+<!--end of sect3.element-->
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+  <define name="sect3.attlist" combine="interleave">
+    <optional>
+      <attribute name="renderas">
+        <choice>
+          <value>sect1</value>
+          <value>sect2</value>
+          <value>sect4</value>
+          <value>sect5</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="sect3.role.attrib"/>
+    <ref name="local.sect3.attrib"/>
+  </define>
+<!--end of sect3.attlist-->
+<!--end of sect3.module-->
+  <define name="local.sect4.attrib">
+    <empty/>
+  </define>
+  <define name="sect4.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect4">
+    <element name="sect4">
+      <ref name="sect4.attlist"/>
       <optional>
-        <ref name="sect4info.element"/>
+        <ref name="sect4info"/>
       </optional>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="divcomponent.mix"/>
-            </choice>
+            <ref name="divcomponent.mix"/>
           </oneOrMore>
           <choice>
             <zeroOrMore>
-              <choice>
-                <ref name="refentry.class"/>
-              </choice>
+              <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="sect5.element"/>
+              <ref name="sect5"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="simplesect.element"/>
+              <ref name="simplesect"/>
             </zeroOrMore>
           </choice>
         </group>
         <oneOrMore>
-          <choice>
-            <ref name="refentry.class"/>
-          </choice>
+          <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="sect5.element"/>
+          <ref name="sect5"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="simplesect.element"/>
+          <ref name="simplesect"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect4.element"/>
-
-<dtd:comment> Renderas: Indicates the format in which the heading should
-		appear </dtd:comment>
-
-
-<dtd:pe-decl name="sect4.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect4.attlist"/>
-<define name="sect4.attlist">
-  <optional>
-    <attribute name="renderas">
-      <choice>
-        <value>sect1</value>
-        <value>sect2</value>
-        <value>sect3</value>
-        <value>sect5</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="sect4.role.attrib"/>
-  <ref name="local.sect4.attrib"/>
-</define>
-<dtd:marked-section end="sect4.attlist"/>
-<dtd:marked-section end="sect4.module"/>
-
-<dtd:pe-decl name="sect5.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect5.module"/>
-<define name="local.sect5.attrib">
-  <notAllowed/>
-</define>
-<define name="sect5.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sect5.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect5.element"/>
-<define name="sect5.element">
-  <element name="sect5">
-    <group>
+    </element>
+  </define>
+<!--end of sect4.element-->
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+  <define name="sect4.attlist" combine="interleave">
+    <optional>
+      <attribute name="renderas">
+        <choice>
+          <value>sect1</value>
+          <value>sect2</value>
+          <value>sect3</value>
+          <value>sect5</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="sect4.role.attrib"/>
+    <ref name="local.sect4.attrib"/>
+  </define>
+<!--end of sect4.attlist-->
+<!--end of sect4.module-->
+  <define name="local.sect5.attrib">
+    <empty/>
+  </define>
+  <define name="sect5.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sect5">
+    <element name="sect5">
+      <ref name="sect5.attlist"/>
       <optional>
-        <ref name="sect5info.element"/>
+        <ref name="sect5info"/>
       </optional>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="divcomponent.mix"/>
-            </choice>
+            <ref name="divcomponent.mix"/>
           </oneOrMore>
           <choice>
             <zeroOrMore>
-              <choice>
-                <ref name="refentry.class"/>
-              </choice>
+              <ref name="refentry.class"/>
             </zeroOrMore>
             <zeroOrMore>
-              <ref name="simplesect.element"/>
+              <ref name="simplesect"/>
             </zeroOrMore>
           </choice>
         </group>
-        <oneOrMore>
-          <choice>
-            <ref name="refentry.class"/>
-          </choice>
+        <oneOrMore>
+          <ref name="refentry.class"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="simplesect.element"/>
+          <ref name="simplesect"/>
         </oneOrMore>
       </choice>
       <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-        </choice>
+        <ref name="nav.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="sect5.element"/>
-
-<dtd:comment> Renderas: Indicates the format in which the heading should
-		appear </dtd:comment>
-
-
-<dtd:pe-decl name="sect5.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="sect5.attlist"/>
-<define name="sect5.attlist">
-  <optional>
-    <attribute name="renderas">
-      <choice>
-        <value>sect1</value>
-        <value>sect2</value>
-        <value>sect3</value>
-        <value>sect4</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="sect5.role.attrib"/>
-  <ref name="local.sect5.attrib"/>
-</define>
-<dtd:marked-section end="sect5.attlist"/>
-<dtd:marked-section end="sect5.module"/>
-
-<dtd:pe-decl name="simplesect.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="simplesect.module"/>
-<define name="local.simplesect.attrib">
-  <notAllowed/>
-</define>
-<define name="simplesect.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="simplesect.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="simplesect.element"/>
-<define name="simplesect.element">
-  <element name="simplesect">
-    <group>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+    </element>
+  </define>
+<!--end of sect5.element-->
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+  <define name="sect5.attlist" combine="interleave">
+    <optional>
+      <attribute name="renderas">
+        <choice>
+          <value>sect1</value>
+          <value>sect2</value>
+          <value>sect3</value>
+          <value>sect4</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="sect5.role.attrib"/>
+    <ref name="local.sect5.attrib"/>
+  </define>
+<!--end of sect5.attlist-->
+<!--end of sect5.module-->
+  <define name="local.simplesect.attrib">
+    <empty/>
+  </define>
+  <define name="simplesect.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="simplesect">
+    <element name="simplesect">
+      <ref name="simplesect.attlist"/>
+      <ref name="sect.title.content"/>
       <oneOrMore>
-        <choice>
-          <ref name="divcomponent.mix"/>
-        </choice>
+        <ref name="divcomponent.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="simplesect.element"/>
-
-<dtd:pe-decl name="simplesect.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="simplesect.attlist"/>
-<define name="simplesect.attlist">
-  <ref name="common.attrib"/>
-  <ref name="simplesect.role.attrib"/>
-  <ref name="local.simplesect.attrib"/>
-</define>
-<dtd:marked-section end="simplesect.attlist"/>
-<dtd:marked-section end="simplesect.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Bibliography ......................................................... </dtd:comment>
-
-<dtd:pe-decl name="bibliography.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliography.content.module"/>
-<dtd:pe-decl name="bibliography.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliography.module"/>
-<define name="local.bibliography.attrib">
-  <notAllowed/>
-</define>
-<define name="bibliography.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bibliography.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliography.element"/>
-<define name="bibliography.element">
-  <element name="bibliography">
-    <group>
+    </element>
+  </define>
+<!--end of simplesect.element-->
+  <define name="simplesect.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="simplesect.role.attrib"/>
+    <ref name="local.simplesect.attrib"/>
+  </define>
+<!--end of simplesect.attlist-->
+<!--end of simplesect.module-->
+<!-- ...................................................................... -->
+<!-- Bibliography ......................................................... -->
+  <define name="local.bibliography.attrib">
+    <empty/>
+  </define>
+  <define name="bibliography.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliography">
+    <element name="bibliography">
+      <ref name="bibliography.attlist"/>
       <optional>
-        <ref name="bibliographyinfo.element"/>
+        <ref name="bibliographyinfo"/>
       </optional>
       <optional>
-        <group>
-          <ref name="bookcomponent.title.content"/>
-        </group>
+        <ref name="bookcomponent.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <choice>
         <oneOrMore>
-          <ref name="bibliodiv.element"/>
+          <ref name="bibliodiv"/>
         </oneOrMore>
         <oneOrMore>
           <choice>
-            <ref name="biblioentry.element"/>
-            <ref name="bibliomixed.element"/>
+            <ref name="biblioentry"/>
+            <ref name="bibliomixed"/>
           </choice>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="bibliography.element"/>
-
-<dtd:pe-decl name="bibliography.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliography.attlist"/>
-<define name="bibliography.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="bibliography.role.attrib"/>
-  <ref name="local.bibliography.attrib"/>
-</define>
-<dtd:marked-section end="bibliography.attlist"/>
-<dtd:marked-section end="bibliography.module"/>
-
-<dtd:pe-decl name="bibliodiv.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliodiv.module"/>
-<define name="local.bibliodiv.attrib">
-  <notAllowed/>
-</define>
-<define name="bibliodiv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bibliodiv.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliodiv.element"/>
-<define name="bibliodiv.element">
-  <element name="bibliodiv">
-    <group>
+    </element>
+  </define>
+<!--end of bibliography.element-->
+  <define name="bibliography.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="bibliography.role.attrib"/>
+    <ref name="local.bibliography.attrib"/>
+  </define>
+<!--end of bibliography.attlist-->
+<!--end of bibliography.module-->
+  <define name="local.bibliodiv.attrib">
+    <empty/>
+  </define>
+  <define name="bibliodiv.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliodiv">
+    <element name="bibliodiv">
+      <ref name="bibliodiv.attlist"/>
       <optional>
-        <group>
-          <ref name="sect.title.content"/>
-        </group>
+        <ref name="sect.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <oneOrMore>
         <choice>
-          <ref name="biblioentry.element"/>
-          <ref name="bibliomixed.element"/>
+          <ref name="biblioentry"/>
+          <ref name="bibliomixed"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="bibliodiv.element"/>
-
-<dtd:pe-decl name="bibliodiv.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="bibliodiv.attlist"/>
-<define name="bibliodiv.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="bibliodiv.role.attrib"/>
-  <ref name="local.bibliodiv.attrib"/>
-</define>
-<dtd:marked-section end="bibliodiv.attlist"/>
-<dtd:marked-section end="bibliodiv.module"/>
-<dtd:marked-section end="bibliography.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Glossary ............................................................. </dtd:comment>
-
-<dtd:pe-decl name="glossary.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossary.content.module"/>
-<dtd:pe-decl name="glossary.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossary.module"/>
-<define name="local.glossary.attrib">
-  <notAllowed/>
-</define>
-<define name="glossary.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossary.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossary.element"/>
-<define name="glossary.element">
-  <element name="glossary">
-    <group>
+    </element>
+  </define>
+<!--end of bibliodiv.element-->
+  <define name="bibliodiv.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="bibliodiv.role.attrib"/>
+    <ref name="local.bibliodiv.attrib"/>
+  </define>
+<!--end of bibliodiv.attlist-->
+<!--end of bibliodiv.module-->
+<!--end of bibliography.content.module-->
+<!-- ...................................................................... -->
+<!-- Glossary ............................................................. -->
+  <define name="local.glossary.attrib">
+    <empty/>
+  </define>
+  <define name="glossary.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossary">
+    <element name="glossary">
+      <ref name="glossary.attlist"/>
       <optional>
-        <ref name="glossaryinfo.element"/>
+        <ref name="glossaryinfo"/>
       </optional>
       <optional>
-        <group>
-          <ref name="bookcomponent.title.content"/>
-        </group>
+        <ref name="bookcomponent.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <choice>
         <oneOrMore>
-          <ref name="glossdiv.element"/>
+          <ref name="glossdiv"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="glossentry.element"/>
+          <ref name="glossentry"/>
         </oneOrMore>
       </choice>
       <optional>
-        <ref name="bibliography.element"/>
+        <ref name="bibliography"/>
       </optional>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="glossary.element"/>
-
-<dtd:pe-decl name="glossary.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossary.attlist"/>
-<define name="glossary.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="glossary.role.attrib"/>
-  <ref name="local.glossary.attrib"/>
-</define>
-<dtd:marked-section end="glossary.attlist"/>
-<dtd:marked-section end="glossary.module"/>
-
-<dtd:pe-decl name="glossdiv.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossdiv.module"/>
-<define name="local.glossdiv.attrib">
-  <notAllowed/>
-</define>
-<define name="glossdiv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossdiv.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossdiv.element"/>
-<define name="glossdiv.element">
-  <element name="glossdiv">
-    <group>
-      <group>
-        <ref name="sect.title.content"/>
-      </group>
+    </element>
+  </define>
+<!--end of glossary.element-->
+  <define name="glossary.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="glossary.role.attrib"/>
+    <ref name="local.glossary.attrib"/>
+  </define>
+<!--end of glossary.attlist-->
+<!--end of glossary.module-->
+  <define name="local.glossdiv.attrib">
+    <empty/>
+  </define>
+  <define name="glossdiv.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossdiv">
+    <element name="glossdiv">
+      <ref name="glossdiv.attlist"/>
+      <ref name="sect.title.content"/>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <oneOrMore>
-        <ref name="glossentry.element"/>
+        <ref name="glossentry"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="glossdiv.element"/>
-
-<dtd:pe-decl name="glossdiv.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="glossdiv.attlist"/>
-<define name="glossdiv.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="glossdiv.role.attrib"/>
-  <ref name="local.glossdiv.attrib"/>
-</define>
-<dtd:marked-section end="glossdiv.attlist"/>
-<dtd:marked-section end="glossdiv.module"/>
-<dtd:marked-section end="glossary.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Index and SetIndex ................................................... </dtd:comment>
-
-<dtd:pe-decl name="index.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="index.content.module"/>
-<dtd:pe-decl name="indexes.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexes.module"/>
-<define name="local.indexes.attrib">
-  <notAllowed/>
-</define>
-<define name="indexes.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="index.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="index.element"/>
-<define name="index.element">
-  <element name="index">
-    <group>
+    </element>
+  </define>
+<!--end of glossdiv.element-->
+  <define name="glossdiv.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="glossdiv.role.attrib"/>
+    <ref name="local.glossdiv.attrib"/>
+  </define>
+<!--end of glossdiv.attlist-->
+<!--end of glossdiv.module-->
+<!--end of glossary.content.module-->
+<!-- ...................................................................... -->
+<!-- Index and SetIndex ................................................... -->
+  <define name="local.indexes.attrib">
+    <empty/>
+  </define>
+  <define name="indexes.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="index">
+    <element name="index">
+      <ref name="index.attlist"/>
       <optional>
-        <ref name="indexinfo.element"/>
+        <ref name="indexinfo"/>
       </optional>
       <optional>
-        <group>
-          <ref name="bookcomponent.title.content"/>
-        </group>
+        <ref name="bookcomponent.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <choice>
         <zeroOrMore>
-          <ref name="indexdiv.element"/>
+          <ref name="indexdiv"/>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="indexentry.element"/>
+          <ref name="indexentry"/>
         </zeroOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="index.element"/>
-
-<dtd:pe-decl name="index.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="index.attlist"/>
-<define name="index.attlist">
-  <ref name="common.attrib"/>
-  <ref name="indexes.role.attrib"/>
-  <ref name="local.indexes.attrib"/>
-</define>
-<dtd:marked-section end="index.attlist"/>
-
-<dtd:pe-decl name="setindex.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setindex.element"/>
-<define name="setindex.element">
-  <element name="setindex">
-    <group>
+    </element>
+  </define>
+<!--end of index.element-->
+  <define name="index.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="indexes.role.attrib"/>
+    <ref name="local.indexes.attrib"/>
+  </define>
+<!--end of index.attlist-->
+  <define name="setindex">
+    <element name="setindex">
+      <ref name="setindex.attlist"/>
       <optional>
-        <ref name="setindexinfo.element"/>
+        <ref name="setindexinfo"/>
       </optional>
       <optional>
-        <group>
-          <ref name="bookcomponent.title.content"/>
-        </group>
+        <ref name="bookcomponent.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <choice>
         <zeroOrMore>
-          <ref name="indexdiv.element"/>
+          <ref name="indexdiv"/>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="indexentry.element"/>
+          <ref name="indexentry"/>
         </zeroOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="setindex.element"/>
-
-<dtd:pe-decl name="setindex.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="setindex.attlist"/>
-<define name="setindex.attlist">
-  <ref name="common.attrib"/>
-  <ref name="indexes.role.attrib"/>
-  <ref name="local.indexes.attrib"/>
-</define>
-<dtd:marked-section end="setindex.attlist"/>
-<dtd:marked-section end="indexes.module"/>
-
-<dtd:pe-decl name="indexdiv.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexdiv.module"/>
-
-<dtd:comment> SegmentedList in this content is useful for marking up permuted
-     indices. </dtd:comment>
-
-<define name="local.indexdiv.attrib">
-  <notAllowed/>
-</define>
-<define name="indexdiv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="indexdiv.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexdiv.element"/>
-<define name="indexdiv.element">
-  <element name="indexdiv">
-    <group>
+    </element>
+  </define>
+<!--end of setindex.element-->
+  <define name="setindex.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="indexes.role.attrib"/>
+    <ref name="local.indexes.attrib"/>
+  </define>
+<!--end of setindex.attlist-->
+<!--end of indexes.module-->
+<!-- SegmentedList in this content is useful for marking up permuted
+     indices. -->
+  <define name="local.indexdiv.attrib">
+    <empty/>
+  </define>
+  <define name="indexdiv.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="indexdiv">
+    <element name="indexdiv">
+      <ref name="indexdiv.attlist"/>
       <optional>
-        <group>
-          <ref name="sect.title.content"/>
-        </group>
+        <ref name="sect.title.content"/>
       </optional>
-      <group>
-        <zeroOrMore>
-          <choice>
-            <ref name="indexdivcomponent.mix"/>
-          </choice>
-        </zeroOrMore>
-        <choice>
-          <oneOrMore>
-            <ref name="indexentry.element"/>
-          </oneOrMore>
-          <ref name="segmentedlist.element"/>
-        </choice>
-      </group>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="indexdiv.element"/>
-
-<dtd:pe-decl name="indexdiv.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexdiv.attlist"/>
-<define name="indexdiv.attlist">
-  <ref name="common.attrib"/>
-  <ref name="indexdiv.role.attrib"/>
-  <ref name="local.indexdiv.attrib"/>
-</define>
-<dtd:marked-section end="indexdiv.attlist"/>
-<dtd:marked-section end="indexdiv.module"/>
-
-<dtd:pe-decl name="indexentry.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexentry.module"/>
-<dtd:comment> Index entries appear in the index, not the text. </dtd:comment>
-
-<define name="local.indexentry.attrib">
-  <notAllowed/>
-</define>
-<define name="indexentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="indexentry.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexentry.element"/>
-<define name="indexentry.element">
-  <element name="indexentry">
-    <group>
-      <ref name="primaryie.element"/>
+      <zeroOrMore>
+        <ref name="indexdivcomponent.mix"/>
+      </zeroOrMore>
+      <choice>
+        <oneOrMore>
+          <ref name="indexentry"/>
+        </oneOrMore>
+        <ref name="segmentedlist"/>
+      </choice>
+    </element>
+  </define>
+<!--end of indexdiv.element-->
+  <define name="indexdiv.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="indexdiv.role.attrib"/>
+    <ref name="local.indexdiv.attrib"/>
+  </define>
+<!--end of indexdiv.attlist-->
+<!--end of indexdiv.module-->
+<!-- Index entries appear in the index, not the text. -->
+  <define name="local.indexentry.attrib">
+    <empty/>
+  </define>
+  <define name="indexentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="indexentry">
+    <element name="indexentry">
+      <ref name="indexentry.attlist"/>
+      <ref name="primaryie"/>
       <zeroOrMore>
         <choice>
-          <ref name="seeie.element"/>
-          <ref name="seealsoie.element"/>
+          <ref name="seeie"/>
+          <ref name="seealsoie"/>
         </choice>
       </zeroOrMore>
       <zeroOrMore>
-        <group>
-          <ref name="secondaryie.element"/>
-          <zeroOrMore>
-            <choice>
-              <ref name="seeie.element"/>
-              <ref name="seealsoie.element"/>
-              <ref name="tertiaryie.element"/>
-            </choice>
-          </zeroOrMore>
-        </group>
+        <ref name="secondaryie"/>
+        <zeroOrMore>
+          <choice>
+            <ref name="seeie"/>
+            <ref name="seealsoie"/>
+            <ref name="tertiaryie"/>
+          </choice>
+        </zeroOrMore>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="indexentry.element"/>
-
-<dtd:pe-decl name="indexentry.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="indexentry.attlist"/>
-<define name="indexentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="indexentry.role.attrib"/>
-  <ref name="local.indexentry.attrib"/>
-</define>
-<dtd:marked-section end="indexentry.attlist"/>
-<dtd:marked-section end="indexentry.module"/>
-
-<dtd:pe-decl name="primsecterie.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="primsecterie.module"/>
-<define name="local.primsecterie.attrib">
-  <notAllowed/>
-</define>
-<define name="primsecterie.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="primaryie.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="primaryie.element"/>
-<define name="primaryie.element">
-  <element name="primaryie">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of indexentry.element-->
+  <define name="indexentry.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="indexentry.role.attrib"/>
+    <ref name="local.indexentry.attrib"/>
+  </define>
+<!--end of indexentry.attlist-->
+<!--end of indexentry.module-->
+  <define name="local.primsecterie.attrib">
+    <empty/>
+  </define>
+  <define name="primsecterie.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="primaryie">
+    <element name="primaryie">
+      <ref name="primaryie.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="primaryie.element"/>
-
-<dtd:comment> to IndexTerms that these entries represent </dtd:comment>
-
-<dtd:pe-decl name="primaryie.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="primaryie.attlist"/>
-<define name="primaryie.attlist">
-  <ref name="linkends.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="primsecterie.role.attrib"/>
-  <ref name="local.primsecterie.attrib"/>
-</define>
-<dtd:marked-section end="primaryie.attlist"/>
-
-<dtd:pe-decl name="secondaryie.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="secondaryie.element"/>
-<define name="secondaryie.element">
-  <element name="secondaryie">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of primaryie.element-->
+<!-- to IndexTerms that these entries represent -->
+  <define name="primaryie.attlist" combine="interleave">
+    <ref name="linkends.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="primsecterie.role.attrib"/>
+    <ref name="local.primsecterie.attrib"/>
+  </define>
+<!--end of primaryie.attlist-->
+  <define name="secondaryie">
+    <element name="secondaryie">
+      <ref name="secondaryie.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="secondaryie.element"/>
-
-<dtd:comment> to IndexTerms that these entries represent </dtd:comment>
-
-<dtd:pe-decl name="secondaryie.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="secondaryie.attlist"/>
-<define name="secondaryie.attlist">
-  <ref name="linkends.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="primsecterie.role.attrib"/>
-  <ref name="local.primsecterie.attrib"/>
-</define>
-<dtd:marked-section end="secondaryie.attlist"/>
-
-<dtd:pe-decl name="tertiaryie.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tertiaryie.element"/>
-<define name="tertiaryie.element">
-  <element name="tertiaryie">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of secondaryie.element-->
+<!-- to IndexTerms that these entries represent -->
+  <define name="secondaryie.attlist" combine="interleave">
+    <ref name="linkends.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="primsecterie.role.attrib"/>
+    <ref name="local.primsecterie.attrib"/>
+  </define>
+<!--end of secondaryie.attlist-->
+  <define name="tertiaryie">
+    <element name="tertiaryie">
+      <ref name="tertiaryie.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="tertiaryie.element"/>
-
-<dtd:comment> to IndexTerms that these entries represent </dtd:comment>
-
-<dtd:pe-decl name="tertiaryie.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="tertiaryie.attlist"/>
-<define name="tertiaryie.attlist">
-  <ref name="linkends.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="primsecterie.role.attrib"/>
-  <ref name="local.primsecterie.attrib"/>
-</define>
-<dtd:marked-section end="tertiaryie.attlist"/>
-
-<dtd:marked-section end="primsecterie.module"/>
-	
-<dtd:pe-decl name="seeie.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="seeie.module"/>
-<define name="local.seeie.attrib">
-  <notAllowed/>
-</define>
-<define name="seeie.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="seeie.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="seeie.element"/>
-<define name="seeie.element">
-  <element name="seeie">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of tertiaryie.element-->
+<!-- to IndexTerms that these entries represent -->
+  <define name="tertiaryie.attlist" combine="interleave">
+    <ref name="linkends.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="primsecterie.role.attrib"/>
+    <ref name="local.primsecterie.attrib"/>
+  </define>
+<!--end of tertiaryie.attlist-->
+<!--end of primsecterie.module-->
+  <define name="local.seeie.attrib">
+    <empty/>
+  </define>
+  <define name="seeie.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="seeie">
+    <element name="seeie">
+      <ref name="seeie.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="seeie.element"/>
-
-<dtd:comment> to IndexEntry to look up </dtd:comment>
-
-
-<dtd:pe-decl name="seeie.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="seeie.attlist"/>
-<define name="seeie.attlist">
-  <ref name="linkend.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="seeie.role.attrib"/>
-  <ref name="local.seeie.attrib"/>
-</define>
-<dtd:marked-section end="seeie.attlist"/>
-<dtd:marked-section end="seeie.module"/>
-
-<dtd:pe-decl name="seealsoie.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="seealsoie.module"/>
-<define name="local.seealsoie.attrib">
-  <notAllowed/>
-</define>
-<define name="seealsoie.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="seealsoie.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="seealsoie.element"/>
-<define name="seealsoie.element">
-  <element name="seealsoie">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of seeie.element-->
+<!-- to IndexEntry to look up -->
+  <define name="seeie.attlist" combine="interleave">
+    <ref name="linkend.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="seeie.role.attrib"/>
+    <ref name="local.seeie.attrib"/>
+  </define>
+<!--end of seeie.attlist-->
+<!--end of seeie.module-->
+  <define name="local.seealsoie.attrib">
+    <empty/>
+  </define>
+  <define name="seealsoie.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="seealsoie">
+    <element name="seealsoie">
+      <ref name="seealsoie.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="seealsoie.element"/>
-
-<dtd:comment> to related IndexEntries </dtd:comment>
-
-
-<dtd:pe-decl name="seealsoie.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="seealsoie.attlist"/>
-<define name="seealsoie.attlist">
-  <ref name="linkends.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="seealsoie.role.attrib"/>
-  <ref name="local.seealsoie.attrib"/>
-</define>
-<dtd:marked-section end="seealsoie.attlist"/>
-<dtd:marked-section end="seealsoie.module"/>
-<dtd:marked-section end="index.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> RefEntry ............................................................. </dtd:comment>
-
-<dtd:pe-decl name="refentry.content.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentry.content.module"/>
-<dtd:pe-decl name="refentry.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentry.module"/>
-<define name="local.refentry.attrib">
-  <notAllowed/>
-</define>
-<define name="refentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refentry.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentry.element"/>
-<define name="refentry.element">
-  <element name="refentry">
-    <group>
-      <optional>
-        <ref name="beginpage.element"/>
-      </optional>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of seealsoie.element-->
+<!-- to related IndexEntries -->
+  <define name="seealsoie.attlist" combine="interleave">
+    <ref name="linkends.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="seealsoie.role.attrib"/>
+    <ref name="local.seealsoie.attrib"/>
+  </define>
+<!--end of seealsoie.attlist-->
+<!--end of seealsoie.module-->
+<!--end of index.content.module-->
+<!-- ...................................................................... -->
+<!-- RefEntry ............................................................. -->
+  <define name="local.refentry.attrib">
+    <empty/>
+  </define>
+  <define name="refentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refentry">
+    <element name="refentry">
+      <ref name="refentry.attlist"/>
       <zeroOrMore>
-        <choice>
-          <ref name="ndxterm.class"/>
-        </choice>
+        <ref name="ndxterm.class"/>
       </zeroOrMore>
       <optional>
-        <ref name="refentryinfo.element"/>
+        <ref name="refentryinfo"/>
       </optional>
       <optional>
-        <ref name="refmeta.element"/>
+        <ref name="refmeta"/>
       </optional>
       <zeroOrMore>
         <choice>
-          <ref name="remark.element"/>
+          <ref name="remark"/>
           <ref name="link.char.class"/>
         </choice>
       </zeroOrMore>
-      <ref name="refnamediv.element"/>
+      <ref name="refnamediv"/>
       <optional>
-        <ref name="refsynopsisdiv.element"/>
+        <ref name="refsynopsisdiv"/>
       </optional>
       <oneOrMore>
-        <ref name="refsect1.element"/>
+        <ref name="refsect1"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refentry.element"/>
-
-<dtd:pe-decl name="refentry.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refentry.attlist"/>
-<define name="refentry.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="refentry.role.attrib"/>
-  <ref name="local.refentry.attrib"/>
-</define>
-<dtd:marked-section end="refentry.attlist"/>
-<dtd:marked-section end="refentry.module"/>
-
-<dtd:pe-decl name="refmeta.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refmeta.module"/>
-<define name="local.refmeta.attrib">
-  <notAllowed/>
-</define>
-<define name="refmeta.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refmeta.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refmeta.element"/>
-<define name="refmeta.element">
-  <element name="refmeta">
-    <group>
+    </element>
+  </define>
+<!--end of refentry.element-->
+  <define name="refentry.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="refentry.role.attrib"/>
+    <ref name="local.refentry.attrib"/>
+  </define>
+<!--end of refentry.attlist-->
+<!--end of refentry.module-->
+  <define name="local.refmeta.attrib">
+    <empty/>
+  </define>
+  <define name="refmeta.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refmeta">
+    <element name="refmeta">
+      <ref name="refmeta.attlist"/>
       <zeroOrMore>
-        <choice>
-          <ref name="ndxterm.class"/>
-        </choice>
+        <ref name="ndxterm.class"/>
       </zeroOrMore>
-      <ref name="refentrytitle.element"/>
+      <ref name="refentrytitle"/>
       <optional>
-        <ref name="manvolnum.element"/>
+        <ref name="manvolnum"/>
       </optional>
       <zeroOrMore>
-        <ref name="refmiscinfo.element"/>
+        <ref name="refmiscinfo"/>
       </zeroOrMore>
       <zeroOrMore>
-        <choice>
-          <ref name="ndxterm.class"/>
-        </choice>
+        <ref name="ndxterm.class"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refmeta.element"/>
-
-<dtd:pe-decl name="refmeta.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refmeta.attlist"/>
-<define name="refmeta.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refmeta.role.attrib"/>
-  <ref name="local.refmeta.attrib"/>
-</define>
-<dtd:marked-section end="refmeta.attlist"/>
-<dtd:marked-section end="refmeta.module"/>
-
-<dtd:pe-decl name="refmiscinfo.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refmiscinfo.module"/>
-<define name="local.refmiscinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="refmiscinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refmiscinfo.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refmiscinfo.element"/>
-<define name="refmiscinfo.element">
-  <element name="refmiscinfo">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of refmeta.element-->
+  <define name="refmeta.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refmeta.role.attrib"/>
+    <ref name="local.refmeta.attrib"/>
+  </define>
+<!--end of refmeta.attlist-->
+<!--end of refmeta.module-->
+  <define name="local.refmiscinfo.attrib">
+    <empty/>
+  </define>
+  <define name="refmiscinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refmiscinfo">
+    <element name="refmiscinfo">
+      <ref name="refmiscinfo.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="refmiscinfo.element"/>
-
-<dtd:comment> Class: Freely assignable parameter; no default </dtd:comment>
-
-
-<dtd:pe-decl name="refmiscinfo.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refmiscinfo.attlist"/>
-<define name="refmiscinfo.attlist">
-  <optional>
-    <attribute name="class"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="refmiscinfo.role.attrib"/>
-  <ref name="local.refmiscinfo.attrib"/>
-</define>
-<dtd:marked-section end="refmiscinfo.attlist"/>
-<dtd:marked-section end="refmiscinfo.module"/>
-
-<dtd:pe-decl name="refnamediv.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refnamediv.module"/>
-<define name="local.refnamediv.attrib">
-  <notAllowed/>
-</define>
-<define name="refnamediv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refnamediv.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refnamediv.element"/>
-<define name="refnamediv.element">
-  <element name="refnamediv">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of refmiscinfo.element-->
+<!-- Class: Freely assignable parameter; no default -->
+  <define name="refmiscinfo.attlist" combine="interleave">
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="refmiscinfo.role.attrib"/>
+    <ref name="local.refmiscinfo.attrib"/>
+  </define>
+<!--end of refmiscinfo.attlist-->
+<!--end of refmiscinfo.module-->
+  <define name="local.refnamediv.attrib">
+    <empty/>
+  </define>
+  <define name="refnamediv.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refnamediv">
+    <element name="refnamediv">
+      <ref name="refnamediv.attlist"/>
       <optional>
-        <ref name="refdescriptor.element"/>
+        <ref name="refdescriptor"/>
       </optional>
       <oneOrMore>
-        <ref name="refname.element"/>
+        <ref name="refname"/>
       </oneOrMore>
-      <ref name="refpurpose.element"/>
+      <ref name="refpurpose"/>
       <zeroOrMore>
-        <ref name="refclass.element"/>
+        <ref name="refclass"/>
       </zeroOrMore>
       <zeroOrMore>
         <choice>
-          <ref name="remark.element"/>
+          <ref name="remark"/>
           <ref name="link.char.class"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refnamediv.element"/>
-
-<dtd:pe-decl name="refnamediv.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refnamediv.attlist"/>
-<define name="refnamediv.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refnamediv.role.attrib"/>
-  <ref name="local.refnamediv.attrib"/>
-</define>
-<dtd:marked-section end="refnamediv.attlist"/>
-<dtd:marked-section end="refnamediv.module"/>
-	
-<dtd:pe-decl name="refdescriptor.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refdescriptor.module"/>
-<define name="local.refdescriptor.attrib">
-  <notAllowed/>
-</define>
-<define name="refdescriptor.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refdescriptor.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refdescriptor.element"/>
-<define name="refdescriptor.element">
-  <element name="refdescriptor">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of refnamediv.element-->
+  <define name="refnamediv.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refnamediv.role.attrib"/>
+    <ref name="local.refnamediv.attrib"/>
+  </define>
+<!--end of refnamediv.attlist-->
+<!--end of refnamediv.module-->
+  <define name="local.refdescriptor.attrib">
+    <empty/>
+  </define>
+  <define name="refdescriptor.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refdescriptor">
+    <element name="refdescriptor">
+      <ref name="refdescriptor.attlist"/>
+      <zeroOrMore>
         <ref name="refname.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="refdescriptor.element"/>
-
-<dtd:pe-decl name="refdescriptor.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refdescriptor.attlist"/>
-<define name="refdescriptor.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refdescriptor.role.attrib"/>
-  <ref name="local.refdescriptor.attrib"/>
-</define>
-<dtd:marked-section end="refdescriptor.attlist"/>
-<dtd:marked-section end="refdescriptor.module"/>
-
-<dtd:pe-decl name="refname.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refname.module"/>
-<define name="local.refname.attrib">
-  <notAllowed/>
-</define>
-<define name="refname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refname.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refname.element"/>
-<define name="refname.element">
-  <element name="refname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of refdescriptor.element-->
+  <define name="refdescriptor.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refdescriptor.role.attrib"/>
+    <ref name="local.refdescriptor.attrib"/>
+  </define>
+<!--end of refdescriptor.attlist-->
+<!--end of refdescriptor.module-->
+  <define name="local.refname.attrib">
+    <empty/>
+  </define>
+  <define name="refname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refname">
+    <element name="refname">
+      <ref name="refname.attlist"/>
+      <zeroOrMore>
         <ref name="refname.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="refname.element"/>
-
-<dtd:pe-decl name="refname.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refname.attlist"/>
-<define name="refname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refname.role.attrib"/>
-  <ref name="local.refname.attrib"/>
-</define>
-<dtd:marked-section end="refname.attlist"/>
-<dtd:marked-section end="refname.module"/>
-
-<dtd:pe-decl name="refpurpose.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refpurpose.module"/>
-<define name="local.refpurpose.attrib">
-  <notAllowed/>
-</define>
-<define name="refpurpose.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refpurpose.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refpurpose.element"/>
-<define name="refpurpose.element">
-  <element name="refpurpose">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of refname.element-->
+  <define name="refname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refname.role.attrib"/>
+    <ref name="local.refname.attrib"/>
+  </define>
+<!--end of refname.attlist-->
+<!--end of refname.module-->
+  <define name="local.refpurpose.attrib">
+    <empty/>
+  </define>
+  <define name="refpurpose.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refpurpose">
+    <element name="refpurpose">
+      <ref name="refpurpose.attlist"/>
+      <zeroOrMore>
         <ref name="refinline.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="refpurpose.element"/>
-
-<dtd:pe-decl name="refpurpose.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refpurpose.attlist"/>
-<define name="refpurpose.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refpurpose.role.attrib"/>
-  <ref name="local.refpurpose.attrib"/>
-</define>
-<dtd:marked-section end="refpurpose.attlist"/>
-<dtd:marked-section end="refpurpose.module"/>
-
-<dtd:pe-decl name="refclass.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refclass.module"/>
-<define name="local.refclass.attrib">
-  <notAllowed/>
-</define>
-<define name="refclass.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refclass.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refclass.element"/>
-<define name="refclass.element">
-  <element name="refclass">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of refpurpose.element-->
+  <define name="refpurpose.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refpurpose.role.attrib"/>
+    <ref name="local.refpurpose.attrib"/>
+  </define>
+<!--end of refpurpose.attlist-->
+<!--end of refpurpose.module-->
+  <define name="local.refclass.attrib">
+    <empty/>
+  </define>
+  <define name="refclass.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refclass">
+    <element name="refclass">
+      <ref name="refclass.attlist"/>
+      <zeroOrMore>
         <ref name="refclass.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-<dtd:marked-section end="refclass.element"/>
-
-<dtd:pe-decl name="refclass.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refclass.attlist"/>
-<define name="refclass.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refclass.role.attrib"/>
-  <ref name="local.refclass.attrib"/>
-</define>
-<dtd:marked-section end="refclass.attlist"/>
-<dtd:marked-section end="refclass.module"/>
-
-<dtd:pe-decl name="refsynopsisdiv.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsynopsisdiv.module"/>
-<define name="local.refsynopsisdiv.attrib">
-  <notAllowed/>
-</define>
-<define name="refsynopsisdiv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsynopsisdiv.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsynopsisdiv.element"/>
-<define name="refsynopsisdiv.element">
-  <element name="refsynopsisdiv">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of refclass.element-->
+  <define name="refclass.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refclass.role.attrib"/>
+    <ref name="local.refclass.attrib"/>
+  </define>
+<!--end of refclass.attlist-->
+<!--end of refclass.module-->
+  <define name="local.refsynopsisdiv.attrib">
+    <empty/>
+  </define>
+  <define name="refsynopsisdiv.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsynopsisdiv">
+    <element name="refsynopsisdiv">
+      <ref name="refsynopsisdiv.attlist"/>
       <optional>
-        <ref name="refsynopsisdivinfo.element"/>
+        <ref name="refsynopsisdivinfo"/>
       </optional>
       <optional>
-        <group>
-          <ref name="refsect.title.content"/>
-        </group>
+        <ref name="refsect.title.content"/>
       </optional>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="refcomponent.mix"/>
-            </choice>
+            <ref name="refcomponent.mix"/>
           </oneOrMore>
           <zeroOrMore>
-            <ref name="refsect2.element"/>
+            <ref name="refsect2"/>
           </zeroOrMore>
         </group>
-        <group>
-          <oneOrMore>
-            <ref name="refsect2.element"/>
-          </oneOrMore>
-        </group>
+        <oneOrMore>
+          <ref name="refsect2"/>
+        </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsynopsisdiv.element"/>
-
-<dtd:pe-decl name="refsynopsisdiv.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsynopsisdiv.attlist"/>
-<define name="refsynopsisdiv.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refsynopsisdiv.role.attrib"/>
-  <ref name="local.refsynopsisdiv.attrib"/>
-</define>
-<dtd:marked-section end="refsynopsisdiv.attlist"/>
-<dtd:marked-section end="refsynopsisdiv.module"/>
-
-<dtd:pe-decl name="refsect1.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect1.module"/>
-<define name="local.refsect1.attrib">
-  <notAllowed/>
-</define>
-<define name="refsect1.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsect1.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect1.element"/>
-<define name="refsect1.element">
-  <element name="refsect1">
-    <group>
+    </element>
+  </define>
+<!--end of refsynopsisdiv.element-->
+  <define name="refsynopsisdiv.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refsynopsisdiv.role.attrib"/>
+    <ref name="local.refsynopsisdiv.attrib"/>
+  </define>
+<!--end of refsynopsisdiv.attlist-->
+<!--end of refsynopsisdiv.module-->
+  <define name="local.refsect1.attrib">
+    <empty/>
+  </define>
+  <define name="refsect1.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsect1">
+    <element name="refsect1">
+      <ref name="refsect1.attlist"/>
       <optional>
-        <ref name="refsect1info.element"/>
+        <ref name="refsect1info"/>
       </optional>
-      <group>
-        <ref name="refsect.title.content"/>
-      </group>
+      <ref name="refsect.title.content"/>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="refcomponent.mix"/>
-            </choice>
+            <ref name="refcomponent.mix"/>
           </oneOrMore>
           <zeroOrMore>
-            <ref name="refsect2.element"/>
+            <ref name="refsect2"/>
           </zeroOrMore>
         </group>
         <oneOrMore>
-          <ref name="refsect2.element"/>
+          <ref name="refsect2"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsect1.element"/>
-
-<dtd:pe-decl name="refsect1.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect1.attlist"/>
-<define name="refsect1.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="refsect1.role.attrib"/>
-  <ref name="local.refsect1.attrib"/>
-</define>
-<dtd:marked-section end="refsect1.attlist"/>
-<dtd:marked-section end="refsect1.module"/>
-
-<dtd:pe-decl name="refsect2.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect2.module"/>
-<define name="local.refsect2.attrib">
-  <notAllowed/>
-</define>
-<define name="refsect2.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsect2.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect2.element"/>
-<define name="refsect2.element">
-  <element name="refsect2">
-    <group>
+    </element>
+  </define>
+<!--end of refsect1.element-->
+  <define name="refsect1.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="refsect1.role.attrib"/>
+    <ref name="local.refsect1.attrib"/>
+  </define>
+<!--end of refsect1.attlist-->
+<!--end of refsect1.module-->
+  <define name="local.refsect2.attrib">
+    <empty/>
+  </define>
+  <define name="refsect2.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsect2">
+    <element name="refsect2">
+      <ref name="refsect2.attlist"/>
       <optional>
-        <ref name="refsect2info.element"/>
+        <ref name="refsect2info"/>
       </optional>
-      <group>
-        <ref name="refsect.title.content"/>
-      </group>
+      <ref name="refsect.title.content"/>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="refcomponent.mix"/>
-            </choice>
+            <ref name="refcomponent.mix"/>
           </oneOrMore>
           <zeroOrMore>
-            <ref name="refsect3.element"/>
+            <ref name="refsect3"/>
           </zeroOrMore>
         </group>
         <oneOrMore>
-          <ref name="refsect3.element"/>
+          <ref name="refsect3"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsect2.element"/>
-
-<dtd:pe-decl name="refsect2.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect2.attlist"/>
-<define name="refsect2.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="refsect2.role.attrib"/>
-  <ref name="local.refsect2.attrib"/>
-</define>
-<dtd:marked-section end="refsect2.attlist"/>
-<dtd:marked-section end="refsect2.module"/>
-
-<dtd:pe-decl name="refsect3.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect3.module"/>
-<define name="local.refsect3.attrib">
-  <notAllowed/>
-</define>
-<define name="refsect3.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refsect3.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect3.element"/>
-<define name="refsect3.element">
-  <element name="refsect3">
-    <group>
+    </element>
+  </define>
+<!--end of refsect2.element-->
+  <define name="refsect2.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="refsect2.role.attrib"/>
+    <ref name="local.refsect2.attrib"/>
+  </define>
+<!--end of refsect2.attlist-->
+<!--end of refsect2.module-->
+  <define name="local.refsect3.attrib">
+    <empty/>
+  </define>
+  <define name="refsect3.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refsect3">
+    <element name="refsect3">
+      <ref name="refsect3.attlist"/>
       <optional>
-        <ref name="refsect3info.element"/>
+        <ref name="refsect3info"/>
       </optional>
-      <group>
-        <ref name="refsect.title.content"/>
-      </group>
+      <ref name="refsect.title.content"/>
       <oneOrMore>
-        <choice>
-          <ref name="refcomponent.mix"/>
-        </choice>
+        <ref name="refcomponent.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="refsect3.element"/>
-
-<dtd:pe-decl name="refsect3.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="refsect3.attlist"/>
-<define name="refsect3.attlist">
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="refsect3.role.attrib"/>
-  <ref name="local.refsect3.attrib"/>
-</define>
-<dtd:marked-section end="refsect3.attlist"/>
-<dtd:marked-section end="refsect3.module"/>
-<dtd:marked-section end="refentry.content.module"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Article .............................................................. </dtd:comment>
-
-<dtd:pe-decl name="article.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="article.module"/>
-<dtd:comment> An Article is a chapter-level, stand-alone document that is often,
-     but need not be, collected into a Book. </dtd:comment>
-
-<define name="local.article.attrib">
-  <empty/>
-</define>
-<define name="article.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="article.element">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="article.element"/>
-<define name="article.element">
-  <element name="article">
-    <group>
+    </element>
+  </define>
+<!--end of refsect3.element-->
+  <define name="refsect3.attlist" combine="interleave">
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="refsect3.role.attrib"/>
+    <ref name="local.refsect3.attrib"/>
+  </define>
+<!--end of refsect3.attlist-->
+<!--end of refsect3.module-->
+<!--end of refentry.content.module-->
+<!-- ...................................................................... -->
+<!-- Article .............................................................. -->
+<!-- An Article is a chapter-level, stand-alone document that is often,
+     but need not be, collected into a Book. -->
+  <define name="local.article.attrib">
+    <empty/>
+  </define>
+  <define name="article.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="article">
+    <element name="article">
+      <ref name="article.attlist"/>
       <optional>
-        <group>
-          <ref name="div.title.content"/>
-        </group>
+        <ref name="div.title.content"/>
       </optional>
       <optional>
-        <ref name="articleinfo.element"/>
+        <ref name="articleinfo"/>
       </optional>
       <optional>
-        <ref name="tocchap.element"/>
+        <ref name="tocchap"/>
       </optional>
       <zeroOrMore>
-        <ref name="lot.element"/>
+        <ref name="lot"/>
       </zeroOrMore>
-      <group>
-        <ref name="bookcomponent.content"/>
-      </group>
+      <ref name="bookcomponent.content"/>
       <zeroOrMore>
         <choice>
-          <choice>
-            <ref name="nav.class"/>
-          </choice>
-          <choice>
-            <ref name="appendix.class"/>
-          </choice>
-          <ref name="ackno.element"/>
+          <ref name="nav.class"/>
+          <ref name="appendix.class"/>
+          <ref name="ackno"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-<dtd:marked-section end="article.element"/>
-
-<dtd:comment> Class: Indicates the type of a particular article;
+    </element>
+  </define>
+<!--end of article.element-->
+<!-- Class: Indicates the type of a particular article;
 		all articles have the same structure and general purpose.
-		No default. </dtd:comment>
-<dtd:comment> ParentBook: ID of the enclosing Book </dtd:comment>
-
-
-<dtd:pe-decl name="article.attlist">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="article.attlist"/>
-<define name="article.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>journalarticle</value>
-        <value>productsheet</value>
-        <value>whitepaper</value>
-        <value>techreport</value>
-        <value>specification</value>
-        <value>faq</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="parentbook" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <ref name="status.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="article.role.attrib"/>
-  <ref name="local.article.attrib"/>
-</define>
-<dtd:marked-section end="article.attlist"/>
-<dtd:marked-section end="article.module"/>
-
-<dtd:comment> End of DocBook XML document hierarchy module V4.1.2 .................... </dtd:comment>
-<dtd:comment> ...................................................................... </dtd:comment>
-
+		No default. -->
+<!-- ParentBook: ID of the enclosing Book -->
+  <define name="article.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>journalarticle</value>
+          <value>productsheet</value>
+          <value>whitepaper</value>
+          <value>techreport</value>
+          <value>specification</value>
+          <value>faq</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="parentbook">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <ref name="status.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="article.role.attrib"/>
+    <ref name="local.article.attrib"/>
+  </define>
+<!--end of article.attlist-->
+<!--end of article.module-->
+<!-- End of DocBook XML document hierarchy module V4.1.2 .................... -->
+<!-- ...................................................................... -->
 </grammar>
diff --git a/docbook/relaxng/dbnotn.rng b/docbook/relaxng/dbnotn.rng
index 1944dd5de..5455a08e7 100644
--- a/docbook/relaxng/dbnotn.rng
+++ b/docbook/relaxng/dbnotn.rng
@@ -1,15 +1,10 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DocBook XML notations module V4.1.2 .................................... </dtd:comment>
-<dtd:comment> File dbnotnx.mod ..................................................... </dtd:comment>
-
-<dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc.,
-     O'Reilly &amp; Associates, Inc., ArborText, Inc., Fujitsu Software
+<?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">
+<!-- ...................................................................... -->
+<!-- DocBook XML notations module V4.1.2 .................................... -->
+<!-- File dbnotnx.mod ..................................................... -->
+<!-- Copyright 1992-2000 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).
 
@@ -31,17 +26,15 @@
      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/.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-
-<dtd:comment> This module contains the entity declarations for the standard ISO
+-->
+<!-- ...................................................................... -->
+<!-- This module contains the entity declarations for the standard ISO
      entity sets used by DocBook.
 
      In DTD driver files referring to this module, please use an entity
      declaration that uses the public identifier shown below:
 
-     &lt;!ENTITY % dbnotn PUBLIC
+     <!ENTITY % dbnotn PUBLIC
      "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
      "dbnotnx.mod">
      %dbnotn;
@@ -50,73 +43,42 @@
      entity and module scheme used in DocBook, customizing DocBook and
      planning for interchange, and changes made since the last release
      of DocBook.
-</dtd:comment>
-
-<define name="local.notation.class">
-  <notAllowed/>
-</define>
-
-<define name="notation.class">
-  <choice>
-    <value>BMP</value>
-    <value>CGM-CHAR</value>
-    <value>CGM-BINARY</value>
-    <value>CGM-CLEAR</value>
-    <value>DITROFF</value>
-    <value>DVI</value>
-    <value>EPS</value>
-    <value>EQN</value>
-    <value>FAX</value>
-    <value>GIF</value>
-    <value>GIF87a</value>
-    <value>GIF89a</value>
-    <value>JPG</value>
-    <value>JPEG</value>
-    <value>IGES</value>
-    <value>PCX</value>
-    <value>PIC</value>
-    <value>PNG</value>
-    <value>PS</value>
-    <value>SGML</value>
-    <value>TBL</value>
-    <value>TEX</value>
-    <value>TIFF</value>
-    <value>WMF</value>
-    <value>WPG</value>
-    <value>linespecific</value>
-    <ref name="local.notation.class"/>
-  </choice>
-</define>
-
-<dtd:notation name="BMP" public="+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN"/>
-<dtd:notation name="CGM-CHAR" public="ISO 8632/2//NOTATION Character encoding//EN"/>
-<dtd:notation name="CGM-BINARY" public="ISO 8632/3//NOTATION Binary encoding//EN"/>
-<dtd:notation name="CGM-CLEAR" public="ISO 8632/4//NOTATION Clear text encoding//EN"/>
-<dtd:notation name="DITROFF" system="DITROFF"/>
-<dtd:notation name="DVI" system="DVI"/>
-<dtd:notation name="EPS" public="+//ISBN 0-201-18127-4::Adobe//NOTATION PostScript Language Ref. Manual//EN"/>
-<dtd:notation name="EQN" system="EQN"/>
-<dtd:notation name="FAX" public="-//USA-DOD//NOTATION CCITT Group 4 Facsimile Type 1 Untiled Raster//EN"/>
-<dtd:notation name="GIF" system="GIF"/>
-<dtd:notation name="GIF87a" public="-//CompuServe//NOTATION Graphics Interchange Format 87a//EN"/>
-
-<dtd:notation name="GIF89a" public="-//CompuServe//NOTATION Graphics Interchange Format 89a//EN"/>
-<dtd:notation name="JPG" system="JPG"/>
-<dtd:notation name="JPEG" system="JPG"/>
-<dtd:notation name="IGES" public="-//USA-DOD//NOTATION (ASME/ANSI Y14.26M-1987) Initial Graphics Exchange Specification//EN"/>
-<dtd:notation name="PCX" public="+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN"/>
-<dtd:notation name="PIC" system="PIC"/>
-<dtd:notation name="PNG" system="http://www.w3.org/TR/REC-png"/>
-<dtd:notation name="PS" system="PS"/>
-<dtd:notation name="SGML" public="ISO 8879:1986//NOTATION Standard Generalized Markup Language//EN"/>
-<dtd:notation name="TBL" system="TBL"/>
-<dtd:notation name="TEX" public="+//ISBN 0-201-13448-9::Knuth//NOTATION The TeXbook//EN"/>
-<dtd:notation name="TIFF" system="TIFF"/>
-<dtd:notation name="WMF" public="+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN"/>
-<dtd:notation name="WPG" system="WPG"/> <dtd:comment>WordPerfect Graphic format</dtd:comment>
-<dtd:notation name="linespecific" system="linespecific"/>
-
-<dtd:comment> End of DocBook XML notations module V4.1.2 ............................. </dtd:comment>
-<dtd:comment> ...................................................................... </dtd:comment>
-
+-->
+  <define name="local.notation.class">
+    <notAllowed/>
+  </define>
+  <define name="notation.class">
+    <choice>
+      <value>BMP</value>
+      <value>CGM-CHAR</value>
+      <value>CGM-BINARY</value>
+      <value>CGM-CLEAR</value>
+      <value>DITROFF</value>
+      <value>DVI</value>
+      <value>EPS</value>
+      <value>EQN</value>
+      <value>FAX</value>
+      <value>GIF</value>
+      <value>GIF87a</value>
+      <value>GIF89a</value>
+      <value>JPG</value>
+      <value>JPEG</value>
+      <value>IGES</value>
+      <value>PCX</value>
+      <value>PIC</value>
+      <value>PNG</value>
+      <value>PS</value>
+      <value>SGML</value>
+      <value>TBL</value>
+      <value>TEX</value>
+      <value>TIFF</value>
+      <value>WMF</value>
+      <value>WPG</value>
+      <value>linespecific</value>
+      <ref name="local.notation.class"/>
+    </choice>
+  </define>
+<!--WordPerfect Graphic format-->
+<!-- End of DocBook XML notations module V4.1.2 ............................. -->
+<!-- ...................................................................... -->
 </grammar>
diff --git a/docbook/relaxng/dbpool.rng b/docbook/relaxng/dbpool.rng
index 815d7308c..795d60e4f 100644
--- a/docbook/relaxng/dbpool.rng
+++ b/docbook/relaxng/dbpool.rng
@@ -1,16 +1,12 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         xmlns:a="http://relaxng.org/ns/annotation/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DocBook XML information pool module V4.1.2 ............................. </dtd:comment>
-<dtd:comment> File dbpoolx.mod ..................................................... </dtd:comment>
-
-<dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc.,
-     O'Reilly &#38; Associates, Inc., ArborText, Inc., Fujitsu Software
+<?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">
+<!-- ...................................................................... -->
+<!-- DocBook XML information pool module V4.1.2 ............................. -->
+<!-- File dbpoolx.mod ..................................................... -->
+<!-- Copyright 1992-2000 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).
 
@@ -32,11 +28,9 @@
      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/.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-
-<dtd:comment> This module contains the definitions for the objects, inline
+-->
+<!-- ...................................................................... -->
+<!-- This module contains the definitions for the objects, inline
      elements, and so on that are available to be used as the main
      content of DocBook documents.  Some elements are useful for general
      publishing, and others are useful specifically for computer
@@ -55,7 +49,7 @@
      In DTD driver files referring to this module, please use an entity
      declaration that uses the public identifier shown below:
 
-     &#60;!ENTITY % dbpool PUBLIC
+     <!ENTITY % dbpool PUBLIC
      "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
      "dbpoolx.mod">
      %dbpool;
@@ -64,340 +58,340 @@
      entity and module scheme used in DocBook, customizing DocBook and
      planning for interchange, and changes made since the last release
      of DocBook.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> General-purpose semantics entities ................................... </dtd:comment>
-
-<define name="yesorno.attvals">
-  <text/>
-</define>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for module inclusions ....................................... </dtd:comment>
-
-<dtd:pe-decl name="dbpool.redecl.module">IGNORE</dtd:pe-decl>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for element classes and mixtures ............................ </dtd:comment>
-
-<dtd:comment> "Ubiquitous" classes: ndxterm.class and beginpage </dtd:comment>
-
-<define name="local.ndxterm.class">
-  <notAllowed/>
-</define>
-<define name="ndxterm.class">
-  <ref name="indexterm.element"/>
-  <ref name="local.ndxterm.class"/>
-</define>
-
-<dtd:comment> Object-level classes ................................................. </dtd:comment>
-
-<define name="local.list.class">
-  <notAllowed/>
-</define>
-<define name="list.class">
-  <ref name="calloutlist.element"/>
-  <ref name="glosslist.element"/>
-  <ref name="itemizedlist.element"/>
-  <ref name="orderedlist.element"/>
-  <ref name="segmentedlist.element"/>
-  <ref name="simplelist.element"/>
-  <ref name="variablelist.element"/>
-  <ref name="local.list.class"/>
-</define>
-
-<define name="local.admon.class">
-  <notAllowed/>
-</define>
-<define name="admon.class">
-  <ref name="caution.element"/>
-  <ref name="important.element"/>
-  <ref name="note.element"/>
-  <ref name="tip.element"/>
-  <ref name="warning.element"/>
-  <ref name="local.admon.class"/>
-</define>
-
-<define name="local.linespecific.class">
-  <notAllowed/>
-</define>
-<define name="linespecific.class">
-  <ref name="literallayout.element"/>
-  <ref name="programlisting.element"/>
-  <ref name="programlistingco.element"/>
-  <ref name="screen.element"/>
-  <ref name="screenco.element"/>
-  <ref name="screenshot.element"/>
-  <ref name="local.linespecific.class"/>
-</define>
-
-<define name="local.method.synop.class">
-  <notAllowed/>
-</define>
-<define name="method.synop.class">
-  <ref name="constructorsynopsis.element"/>
-  <ref name="destructorsynopsis.element"/>
-  <ref name="methodsynopsis.element"/>
-  <ref name="local.method.synop.class"/>
-</define>
-
-<define name="local.synop.class">
-  <notAllowed/>
-</define>
-<define name="synop.class">
-  <ref name="synopsis.element"/>
-  <ref name="cmdsynopsis.element"/>
-  <ref name="funcsynopsis.element"/>
-  <ref name="classsynopsis.element"/>
-  <ref name="fieldsynopsis.element"/>
-  <ref name="method.synop.class"/>
-</define>
-
-<define name="local.para.class">
-  <notAllowed/>
-</define>
-<define name="para.class">
-  <ref name="formalpara.element"/>
-  <ref name="para.element"/>
-  <ref name="simpara.element"/>
-  <ref name="local.para.class"/>
-</define>
-
-<define name="local.informal.class">
-  <notAllowed/>
-</define>
-<define name="informal.class">
-  <ref name="address.element"/>
-  <ref name="blockquote.element"/>
-  <ref name="graphic.element"/>
-  <ref name="graphicco.element"/>
-  <ref name="mediaobject.element"/>
-  <ref name="mediaobjectco.element"/>
-  <ref name="informalequation.element"/>
-  <ref name="informalexample.element"/>
-  <ref name="informalfigure.element"/>
-  <ref name="informaltable.element"/>
-  <ref name="local.informal.class"/>
-</define>
-
-<define name="local.formal.class">
-  <notAllowed/>
-</define>
-<define name="formal.class">
-  <ref name="equation.element"/>
-  <ref name="example.element"/>
-  <ref name="figure.element"/>
-  <ref name="table.element"/>
-  <ref name="local.formal.class"/>
-</define>
-
-<dtd:comment> The DocBook TC may produce an official EBNF module for DocBook. </dtd:comment>
-<dtd:comment> This PE provides the hook by which it can be inserted into the DTD. </dtd:comment>
-
-<define name="ebnf.block.hook">
-  <notAllowed/>
-</define>
-
-<define name="local.compound.class">
-  <notAllowed/>
-</define>
-<define name="compound.class">
-  <ref name="msgset.element"/>
-  <ref name="procedure.element"/>
-  <ref name="sidebar.element"/>
-  <ref name="qandaset.element"/>
-  <ref name="ebnf.block.hook"/>
-</define>
-
-<define name="local.genobj.class">
-  <notAllowed/>
-</define>
-<define name="genobj.class">
-  <ref name="anchor.element"/>
-  <ref name="bridgehead.element"/>
-  <ref name="remark.element"/>
-  <ref name="highlights.element"/>
-  <ref name="local.genobj.class"/>
-</define>
-
-<define name="local.descobj.class">
-  <notAllowed/>
-</define>
-<define name="descobj.class">
-  <ref name="abstract.element"/>
-  <ref name="authorblurb.element"/>
-  <ref name="epigraph.element"/>
-  <ref name="local.descobj.class"/>
-</define>
-
-<dtd:comment> Character-level classes .............................................. </dtd:comment>
-
-<define name="local.xref.char.class">
-  <notAllowed/>
-</define>
-<define name="xref.char.class">
-  <ref name="footnoteref.element"/>
-  <ref name="xref.element"/>
-  <ref name="local.xref.char.class"/>
-</define>
-
-<define name="local.gen.char.class">
-  <notAllowed/>
-</define>
-<define name="gen.char.class">
-  <ref name="abbrev.element"/>
-  <ref name="acronym.element"/>
-  <ref name="citation.element"/>
-  <ref name="citerefentry.element"/>
-  <ref name="citetitle.element"/>
-  <ref name="emphasis.element"/>
-  <ref name="firstterm.element"/>
-  <ref name="foreignphrase.element"/>
-  <ref name="glossterm.element"/>
-  <ref name="footnote.element"/>
-  <ref name="phrase.element"/>
-  <ref name="quote.element"/>
-  <ref name="trademark.element"/>
-  <ref name="wordasword.element"/>
-  <ref name="local.gen.char.class"/>
-</define>
-
-<define name="local.link.char.class">
-  <notAllowed/>
-</define>
-<define name="link.char.class">
-  <ref name="link.element"/>
-  <ref name="olink.element"/>
-  <ref name="ulink.element"/>
-  <ref name="local.link.char.class"/>
-</define>
-
-<dtd:comment> The DocBook TC may produce an official EBNF module for DocBook. </dtd:comment>
-<dtd:comment> This PE provides the hook by which it can be inserted into the DTD. </dtd:comment>
-
-<define name="ebnf.inline.hook">
-  <notAllowed/>
-</define>
-
-<define name="local.tech.char.class">
-  <notAllowed/>
-</define>
-<define name="tech.char.class">
-  <ref name="action.element"/>
-  <ref name="application.element"/>
-  <ref name="classname.element"/>
-  <ref name="methodname.element"/>
-  <ref name="interfacename.element"/>
-  <ref name="exceptionname.element"/>
-  <ref name="ooclass.element"/>
-  <ref name="oointerface.element"/>
-  <ref name="ooexception.element"/>
-  <ref name="command.element"/>
-  <ref name="computeroutput.element"/>
-  <ref name="database.element"/>
-  <ref name="email.element"/>
-  <ref name="envar.element"/>
-  <ref name="errorcode.element"/>
-  <ref name="errorname.element"/>
-  <ref name="errortype.element"/>
-  <ref name="filename.element"/>
-  <ref name="function.element"/>
-  <ref name="guibutton.element"/>
-  <ref name="guiicon.element"/>
-  <ref name="guilabel.element"/>
-  <ref name="guimenu.element"/>
-  <ref name="guimenuitem.element"/>
-  <ref name="guisubmenu.element"/>
-  <ref name="hardware.element"/>
-  <ref name="interface.element"/>
-  <ref name="keycap.element"/>
-  <ref name="keycode.element"/>
-  <ref name="keycombo.element"/>
-  <ref name="keysym.element"/>
-  <ref name="literal.element"/>
-  <ref name="constant.element"/>
-  <ref name="markup.element"/>
-  <ref name="medialabel.element"/>
-  <ref name="menuchoice.element"/>
-  <ref name="mousebutton.element"/>
-  <ref name="option.element"/>
-  <ref name="optional.element"/>
-  <ref name="parameter.element"/>
-  <ref name="prompt.element"/>
-  <ref name="property.element"/>
-  <ref name="replaceable.element"/>
-  <ref name="returnvalue.element"/>
-  <ref name="sgmltag.element"/>
-  <ref name="structfield.element"/>
-  <ref name="structname.element"/>
-  <ref name="symbol.element"/>
-  <ref name="systemitem.element"/>
-  <ref name="token.element"/>
-  <ref name="type.element"/>
-  <ref name="userinput.element"/>
-  <ref name="varname.element"/>
-  <ref name="ebnf.inline.hook"/>
-</define>
-
-<define name="local.base.char.class">
-  <notAllowed/>
-</define>
-<define name="base.char.class">
-  <ref name="anchor.element"/>
-  <ref name="local.base.char.class"/>
-</define>
-
-<define name="local.docinfo.char.class">
-  <notAllowed/>
-</define>
-<define name="docinfo.char.class">
-  <ref name="author.element"/>
-  <ref name="authorinitials.element"/>
-  <ref name="corpauthor.element"/>
-  <ref name="modespec.element"/>
-  <ref name="othercredit.element"/>
-  <ref name="productname.element"/>
-  <ref name="productnumber.element"/>
-  <ref name="revhistory.element"/>
-  <ref name="local.docinfo.char.class"/>
-</define>
-
-<define name="local.other.char.class">
-  <notAllowed/>
-</define>
-<define name="other.char.class">
-  <ref name="remark.element"/>
-  <ref name="subscript.element"/>
-  <ref name="superscript.element"/>
-  <ref name="local.other.char.class"/>
-</define>
-
-<define name="local.inlineobj.char.class">
-  <notAllowed/>
-</define>
-<define name="inlineobj.char.class">
-  <ref name="inlinegraphic.element"/>
-  <ref name="inlinemediaobject.element"/>
-  <ref name="inlineequation.element"/>
-  <ref name="local.inlineobj.char.class"/>
-</define>
-
-<dtd:comment> Redeclaration placeholder ............................................ </dtd:comment>
-
-<dtd:comment> For redeclaring entities that are declared after this point while
+-->
+<!-- ...................................................................... -->
+<!-- General-purpose semantics entities ................................... -->
+  <define name="yesorno.attvals">
+    <data type="string"/>
+  </define>
+<!-- ...................................................................... -->
+<!-- Entities for module inclusions ....................................... -->
+<!-- ...................................................................... -->
+<!-- Entities for element classes and mixtures ............................ -->
+<!-- "Ubiquitous" classes: ndxterm.class and beginpage -->
+  <define name="local.ndxterm.class">
+    <notAllowed/>
+  </define>
+  <define name="ndxterm.class">
+    <choice>
+      <ref name="indexterm"/>
+      <ref name="local.ndxterm.class"/>
+    </choice>
+  </define>
+<!-- Object-level classes ................................................. -->
+  <define name="local.list.class">
+    <notAllowed/>
+  </define>
+  <define name="list.class">
+    <choice>
+      <ref name="calloutlist"/>
+      <ref name="glosslist"/>
+      <ref name="itemizedlist"/>
+      <ref name="orderedlist"/>
+      <ref name="segmentedlist"/>
+      <ref name="simplelist"/>
+      <ref name="variablelist"/>
+      <ref name="local.list.class"/>
+    </choice>
+  </define>
+  <define name="local.admon.class">
+    <notAllowed/>
+  </define>
+  <define name="admon.class">
+    <choice>
+      <ref name="caution"/>
+      <ref name="important"/>
+      <ref name="note"/>
+      <ref name="tip"/>
+      <ref name="warning"/>
+      <ref name="local.admon.class"/>
+    </choice>
+  </define>
+  <define name="local.linespecific.class">
+    <notAllowed/>
+  </define>
+  <define name="linespecific.class">
+    <choice>
+      <ref name="literallayout"/>
+      <ref name="programlisting"/>
+      <ref name="programlistingco"/>
+      <ref name="screen"/>
+      <ref name="screenco"/>
+      <ref name="screenshot"/>
+      <ref name="local.linespecific.class"/>
+    </choice>
+  </define>
+  <define name="local.method.synop.class">
+    <notAllowed/>
+  </define>
+  <define name="method.synop.class">
+    <choice>
+      <ref name="constructorsynopsis"/>
+      <ref name="destructorsynopsis"/>
+      <ref name="methodsynopsis"/>
+      <ref name="local.method.synop.class"/>
+    </choice>
+  </define>
+  <define name="local.synop.class">
+    <notAllowed/>
+  </define>
+  <define name="synop.class">
+    <choice>
+      <ref name="synopsis"/>
+      <ref name="cmdsynopsis"/>
+      <ref name="funcsynopsis"/>
+      <ref name="classsynopsis"/>
+      <ref name="fieldsynopsis"/>
+      <ref name="method.synop.class"/>
+      <ref name="local.synop.class"/>
+    </choice>
+  </define>
+  <define name="local.para.class">
+    <notAllowed/>
+  </define>
+  <define name="para.class">
+    <choice>
+      <ref name="formalpara"/>
+      <ref name="para"/>
+      <ref name="simpara"/>
+      <ref name="local.para.class"/>
+    </choice>
+  </define>
+  <define name="local.informal.class">
+    <notAllowed/>
+  </define>
+  <define name="informal.class">
+    <choice>
+      <ref name="address"/>
+      <ref name="blockquote"/>
+      <ref name="graphic"/>
+      <ref name="graphicco"/>
+      <ref name="mediaobject"/>
+      <ref name="mediaobjectco"/>
+      <ref name="informalequation"/>
+      <ref name="informalexample"/>
+      <ref name="informalfigure"/>
+      <ref name="informaltable"/>
+      <ref name="local.informal.class"/>
+    </choice>
+  </define>
+  <define name="local.formal.class">
+    <notAllowed/>
+  </define>
+  <define name="formal.class">
+    <choice>
+      <ref name="equation"/>
+      <ref name="example"/>
+      <ref name="figure"/>
+      <ref name="table"/>
+      <ref name="local.formal.class"/>
+    </choice>
+  </define>
+<!-- The DocBook TC may produce an official EBNF module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+  <define name="ebnf.block.hook">
+    <notAllowed/>
+  </define>
+  <define name="local.compound.class">
+    <notAllowed/>
+  </define>
+  <define name="compound.class">
+    <choice>
+      <ref name="msgset"/>
+      <ref name="procedure"/>
+      <ref name="sidebar"/>
+      <ref name="qandaset"/>
+      <ref name="ebnf.block.hook"/>
+      <ref name="local.compound.class"/>
+    </choice>
+  </define>
+  <define name="local.genobj.class">
+    <notAllowed/>
+  </define>
+  <define name="genobj.class">
+    <choice>
+      <ref name="anchor"/>
+      <ref name="bridgehead"/>
+      <ref name="remark"/>
+      <ref name="highlights"/>
+      <ref name="local.genobj.class"/>
+    </choice>
+  </define>
+  <define name="local.descobj.class">
+    <notAllowed/>
+  </define>
+  <define name="descobj.class">
+    <choice>
+      <ref name="abstract"/>
+      <ref name="authorblurb"/>
+      <ref name="epigraph"/>
+      <ref name="local.descobj.class"/>
+    </choice>
+  </define>
+<!-- Character-level classes .............................................. -->
+  <define name="local.xref.char.class">
+    <notAllowed/>
+  </define>
+  <define name="xref.char.class">
+    <choice>
+      <ref name="footnoteref"/>
+      <ref name="xref"/>
+      <ref name="local.xref.char.class"/>
+    </choice>
+  </define>
+  <define name="local.gen.char.class">
+    <notAllowed/>
+  </define>
+  <define name="gen.char.class">
+    <choice>
+      <ref name="abbrev"/>
+      <ref name="acronym"/>
+      <ref name="citation"/>
+      <ref name="citerefentry"/>
+      <ref name="citetitle"/>
+      <ref name="emphasis"/>
+      <ref name="firstterm"/>
+      <ref name="foreignphrase"/>
+      <ref name="glossterm"/>
+      <ref name="footnote"/>
+      <ref name="phrase"/>
+      <ref name="quote"/>
+      <ref name="trademark"/>
+      <ref name="wordasword"/>
+      <ref name="local.gen.char.class"/>
+    </choice>
+  </define>
+  <define name="local.link.char.class">
+    <notAllowed/>
+  </define>
+  <define name="link.char.class">
+    <choice>
+      <ref name="link"/>
+      <ref name="olink"/>
+      <ref name="ulink"/>
+      <ref name="local.link.char.class"/>
+    </choice>
+  </define>
+<!-- The DocBook TC may produce an official EBNF module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+  <define name="ebnf.inline.hook">
+    <notAllowed/>
+  </define>
+  <define name="local.tech.char.class">
+    <notAllowed/>
+  </define>
+  <define name="tech.char.class">
+    <choice>
+      <ref name="action"/>
+      <ref name="application"/>
+      <ref name="classname"/>
+      <ref name="methodname"/>
+      <ref name="interfacename"/>
+      <ref name="exceptionname"/>
+      <ref name="ooclass"/>
+      <ref name="oointerface"/>
+      <ref name="ooexception"/>
+      <ref name="command"/>
+      <ref name="computeroutput"/>
+      <ref name="database"/>
+      <ref name="email"/>
+      <ref name="envar"/>
+      <ref name="errorcode"/>
+      <ref name="errorname"/>
+      <ref name="errortype"/>
+      <ref name="filename"/>
+      <ref name="function"/>
+      <ref name="guibutton"/>
+      <ref name="guiicon"/>
+      <ref name="guilabel"/>
+      <ref name="guimenu"/>
+      <ref name="guimenuitem"/>
+      <ref name="guisubmenu"/>
+      <ref name="hardware"/>
+      <ref name="interface"/>
+      <ref name="keycap"/>
+      <ref name="keycode"/>
+      <ref name="keycombo"/>
+      <ref name="keysym"/>
+      <ref name="literal"/>
+      <ref name="constant"/>
+      <ref name="markup"/>
+      <ref name="medialabel"/>
+      <ref name="menuchoice"/>
+      <ref name="mousebutton"/>
+      <ref name="option"/>
+      <ref name="optional"/>
+      <ref name="parameter"/>
+      <ref name="prompt"/>
+      <ref name="property"/>
+      <ref name="replaceable"/>
+      <ref name="returnvalue"/>
+      <ref name="sgmltag"/>
+      <ref name="structfield"/>
+      <ref name="structname"/>
+      <ref name="symbol"/>
+      <ref name="systemitem"/>
+      <ref name="token"/>
+      <ref name="type"/>
+      <ref name="userinput"/>
+      <ref name="varname"/>
+      <ref name="ebnf.inline.hook"/>
+      <ref name="local.tech.char.class"/>
+    </choice>
+  </define>
+  <define name="local.base.char.class">
+    <notAllowed/>
+  </define>
+  <define name="base.char.class">
+    <choice>
+      <ref name="anchor"/>
+      <ref name="local.base.char.class"/>
+    </choice>
+  </define>
+  <define name="local.docinfo.char.class">
+    <notAllowed/>
+  </define>
+  <define name="docinfo.char.class">
+    <choice>
+      <ref name="author"/>
+      <ref name="authorinitials"/>
+      <ref name="corpauthor"/>
+      <ref name="modespec"/>
+      <ref name="othercredit"/>
+      <ref name="productname"/>
+      <ref name="productnumber"/>
+      <ref name="revhistory"/>
+      <ref name="local.docinfo.char.class"/>
+    </choice>
+  </define>
+  <define name="local.other.char.class">
+    <notAllowed/>
+  </define>
+  <define name="other.char.class">
+    <choice>
+      <ref name="remark"/>
+      <ref name="subscript"/>
+      <ref name="superscript"/>
+      <ref name="local.other.char.class"/>
+    </choice>
+  </define>
+  <define name="local.inlineobj.char.class">
+    <notAllowed/>
+  </define>
+  <define name="inlineobj.char.class">
+    <choice>
+      <ref name="inlinegraphic"/>
+      <ref name="inlinemediaobject"/>
+      <ref name="inlineequation"/>
+      <ref name="local.inlineobj.char.class"/>
+    </choice>
+  </define>
+<!-- Redeclaration placeholder ............................................ -->
+<!-- For redeclaring entities that are declared after this point while
      retaining their references to the entities that are declared before
-     this point </dtd:comment>
-
-<div dtd:marked-section="dbpool.redecl.module">
-<dtd:comment> Defining rdbpool here makes some buggy XML parsers happy. </dtd:comment>
-<dtd:pe-decl name="rdbpool"/>
-<dtd:pe-ref name="rdbpool"/>
-</div> <!-- dbpool.redecl.module -->
-
-<dtd:comment> Object-level mixtures ................................................ </dtd:comment>
-
-<dtd:comment>
+     this point -->
+<!-- Object-level mixtures ................................................ -->
+<!--
                       list admn line synp para infm form cmpd gen  desc
 Component mixture       X    X    X    X    X    X    X    X    X    X
 Sidebar mixture         X    X    X    X    X    X    X    a    X
@@ -417,225 +411,243 @@ c. No Highlights.
 d. Just Graphic; no other informal objects.
 e. No Anchor, BridgeHead, or Highlights.
 f. Just BlockQuote; no other informal objects.
-</dtd:comment>
-
-<define name="local.component.mix">
-  <notAllowed/>
-</define>
-<define name="component.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="compound.class"/>
-  <ref name="genobj.class"/>
-  <ref name="descobj.class"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.component.mix"/>
-</define>
-
-<define name="local.sidebar.mix">
-  <notAllowed/>
-</define>
-<define name="sidebar.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="procedure.element"/>
-  <ref name="genobj.class"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.sidebar.mix"/>
-</define>
-
-<define name="local.qandaset.mix">
-  <notAllowed/>
-</define>
-<define name="qandaset.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="procedure.element"/>
-  <ref name="genobj.class"/>
-  <ref name="ndxterm.class"/>
-</define>
-
-<define name="local.revdescription.mix">
-  <notAllowed/>
-</define>
-<define name="revdescription.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="procedure.element"/>
-  <ref name="genobj.class"/>
-  <ref name="ndxterm.class"/>
-</define>
-
-<define name="local.footnote.mix">
-  <notAllowed/>
-</define>
-<define name="footnote.mix">
-  <ref name="list.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-</define>
-
-<define name="local.example.mix">
-  <notAllowed/>
-</define>
-<define name="example.mix">
-  <ref name="list.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.example.mix"/>
-</define>
-
-<define name="local.highlights.mix">
-  <notAllowed/>
-</define>
-<define name="highlights.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="para.class"/>
-  <ref name="ndxterm.class"/>
-</define>
-
-<dtd:comment> %formal.class; is explicitly excluded from many contexts in which
-     paragraphs are used </dtd:comment>
-<define name="local.para.mix">
-  <notAllowed/>
-</define>
-<define name="para.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-</define>
-
-<define name="local.admon.mix">
-  <notAllowed/>
-</define>
-<define name="admon.mix">
-  <ref name="list.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="procedure.element"/>
-  <ref name="sidebar.element"/>
-  <ref name="anchor.element"/>
-  <ref name="bridgehead.element"/>
-  <ref name="remark.element"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.admon.mix"/>
-</define>
-
-<define name="local.figure.mix">
-  <notAllowed/>
-</define>
-<define name="figure.mix">
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="informal.class"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.figure.mix"/>
-</define>
-
-<define name="local.tabentry.mix">
-  <notAllowed/>
-</define>
-<define name="tabentry.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="para.class"/>
-  <ref name="graphic.element"/>
-  <ref name="mediaobject.element"/>
-  <ref name="local.tabentry.mix"/>
-</define>
-
-<define name="local.glossdef.mix">
-  <notAllowed/>
-</define>
-<define name="glossdef.mix">
-  <ref name="list.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="synop.class"/>
-  <ref name="para.class"/>
-  <ref name="informal.class"/>
-  <ref name="formal.class"/>
-  <ref name="remark.element"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.glossdef.mix"/>
-</define>
-
-<define name="local.legalnotice.mix">
-  <notAllowed/>
-</define>
-<define name="legalnotice.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="para.class"/>
-  <ref name="blockquote.element"/>
-  <ref name="ndxterm.class"/>
-  <ref name="beginpage.element"/>
-  <ref name="local.legalnotice.mix"/>
-</define>
-
-<define name="local.textobject.mix">
-  <notAllowed/>
-</define>
-<define name="textobject.mix">
-  <ref name="list.class"/>
-  <ref name="admon.class"/>
-  <ref name="linespecific.class"/>
-  <ref name="para.class"/>
-  <ref name="blockquote.element"/>
-  <ref name="local.textobject.mix"/>
-</define>
-
-<define name="local.mediaobject.mix">
-  <notAllowed/>
-</define>
-<define name="mediaobject.mix">
-  <ref name="videoobject.element"/>
-  <ref name="audioobject.element"/>
-  <ref name="imageobject.element"/>
-  <ref name="local.mediaobject.mix"/>
-</define>
-
-<dtd:comment> Character-level mixtures ............................................. </dtd:comment>
-
-<dtd:comment>
+-->
+  <define name="local.component.mix">
+    <notAllowed/>
+  </define>
+  <define name="component.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="compound.class"/>
+      <ref name="genobj.class"/>
+      <ref name="descobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.component.mix"/>
+    </choice>
+  </define>
+  <define name="local.sidebar.mix">
+    <notAllowed/>
+  </define>
+  <define name="sidebar.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="procedure"/>
+      <ref name="genobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.sidebar.mix"/>
+    </choice>
+  </define>
+  <define name="local.qandaset.mix">
+    <notAllowed/>
+  </define>
+  <define name="qandaset.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="procedure"/>
+      <ref name="genobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="local.qandaset.mix"/>
+    </choice>
+  </define>
+  <define name="local.revdescription.mix">
+    <notAllowed/>
+  </define>
+  <define name="revdescription.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="procedure"/>
+      <ref name="genobj.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="local.revdescription.mix"/>
+    </choice>
+  </define>
+  <define name="local.footnote.mix">
+    <notAllowed/>
+  </define>
+  <define name="footnote.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="local.footnote.mix"/>
+    </choice>
+  </define>
+  <define name="local.example.mix">
+    <notAllowed/>
+  </define>
+  <define name="example.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.example.mix"/>
+    </choice>
+  </define>
+  <define name="local.highlights.mix">
+    <notAllowed/>
+  </define>
+  <define name="highlights.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="para.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="local.highlights.mix"/>
+    </choice>
+  </define>
+<!-- %formal.class; is explicitly excluded from many contexts in which
+     paragraphs are used -->
+  <define name="local.para.mix">
+    <notAllowed/>
+  </define>
+  <define name="para.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="local.para.mix"/>
+    </choice>
+  </define>
+  <define name="local.admon.mix">
+    <notAllowed/>
+  </define>
+  <define name="admon.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="procedure"/>
+      <ref name="sidebar"/>
+      <ref name="anchor"/>
+      <ref name="bridgehead"/>
+      <ref name="remark"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.admon.mix"/>
+    </choice>
+  </define>
+  <define name="local.figure.mix">
+    <notAllowed/>
+  </define>
+  <define name="figure.mix">
+    <choice>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="informal.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.figure.mix"/>
+    </choice>
+  </define>
+  <define name="local.tabentry.mix">
+    <notAllowed/>
+  </define>
+  <define name="tabentry.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="para.class"/>
+      <ref name="graphic"/>
+      <ref name="mediaobject"/>
+      <ref name="local.tabentry.mix"/>
+    </choice>
+  </define>
+  <define name="local.glossdef.mix">
+    <notAllowed/>
+  </define>
+  <define name="glossdef.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="synop.class"/>
+      <ref name="para.class"/>
+      <ref name="informal.class"/>
+      <ref name="formal.class"/>
+      <ref name="remark"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.glossdef.mix"/>
+    </choice>
+  </define>
+  <define name="local.legalnotice.mix">
+    <notAllowed/>
+  </define>
+  <define name="legalnotice.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="para.class"/>
+      <ref name="blockquote"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.legalnotice.mix"/>
+    </choice>
+  </define>
+  <define name="local.textobject.mix">
+    <notAllowed/>
+  </define>
+  <define name="textobject.mix">
+    <choice>
+      <ref name="list.class"/>
+      <ref name="admon.class"/>
+      <ref name="linespecific.class"/>
+      <ref name="para.class"/>
+      <ref name="blockquote"/>
+      <ref name="local.textobject.mix"/>
+    </choice>
+  </define>
+  <define name="local.mediaobject.mix">
+    <notAllowed/>
+  </define>
+  <define name="mediaobject.mix">
+    <choice>
+      <ref name="videoobject"/>
+      <ref name="audioobject"/>
+      <ref name="imageobject"/>
+      <ref name="local.mediaobject.mix"/>
+    </choice>
+  </define>
+<!-- Character-level mixtures ............................................. -->
+<!--
                     #PCD xref word link cptr base dnfo othr inob (synop)
 para.char.mix         X    X    X    X    X    X    X    X    X
 title.char.mix        X    X    X    X    X    X    X    X    X
@@ -649,3692 +661,2663 @@ a. Just InlineGraphic; no InlineEquation.
 b. Just Replaceable; no other computer terms.
 c. Just Emphasis and Trademark; no other word elements.
 d. Just Acronym, Emphasis, and Trademark; no other word elements.
-</dtd:comment>
-
-<dtd:comment> The DocBook TC may produce an official forms module for DocBook. </dtd:comment>
-<dtd:comment> This PE provides the hook by which it can be inserted into the DTD. </dtd:comment>
-<define name="forminlines.hook">
-  <notAllowed/>
-</define>
-
-<define name="local.para.char.mix">
-  <notAllowed/>
-</define>
-<define name="para.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="xref.char.class"/>
-        <ref name="gen.char.class"/>
-        <ref name="link.char.class"/>
-        <ref name="tech.char.class"/>
-        <ref name="base.char.class"/>
-        <ref name="docinfo.char.class"/>
-        <ref name="other.char.class"/>
-        <ref name="inlineobj.char.class"/>
-        <ref name="synop.class"/>
-        <ref name="ndxterm.class"/>
-        <ref name="beginpage.element"/>
-        <ref name="forminlines.hook"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.title.char.mix">
-  <notAllowed/>
-</define>
-<define name="title.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="xref.char.class"/>
-        <ref name="gen.char.class"/>
-        <ref name="link.char.class"/>
-        <ref name="tech.char.class"/>
-        <ref name="base.char.class"/>
-        <ref name="docinfo.char.class"/>
-        <ref name="other.char.class"/>
-        <ref name="inlineobj.char.class"/>
-        <ref name="ndxterm.class"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.ndxterm.char.mix">
-  <notAllowed/>
-</define>
-<define name="ndxterm.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="xref.char.class"/>
-        <ref name="gen.char.class"/>
-        <ref name="link.char.class"/>
-        <ref name="tech.char.class"/>
-        <ref name="base.char.class"/>
-        <ref name="docinfo.char.class"/>
-        <ref name="other.char.class"/>
-        <ref name="inlinegraphic.element"/>
-        <ref name="inlinemediaobject.element"/>
-        <ref name="local.ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.cptr.char.mix">
-  <notAllowed/>
-</define>
-<define name="cptr.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="link.char.class"/>
-        <ref name="tech.char.class"/>
-        <ref name="base.char.class"/>
-        <ref name="other.char.class"/>
-        <ref name="inlinegraphic.element"/>
-        <ref name="inlinemediaobject.element"/>
-        <ref name="ndxterm.class"/>
-        <ref name="beginpage.element"/>
-        <ref name="local.cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.smallcptr.char.mix">
-  <notAllowed/>
-</define>
-<define name="smallcptr.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="replaceable.element"/>
-        <ref name="inlinegraphic.element"/>
-        <ref name="inlinemediaobject.element"/>
-        <ref name="ndxterm.class"/>
-        <ref name="beginpage.element"/>
-        <ref name="local.smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.word.char.mix">
-  <notAllowed/>
-</define>
-<define name="word.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="acronym.element"/>
-        <ref name="emphasis.element"/>
-        <ref name="trademark.element"/>
-        <ref name="link.char.class"/>
-        <ref name="base.char.class"/>
-        <ref name="other.char.class"/>
-        <ref name="inlinegraphic.element"/>
-        <ref name="inlinemediaobject.element"/>
-        <ref name="ndxterm.class"/>
-        <ref name="beginpage.element"/>
-        <ref name="local.word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-
-<define name="local.docinfo.char.mix">
-  <notAllowed/>
-</define>
-<define name="docinfo.char.mix">
-  <mixed>
-    <zeroOrMore>
-      <choice>
-        <ref name="link.char.class"/>
-        <ref name="emphasis.element"/>
-        <ref name="trademark.element"/>
-        <ref name="replaceable.element"/>
-        <ref name="other.char.class"/>
-        <ref name="inlinegraphic.element"/>
-        <ref name="inlinemediaobject.element"/>
-        <ref name="ndxterm.class"/>
-      </choice>
-    </zeroOrMore>
-  </mixed>
-</define>
-<dtd:comment>ENTITY % bibliocomponent.mix (see Bibliographic section, below)</dtd:comment>
-<dtd:comment>ENTITY % person.ident.mix (see Bibliographic section, below)</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for content models .......................................... </dtd:comment>
-
-<define name="formalobject.title.content">
-  <ref name="title.element"/>
-  <optional>
-    <ref name="titleabbrev.element"/>
-  </optional>
-</define>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Entities for attributes and attribute components ..................... </dtd:comment>
-
-<dtd:comment> Effectivity attributes ............................................... </dtd:comment>
-
-
-<dtd:comment> Arch: Computer or chip architecture to which element applies; no 
-	default </dtd:comment>
-
-<define name="arch.attrib">
-  <optional>
-    <attribute name="arch"/>
-  </optional>
-</define>
-
-<dtd:comment> Condition: General-purpose effectivity attribute </dtd:comment>
-
-<define name="condition.attrib">
-  <optional>
-    <attribute name="condition"/>
-  </optional>
-</define>
-
-<dtd:comment> Conformance: Standards conformance characteristics </dtd:comment>
-
-<define name="conformance.attrib">
-  <optional>
-    <attribute name="conformance"/>
-  </optional>
-</define>
-
-<dtd:comment> OS: Operating system to which element applies; no default </dtd:comment>
-
-<define name="os.attrib">
-  <optional>
-    <attribute name="os"/>
-  </optional>
-</define>
-
-<dtd:comment> Revision: Editorial revision to which element belongs; no default </dtd:comment>
-
-<define name="revision.attrib">
-  <optional>
-    <attribute name="revision"/>
-  </optional>
-</define>
-
-<dtd:comment> Security: Security classification; no default </dtd:comment>
-
-<define name="security.attrib">
-  <optional>
-    <attribute name="security"/>
-  </optional>
-</define>
-
-<dtd:comment> UserLevel: Level of user experience to which element applies; no 
-	default </dtd:comment>
-
-<define name="userlevel.attrib">
-  <optional>
-    <attribute name="userlevel"/>
-  </optional>
-</define>
-
-<dtd:comment> Vendor: Computer vendor to which element applies; no default </dtd:comment>
-
-<define name="vendor.attrib">
-  <optional>
-    <attribute name="vendor"/>
-  </optional>
-</define>
-
-<define name="local.effectivity.attrib">
-  <notAllowed/>
-</define>
-<define name="effectivity.attrib">
-  <ref name="arch.attrib"/>
-  <ref name="condition.attrib"/>
-  <ref name="conformance.attrib"/>
-  <ref name="os.attrib"/>
-  <ref name="revision.attrib"/>
-  <ref name="security.attrib"/>
-  <ref name="userlevel.attrib"/>
-  <ref name="vendor.attrib"/>
-  <ref name="local.effectivity.attrib"/>
-</define>
-
-<dtd:comment> Common attributes .................................................... </dtd:comment>
-
-
-<dtd:comment> Id: Unique identifier of element; no default </dtd:comment>
-
-<define name="id.attrib">
-  <optional>
-    <attribute name="id" a:attributeType="ID">
-      <data type="token"/>
+-->
+<!-- The DocBook TC may produce an official forms module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+  <define name="forminlines.hook">
+    <notAllowed/>
+  </define>
+  <define name="local.para.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="para.char.mix">
+    <choice>
+      <text/>
+      <ref name="xref.char.class"/>
+      <ref name="gen.char.class"/>
+      <ref name="link.char.class"/>
+      <ref name="tech.char.class"/>
+      <ref name="base.char.class"/>
+      <ref name="docinfo.char.class"/>
+      <ref name="other.char.class"/>
+      <ref name="inlineobj.char.class"/>
+      <ref name="synop.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="forminlines.hook"/>
+      <ref name="local.para.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.title.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="title.char.mix">
+    <choice>
+      <text/>
+      <ref name="xref.char.class"/>
+      <ref name="gen.char.class"/>
+      <ref name="link.char.class"/>
+      <ref name="tech.char.class"/>
+      <ref name="base.char.class"/>
+      <ref name="docinfo.char.class"/>
+      <ref name="other.char.class"/>
+      <ref name="inlineobj.char.class"/>
+      <ref name="ndxterm.class"/>
+      <ref name="local.title.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.ndxterm.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="ndxterm.char.mix">
+    <choice>
+      <text/>
+      <ref name="xref.char.class"/>
+      <ref name="gen.char.class"/>
+      <ref name="link.char.class"/>
+      <ref name="tech.char.class"/>
+      <ref name="base.char.class"/>
+      <ref name="docinfo.char.class"/>
+      <ref name="other.char.class"/>
+      <ref name="inlinegraphic"/>
+      <ref name="inlinemediaobject"/>
+      <ref name="local.ndxterm.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.cptr.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="cptr.char.mix">
+    <choice>
+      <text/>
+      <ref name="link.char.class"/>
+      <ref name="tech.char.class"/>
+      <ref name="base.char.class"/>
+      <ref name="other.char.class"/>
+      <ref name="inlinegraphic"/>
+      <ref name="inlinemediaobject"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.cptr.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.smallcptr.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="smallcptr.char.mix">
+    <choice>
+      <text/>
+      <ref name="replaceable"/>
+      <ref name="inlinegraphic"/>
+      <ref name="inlinemediaobject"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.smallcptr.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.word.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="word.char.mix">
+    <choice>
+      <text/>
+      <ref name="acronym"/>
+      <ref name="emphasis"/>
+      <ref name="trademark"/>
+      <ref name="link.char.class"/>
+      <ref name="base.char.class"/>
+      <ref name="other.char.class"/>
+      <ref name="inlinegraphic"/>
+      <ref name="inlinemediaobject"/>
+      <ref name="ndxterm.class"/>
+      <ref name="beginpage"/>
+      <ref name="local.word.char.mix"/>
+    </choice>
+  </define>
+  <define name="local.docinfo.char.mix">
+    <notAllowed/>
+  </define>
+  <define name="docinfo.char.mix">
+    <choice>
+      <text/>
+      <ref name="link.char.class"/>
+      <ref name="emphasis"/>
+      <ref name="trademark"/>
+      <ref name="replaceable"/>
+      <ref name="other.char.class"/>
+      <ref name="inlinegraphic"/>
+      <ref name="inlinemediaobject"/>
+      <ref name="ndxterm.class"/>
+      <ref name="local.docinfo.char.mix"/>
+    </choice>
+  </define>
+<!--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 
+	default -->
+  <define name="arch.attrib">
+    <optional>
+      <attribute name="arch"/>
+    </optional>
+  </define>
+<!-- Condition: General-purpose effectivity attribute -->
+  <define name="condition.attrib">
+    <optional>
+      <attribute name="condition"/>
+    </optional>
+  </define>
+<!-- Conformance: Standards conformance characteristics -->
+  <define name="conformance.attrib">
+    <optional>
+      <attribute name="conformance">
+        <data type="NMTOKENS"/>
+      </attribute>
+    </optional>
+  </define>
+<!-- OS: Operating system to which element applies; no default -->
+  <define name="os.attrib">
+    <optional>
+      <attribute name="os"/>
+    </optional>
+  </define>
+<!-- Revision: Editorial revision to which element belongs; no default -->
+  <define name="revision.attrib">
+    <optional>
+      <attribute name="revision"/>
+    </optional>
+  </define>
+<!-- Security: Security classification; no default -->
+  <define name="security.attrib">
+    <optional>
+      <attribute name="security"/>
+    </optional>
+  </define>
+<!-- UserLevel: Level of user experience to which element applies; no 
+	default -->
+  <define name="userlevel.attrib">
+    <optional>
+      <attribute name="userlevel"/>
+    </optional>
+  </define>
+<!-- Vendor: Computer vendor to which element applies; no default -->
+  <define name="vendor.attrib">
+    <optional>
+      <attribute name="vendor"/>
+    </optional>
+  </define>
+  <define name="local.effectivity.attrib">
+    <empty/>
+  </define>
+  <define name="effectivity.attrib">
+    <ref name="arch.attrib"/>
+    <ref name="condition.attrib"/>
+    <ref name="conformance.attrib"/>
+    <ref name="os.attrib"/>
+    <ref name="revision.attrib"/>
+    <ref name="security.attrib"/>
+    <ref name="userlevel.attrib"/>
+    <ref name="vendor.attrib"/>
+    <ref name="local.effectivity.attrib"/>
+  </define>
+<!-- Common attributes .................................................... -->
+<!-- Id: Unique identifier of element; no default -->
+  <define name="id.attrib">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+  </define>
+<!-- Id: Unique identifier of element; a value must be supplied; no 
+	default -->
+  <define name="idreq.attrib">
+    <attribute name="id">
+      <data type="ID"/>
     </attribute>
-  </optional>
-</define>
-
-<dtd:comment> Id: Unique identifier of element; a value must be supplied; no 
-	default </dtd:comment>
-
-<define name="idreq.attrib">
-  <attribute name="id" a:attributeType="ID">
-    <data type="token"/>
-  </attribute>
-</define>
-
-<dtd:comment> Lang: Indicator of language in which element is written, for
-	translation, character set management, etc.; no default </dtd:comment>
-
-<define name="lang.attrib">
-  <optional>
-    <attribute name="lang"/>
-  </optional>
-</define>
-
-<dtd:comment> Remap: Previous role of element before conversion; no default </dtd:comment>
-
-<define name="remap.attrib">
-  <optional>
-    <attribute name="remap"/>
-  </optional>
-</define>
-
-<dtd:comment> Role: New role of element in local environment; no default </dtd:comment>
-
-<define name="role.attrib">
-  <optional>
-    <attribute name="role"/>
-  </optional>
-</define>
-
-<dtd:comment> XRefLabel: Alternate labeling string for XRef text generation;
+  </define>
+<!-- Lang: Indicator of language in which element is written, for
+	translation, character set management, etc.; no default -->
+  <define name="lang.attrib">
+    <optional>
+      <attribute name="lang"/>
+    </optional>
+  </define>
+<!-- Remap: Previous role of element before conversion; no default -->
+  <define name="remap.attrib">
+    <optional>
+      <attribute name="remap"/>
+    </optional>
+  </define>
+<!-- Role: New role of element in local environment; no default -->
+  <define name="role.attrib">
+    <optional>
+      <attribute name="role"/>
+    </optional>
+  </define>
+<!-- XRefLabel: Alternate labeling string for XRef text generation;
 	default is usually title or other appropriate label text already
-	contained in element </dtd:comment>
-
-<define name="xreflabel.attrib">
-  <optional>
-    <attribute name="xreflabel"/>
-  </optional>
-</define>
-
-<dtd:comment> RevisionFlag: Revision status of element; default is that element
-	wasn't revised </dtd:comment>
-
-<define name="revisionflag.attrib">
-  <optional>
-    <attribute name="revisionflag">
-      <choice>
-	<value>changed</value>
-	<value>added</value>
-	<value>deleted</value>
-	<value>off</value>
-      </choice>
-    </attribute>
-  </optional>
-</define>
-
-<define name="local.common.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:comment> Role is included explicitly on each element </dtd:comment>
-
-<define name="common.attrib">
-  <ref name="id.attrib"/>
-  <ref name="lang.attrib"/>
-  <ref name="remap.attrib"/>
-  <ref name="xreflabel.attrib"/>
-  <ref name="revisionflag.attrib"/>
-  <ref name="effectivity.attrib"/>
-  <ref name="local.common.attrib"/>
-</define>
-
-<dtd:comment> Role is included explicitly on each element </dtd:comment>
-
-<define name="idreq.common.attrib">
-  <ref name="idreq.attrib"/>
-  <ref name="lang.attrib"/>
-  <ref name="remap.attrib"/>
-  <ref name="xreflabel.attrib"/>
-  <ref name="revisionflag.attrib"/>
-  <ref name="effectivity.attrib"/>
-  <ref name="local.common.attrib"/>
-</define>
-
-<dtd:comment> Semi-common attributes and other attribute entities .................. </dtd:comment>
-
-<define name="local.graphics.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:comment> EntityRef: Name of an external entity containing the content
-	of the graphic </dtd:comment>
-<dtd:comment> FileRef: Filename, qualified by a pathname if desired, 
-	designating the file containing the content of the graphic </dtd:comment>
-<dtd:comment> Format: Notation of the element content, if any </dtd:comment>
-<dtd:comment> SrcCredit: Information about the source of the Graphic </dtd:comment>
-<dtd:comment> Width: Same as CALS reprowid (desired width) </dtd:comment>
-<dtd:comment> Depth: Same as CALS reprodep (desired depth) </dtd:comment>
-<dtd:comment> Align: Same as CALS hplace with 'none' removed; #IMPLIED means 
-	application-specific </dtd:comment>
-<dtd:comment> Scale: Conflation of CALS hscale and vscale </dtd:comment>
-<dtd:comment> Scalefit: Same as CALS scalefit </dtd:comment>
-
-<define name="graphics.attrib">
-  <optional>
-    <attribute name="entityref">
-      <data type="ENTITY"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="fileref"/>
-  </optional>
-  <optional>
-    <attribute name="format" dtd:type="NOTATION">
-      <ref name="notation.class"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="srccredit"/>
-  </optional>
-  <optional>
-    <attribute name="width"/>
-  </optional>
-  <optional>
-    <attribute name="depth"/>
-  </optional>
-  <optional>
-    <attribute name="align">
-      <choice>
-	<value>left</value>
-	<value>right</value>
-	<value>center</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="scale"/>
-  </optional>
-  <optional>
-    <attribute name="scalefit">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <ref name="local.graphics.attrib"/>
-</define>
-
-<define name="local.keyaction.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:comment> Action: Key combination type; default is unspecified if one 
+	contained in element -->
+  <define name="xreflabel.attrib">
+    <optional>
+      <attribute name="xreflabel"/>
+    </optional>
+  </define>
+<!-- RevisionFlag: Revision status of element; default is that element
+	wasn't revised -->
+  <define name="revisionflag.attrib">
+    <optional>
+      <attribute name="revisionflag">
+        <choice>
+          <value>changed</value>
+          <value>added</value>
+          <value>deleted</value>
+          <value>off</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="local.common.attrib">
+    <empty/>
+  </define>
+<!-- Role is included explicitly on each element -->
+  <define name="common.attrib">
+    <ref name="id.attrib"/>
+    <ref name="lang.attrib"/>
+    <ref name="remap.attrib"/>
+    <ref name="xreflabel.attrib"/>
+    <ref name="revisionflag.attrib"/>
+    <ref name="effectivity.attrib"/>
+    <ref name="local.common.attrib"/>
+  </define>
+<!-- Role is included explicitly on each element -->
+  <define name="idreq.common.attrib">
+    <ref name="idreq.attrib"/>
+    <ref name="lang.attrib"/>
+    <ref name="remap.attrib"/>
+    <ref name="xreflabel.attrib"/>
+    <ref name="revisionflag.attrib"/>
+    <ref name="effectivity.attrib"/>
+    <ref name="local.common.attrib"/>
+  </define>
+<!-- Semi-common attributes and other attribute entities .................. -->
+  <define name="local.graphics.attrib">
+    <empty/>
+  </define>
+<!-- EntityRef: Name of an external entity containing the content
+	of the graphic -->
+<!-- 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 
+	application-specific -->
+<!-- Scale: Conflation of CALS hscale and vscale -->
+<!-- Scalefit: Same as CALS scalefit -->
+  <define name="graphics.attrib">
+    <optional>
+      <attribute name="entityref">
+        <data type="ENTITY"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="fileref"/>
+    </optional>
+    <optional>
+      <attribute name="format">
+        <choice>
+          <ref name="notation.class"/>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="srccredit"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+    <optional>
+      <attribute name="depth"/>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="scale"/>
+    </optional>
+    <optional>
+      <attribute name="scalefit">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <ref name="local.graphics.attrib"/>
+  </define>
+  <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 
-	Other, the OtherAction attribute must have a nonempty value </dtd:comment>
-<dtd:comment> OtherAction: User-defined key combination type </dtd:comment>
-
-<define name="keyaction.attrib">
-  <optional>
-    <attribute name="action">
-      <choice>
-        <value>click</value>
-        <value>double-click</value>
-        <value>press</value>
-        <value>seq</value>
-        <value>simul</value>
-        <value>other</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="otheraction"/>
-  </optional>
-  <ref name="local.keyaction.attrib"/>
-</define>
-
-<dtd:comment> Label: Identifying number or string; default is usually the
-	appropriate number or string autogenerated by a formatter </dtd:comment>
-
-<define name="label.attrib">
-  <optional>
-    <attribute name="label"/>
-  </optional>
-</define>
-
-<dtd:comment> Format: whether element is assumed to contain significant white
-	space </dtd:comment>
-
-<define name="linespecific.attrib">
-  <optional>
-    <attribute name="format"
-               dtd:format="NOTATION"
-               dtd:default="linespecific">
-      <choice>
-        <value>linespecific</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="linenumbering">
-      <choice>
-        <value>numbered</value>
-        <value>unnumbered</value>
-      </choice>
-    </attribute>
-  </optional>
-</define>
-
-<dtd:comment> Linkend: link to related information; no default </dtd:comment>
-
-<define name="linkend.attrib">
-  <optional>
-    <attribute name="linkend" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-</define>
-
-<dtd:comment> Linkend: required link to related information </dtd:comment>
-
-<define name="linkendreq.attrib">
-  <attribute name="linkend" a:attributeType="IDREF">
-    <data type="token"/>
-  </attribute>
-</define>
-
-<dtd:comment> Linkends: link to one or more sets of related information; no 
-	default </dtd:comment>
-
-<define name="linkends.attrib">
-  <optional>
-    <attribute name="linkends" a:attributeType="IDREFS">
-      <list>
-        <oneOrMore>
-          <data type="token"/>
-        </oneOrMore>
-      </list>
-    </attribute>
-  </optional>
-</define>
-
-<define name="local.mark.attrib">
-  <notAllowed/>
-</define>
-
-<define name="mark.attrib">
-  <optional>
-    <attribute name="mark"/>
-  </optional>
-  <ref name="local.mark.attrib"/>
-</define>
-
-<dtd:comment> MoreInfo: whether element's content has an associated RefEntry </dtd:comment>
-
-<define name="moreinfo.attrib">
-  <optional>
-    <attribute name="moreinfo" dtd:default="none">
-      <choice>
-	<value>refentry</value>
-	<value>none</value>
-      </choice>
+	Other, the OtherAction attribute must have a nonempty value -->
+<!-- OtherAction: User-defined key combination type -->
+  <define name="keyaction.attrib">
+    <optional>
+      <attribute name="action">
+        <choice>
+          <value>click</value>
+          <value>double-click</value>
+          <value>press</value>
+          <value>seq</value>
+          <value>simul</value>
+          <value>other</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otheraction"/>
+    </optional>
+    <ref name="local.keyaction.attrib"/>
+  </define>
+<!-- Label: Identifying number or string; default is usually the
+	appropriate number or string autogenerated by a formatter -->
+  <define name="label.attrib">
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
+<!-- Format: whether element is assumed to contain significant white
+	space -->
+  <define name="linespecific.attrib">
+    <optional>
+      <attribute name="format" a:defaultValue="linespecific">
+        <choice>
+          <value>linespecific</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="linenumbering">
+        <choice>
+          <value>numbered</value>
+          <value>unnumbered</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+<!-- Linkend: link to related information; no default -->
+  <define name="linkend.attrib">
+    <optional>
+      <attribute name="linkend">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+  </define>
+<!-- Linkend: required link to related information -->
+  <define name="linkendreq.attrib">
+    <attribute name="linkend">
+      <data type="IDREF"/>
     </attribute>
-  </optional>
-</define>
-
-<dtd:comment> Pagenum: number of page on which element appears; no default </dtd:comment>
-
-<define name="pagenum.attrib">
-  <optional>
-    <attribute name="pagenum"/>
-  </optional>
-</define>
-
-<define name="local.status.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:comment> Status: Editorial or publication status of the element
-	it applies to, such as "in review" or "approved for distribution" </dtd:comment>
-
-<define name="status.attrib">
-  <optional>
-    <attribute name="status"/>
-  </optional>
-  <ref name="local.status.attrib"/>
-</define>
-
-<dtd:comment> Width: width of the longest line in the element to which it
-	pertains, in number of characters </dtd:comment>
-
-<define name="width.attrib">
-  <optional>
-    <attribute name="width"/>
-  </optional>
-</define>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Title elements ....................................................... </dtd:comment>
-
-<dtd:pe-decl name="title.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="title.module">
-<define name="local.title.attrib">
-  <notAllowed/>
-</define>
-<define name="title.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="title.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="title.element">
-<define name="title.element">
-  <element name="title">
-    <zeroOrMore>
-      <choice>
+  </define>
+<!-- Linkends: link to one or more sets of related information; no 
+	default -->
+  <define name="linkends.attrib">
+    <optional>
+      <attribute name="linkends">
+        <data type="IDREFS"/>
+      </attribute>
+    </optional>
+  </define>
+  <define name="local.mark.attrib">
+    <empty/>
+  </define>
+  <define name="mark.attrib">
+    <optional>
+      <attribute name="mark"/>
+    </optional>
+    <ref name="local.mark.attrib"/>
+  </define>
+<!-- MoreInfo: whether element's content has an associated RefEntry -->
+  <define name="moreinfo.attrib">
+    <optional>
+      <attribute name="moreinfo" a:defaultValue="none">
+        <choice>
+          <value>refentry</value>
+          <value>none</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+<!-- Pagenum: number of page on which element appears; no default -->
+  <define name="pagenum.attrib">
+    <optional>
+      <attribute name="pagenum"/>
+    </optional>
+  </define>
+  <define name="local.status.attrib">
+    <empty/>
+  </define>
+<!-- Status: Editorial or publication status of the element
+	it applies to, such as "in review" or "approved for distribution" -->
+  <define name="status.attrib">
+    <optional>
+      <attribute name="status"/>
+    </optional>
+    <ref name="local.status.attrib"/>
+  </define>
+<!-- Width: width of the longest line in the element to which it
+	pertains, in number of characters -->
+  <define name="width.attrib">
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
+<!-- ...................................................................... -->
+<!-- Title elements ....................................................... -->
+  <define name="local.title.attrib">
+    <empty/>
+  </define>
+  <define name="title.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="title">
+    <element name="title">
+      <ref name="title.attlist"/>
+      <zeroOrMore>
         <ref name="title.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- title.element -->
-
-<dtd:pe-decl name="title.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="title.attlist">
-<define name="title.attlist">
-  <ref name="pagenum.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="title.role.attrib"/>
-  <ref name="local.title.attrib"/>
-</define>
-</div> <!-- title.attlist -->
-</div> <!-- title.module -->
-
-<dtd:pe-decl name="titleabbrev.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="titleabbrev.module">
-<define name="local.titleabbrev.attrib">
-  <notAllowed/>
-</define>
-<define name="titleabbrev.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="titleabbrev.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="titleabbrev.element">
-<define name="titleabbrev.element">
-  <element name="titleabbrev">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of title.element-->
+  <define name="title.attlist" combine="interleave">
+    <ref name="pagenum.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="title.role.attrib"/>
+    <ref name="local.title.attrib"/>
+  </define>
+<!--end of title.attlist-->
+<!--end of title.module-->
+  <define name="local.titleabbrev.attrib">
+    <empty/>
+  </define>
+  <define name="titleabbrev.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="titleabbrev">
+    <element name="titleabbrev">
+      <ref name="titleabbrev.attlist"/>
+      <zeroOrMore>
         <ref name="title.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- titleabbrev.element -->
-
-<dtd:pe-decl name="titleabbrev.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="titleabbrev.attlist">
-<define name="titleabbrev.attlist">
-  <ref name="common.attrib"/>
-  <ref name="titleabbrev.role.attrib"/>
-  <ref name="local.titleabbrev.attrib"/>
-</define>
-</div> <!-- titleabbrev.attlist -->
-</div> <!-- titleabbrev.module -->
-
-<dtd:pe-decl name="subtitle.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subtitle.module">
-<define name="local.subtitle.attrib">
-  <notAllowed/>
-</define>
-<define name="subtitle.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="subtitle.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subtitle.element">
-<define name="subtitle.element">
-  <element name="subtitle">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of titleabbrev.element-->
+  <define name="titleabbrev.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="titleabbrev.role.attrib"/>
+    <ref name="local.titleabbrev.attrib"/>
+  </define>
+<!--end of titleabbrev.attlist-->
+<!--end of titleabbrev.module-->
+  <define name="local.subtitle.attrib">
+    <empty/>
+  </define>
+  <define name="subtitle.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="subtitle">
+    <element name="subtitle">
+      <ref name="subtitle.attlist"/>
+      <zeroOrMore>
         <ref name="title.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- subtitle.element -->
-
-<dtd:pe-decl name="subtitle.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subtitle.attlist">
-<define name="subtitle.attlist">
-  <ref name="common.attrib"/>
-  <ref name="subtitle.role.attrib"/>
-  <ref name="local.subtitle.attrib"/>
-</define>
-</div> <!-- subtitle.attlist -->
-</div> <!-- subtitle.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Bibliographic entities and elements .................................. </dtd:comment>
-
-<dtd:comment> The bibliographic elements are typically used in the document
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of subtitle.element-->
+  <define name="subtitle.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="subtitle.role.attrib"/>
+    <ref name="local.subtitle.attrib"/>
+  </define>
+<!--end of subtitle.attlist-->
+<!--end of subtitle.module-->
+<!-- ...................................................................... -->
+<!-- Bibliographic entities and elements .................................. -->
+<!-- The bibliographic elements are typically used in the document
      hierarchy. They do not appear in content models of information
      pool elements.  See also the document information elements,
-     below. </dtd:comment>
-
-<define name="local.person.ident.mix">
-  <notAllowed/>
-</define>
-<define name="person.ident.mix">
-  <ref name="honorific.element"/>
-  <ref name="firstname.element"/>
-  <ref name="surname.element"/>
-  <ref name="lineage.element"/>
-  <ref name="othername.element"/>
-  <ref name="affiliation.element"/>
-  <ref name="authorblurb.element"/>
-  <ref name="contrib.element"/>
-  <ref name="local.person.ident.mix"/>
-</define>
-
-<define name="local.bibliocomponent.mix">
-  <notAllowed/>
-</define>
-<define name="bibliocomponent.mix">
-  <ref name="abbrev.element"/>
-  <ref name="abstract.element"/>
-  <ref name="address.element"/>
-  <ref name="artpagenums.element"/>
-  <ref name="author.element"/>
-  <ref name="authorgroup.element"/>
-  <ref name="authorinitials.element"/>
-  <ref name="bibliomisc.element"/>
-  <ref name="biblioset.element"/>
-  <ref name="collab.element"/>
-  <ref name="confgroup.element"/>
-  <ref name="contractnum.element"/>
-  <ref name="contractsponsor.element"/>
-  <ref name="copyright.element"/>
-  <ref name="corpauthor.element"/>
-  <ref name="corpname.element"/>
-  <ref name="date.element"/>
-  <ref name="edition.element"/>
-  <ref name="editor.element"/>
-  <ref name="invpartnumber.element"/>
-  <ref name="isbn.element"/>
-  <ref name="issn.element"/>
-  <ref name="issuenum.element"/>
-  <ref name="orgname.element"/>
-  <ref name="othercredit.element"/>
-  <ref name="pagenums.element"/>
-  <ref name="printhistory.element"/>
-  <ref name="productname.element"/>
-  <ref name="productnumber.element"/>
-  <ref name="pubdate.element"/>
-  <ref name="publisher.element"/>
-  <ref name="publishername.element"/>
-  <ref name="pubsnumber.element"/>
-  <ref name="releaseinfo.element"/>
-  <ref name="revhistory.element"/>
-  <ref name="seriesvolnums.element"/>
-  <ref name="subtitle.element"/>
-  <ref name="title.element"/>
-  <ref name="titleabbrev.element"/>
-  <ref name="volumenum.element"/>
-  <ref name="citetitle.element"/>
-  <ref name="person.ident.mix"/>
-  <ref name="ndxterm.class"/>
-</define>
-
-<dtd:pe-decl name="biblioentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="biblioentry.module">
-<define name="local.biblioentry.attrib">
-  <notAllowed/>
-</define>
-<define name="biblioentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="biblioentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="biblioentry.element">
-<define name="biblioentry.element">
-  <element name="biblioentry">
-    <group>
+     below. -->
+  <define name="local.person.ident.mix">
+    <notAllowed/>
+  </define>
+  <define name="person.ident.mix">
+    <choice>
+      <ref name="honorific"/>
+      <ref name="firstname"/>
+      <ref name="surname"/>
+      <ref name="lineage"/>
+      <ref name="othername"/>
+      <ref name="affiliation"/>
+      <ref name="authorblurb"/>
+      <ref name="contrib"/>
+      <ref name="local.person.ident.mix"/>
+    </choice>
+  </define>
+  <define name="local.bibliocomponent.mix">
+    <notAllowed/>
+  </define>
+  <define name="bibliocomponent.mix">
+    <choice>
+      <ref name="abbrev"/>
+      <ref name="abstract"/>
+      <ref name="address"/>
+      <ref name="artpagenums"/>
+      <ref name="author"/>
+      <ref name="authorgroup"/>
+      <ref name="authorinitials"/>
+      <ref name="bibliomisc"/>
+      <ref name="biblioset"/>
+      <ref name="collab"/>
+      <ref name="confgroup"/>
+      <ref name="contractnum"/>
+      <ref name="contractsponsor"/>
+      <ref name="copyright"/>
+      <ref name="corpauthor"/>
+      <ref name="corpname"/>
+      <ref name="date"/>
+      <ref name="edition"/>
+      <ref name="editor"/>
+      <ref name="invpartnumber"/>
+      <ref name="isbn"/>
+      <ref name="issn"/>
+      <ref name="issuenum"/>
+      <ref name="orgname"/>
+      <ref name="othercredit"/>
+      <ref name="pagenums"/>
+      <ref name="printhistory"/>
+      <ref name="productname"/>
+      <ref name="productnumber"/>
+      <ref name="pubdate"/>
+      <ref name="publisher"/>
+      <ref name="publishername"/>
+      <ref name="pubsnumber"/>
+      <ref name="releaseinfo"/>
+      <ref name="revhistory"/>
+      <ref name="seriesvolnums"/>
+      <ref name="subtitle"/>
+      <ref name="title"/>
+      <ref name="titleabbrev"/>
+      <ref name="volumenum"/>
+      <ref name="citetitle"/>
+      <ref name="person.ident.mix"/>
+      <ref name="ndxterm.class"/>
+      <ref name="local.bibliocomponent.mix"/>
+    </choice>
+  </define>
+  <define name="local.biblioentry.attrib">
+    <empty/>
+  </define>
+  <define name="biblioentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="biblioentry">
+    <element name="biblioentry">
+      <ref name="biblioentry.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="articleinfo.element"/>
-          <choice>
-            <ref name="bibliocomponent.mix"/>
-          </choice>
+          <ref name="articleinfo"/>
+          <ref name="bibliocomponent.mix"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- biblioentry.element -->
-
-<dtd:pe-decl name="biblioentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="biblioentry.attlist">
-<define name="biblioentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="biblioentry.role.attrib"/>
-  <ref name="local.biblioentry.attrib"/>
-</define>
-</div> <!-- biblioentry.attlist -->
-</div> <!-- biblioentry.module -->
-
-<dtd:pe-decl name="bibliomixed.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomixed.module">
-<define name="local.bibliomixed.attrib">
-  <notAllowed/>
-</define>
-<define name="bibliomixed.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bibliomixed.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomixed.element">
-<define name="bibliomixed.element">
-  <element name="bibliomixed">
-    <mixed>
+    </element>
+  </define>
+<!--end of biblioentry.element-->
+  <define name="biblioentry.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="biblioentry.role.attrib"/>
+    <ref name="local.biblioentry.attrib"/>
+  </define>
+<!--end of biblioentry.attlist-->
+<!--end of biblioentry.module-->
+  <define name="local.bibliomixed.attrib">
+    <empty/>
+  </define>
+  <define name="bibliomixed.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliomixed">
+    <element name="bibliomixed">
+      <ref name="bibliomixed.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="bibliocomponent.mix"/>
-          <ref name="bibliomset.element"/>
+          <ref name="bibliomset"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- bibliomixed.element -->
-
-<dtd:pe-decl name="bibliomixed.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomixed.attlist">
-<define name="bibliomixed.attlist">
-  <ref name="common.attrib"/>
-  <ref name="bibliomixed.role.attrib"/>
-  <ref name="local.bibliomixed.attrib"/>
-</define>
-</div> <!-- bibliomixed.attlist -->
-</div> <!-- bibliomixed.module -->
-
-<dtd:pe-decl name="articleinfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="articleinfo.module">
-<define name="local.articleinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="articleinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="articleinfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="articleinfo.element">
-<define name="articleinfo.element">
-  <element name="articleinfo">
-    <group>
+    </element>
+  </define>
+<!--end of bibliomixed.element-->
+  <define name="bibliomixed.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="bibliomixed.role.attrib"/>
+    <ref name="local.bibliomixed.attrib"/>
+  </define>
+<!--end of bibliomixed.attlist-->
+<!--end of bibliomixed.module-->
+  <define name="local.articleinfo.attrib">
+    <empty/>
+  </define>
+  <define name="articleinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="articleinfo">
+    <element name="articleinfo">
+      <ref name="articleinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- articleinfo.element -->
-
-<dtd:pe-decl name="articleinfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="articleinfo.attlist">
-<define name="articleinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="articleinfo.role.attrib"/>
-  <ref name="local.articleinfo.attrib"/>
-</define>
-</div> <!-- articleinfo.attlist -->
-</div> <!-- articleinfo.module -->
-
-<dtd:pe-decl name="biblioset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="biblioset.module">
-<define name="local.biblioset.attrib">
-  <notAllowed/>
-</define>
-<define name="biblioset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="biblioset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="biblioset.element">
-<define name="biblioset.element">
-  <element name="biblioset">
-    <group>
+    </element>
+  </define>
+<!--end of articleinfo.element-->
+  <define name="articleinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="articleinfo.role.attrib"/>
+    <ref name="local.articleinfo.attrib"/>
+  </define>
+<!--end of articleinfo.attlist-->
+<!--end of articleinfo.module-->
+  <define name="local.biblioset.attrib">
+    <empty/>
+  </define>
+  <define name="biblioset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="biblioset">
+    <element name="biblioset">
+      <ref name="biblioset.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
+        <ref name="bibliocomponent.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- biblioset.element -->
-
-<dtd:comment> Relation: Relationship of elements contained within BiblioSet </dtd:comment>
-
-
-<dtd:pe-decl name="biblioset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="biblioset.attlist">
-<define name="biblioset.attlist">
-  <optional>
-    <attribute name="relation"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="biblioset.role.attrib"/>
-  <ref name="local.biblioset.attrib"/>
-</define>
-</div> <!-- biblioset.attlist -->
-</div> <!-- biblioset.module -->
-
-<dtd:pe-decl name="bibliomset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomset.module">
-<define name="bibliomset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-<define name="local.bibliomset.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:pe-decl name="bibliomset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomset.element">
-<define name="bibliomset.element">
-  <element name="bibliomset">
-    <mixed>
+    </element>
+  </define>
+<!--end of biblioset.element-->
+<!-- Relation: Relationship of elements contained within BiblioSet -->
+  <define name="biblioset.attlist" combine="interleave">
+    <optional>
+      <attribute name="relation"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="biblioset.role.attrib"/>
+    <ref name="local.biblioset.attrib"/>
+  </define>
+<!--end of biblioset.attlist-->
+<!--end of biblioset.module-->
+  <define name="bibliomset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="local.bibliomset.attrib">
+    <empty/>
+  </define>
+  <define name="bibliomset">
+    <element name="bibliomset">
+      <ref name="bibliomset.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="bibliocomponent.mix"/>
-          <ref name="bibliomset.element"/>
+          <ref name="bibliomset"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- bibliomset.element -->
-
-<dtd:comment> Relation: Relationship of elements contained within BiblioMSet </dtd:comment>
-
-
-<dtd:pe-decl name="bibliomset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomset.attlist">
-<define name="bibliomset.attlist">
-  <optional>
-    <attribute name="relation"/>
-  </optional>
-  <ref name="bibliomset.role.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="local.bibliomset.attrib"/>
-</define>
-</div> <!-- bibliomset.attlist -->
-</div> <!-- bibliomset.module -->
-
-<dtd:pe-decl name="bibliomisc.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomisc.module">
-<define name="local.bibliomisc.attrib">
-  <notAllowed/>
-</define>
-<define name="bibliomisc.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bibliomisc.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomisc.element">
-<define name="bibliomisc.element">
-  <element name="bibliomisc">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of bibliomset.element-->
+<!-- Relation: Relationship of elements contained within BiblioMSet -->
+  <define name="bibliomset.attlist" combine="interleave">
+    <optional>
+      <attribute name="relation"/>
+    </optional>
+    <ref name="bibliomset.role.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="local.bibliomset.attrib"/>
+  </define>
+<!--end of bibliomset.attlist-->
+<!--end of bibliomset.module-->
+  <define name="local.bibliomisc.attrib">
+    <empty/>
+  </define>
+  <define name="bibliomisc.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bibliomisc">
+    <element name="bibliomisc">
+      <ref name="bibliomisc.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- bibliomisc.element -->
-
-<dtd:pe-decl name="bibliomisc.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bibliomisc.attlist">
-<define name="bibliomisc.attlist">
-  <ref name="common.attrib"/>
-  <ref name="bibliomisc.role.attrib"/>
-  <ref name="local.bibliomisc.attrib"/>
-</define>
-</div> <!-- bibliomisc.attlist -->
-</div> <!-- bibliomisc.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Subject, Keyword, and ITermSet elements .............................. </dtd:comment>
-
-<dtd:pe-decl name="subjectset.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectset.content.module">
-<dtd:pe-decl name="subjectset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectset.module">
-<define name="local.subjectset.attrib">
-  <notAllowed/>
-</define>
-<define name="subjectset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="subjectset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectset.element">
-<define name="subjectset.element">
-  <element name="subjectset">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of bibliomisc.element-->
+  <define name="bibliomisc.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="bibliomisc.role.attrib"/>
+    <ref name="local.bibliomisc.attrib"/>
+  </define>
+<!--end of bibliomisc.attlist-->
+<!--end of bibliomisc.module-->
+<!-- ...................................................................... -->
+<!-- Subject, Keyword, and ITermSet elements .............................. -->
+  <define name="local.subjectset.attrib">
+    <empty/>
+  </define>
+  <define name="subjectset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="subjectset">
+    <element name="subjectset">
+      <ref name="subjectset.attlist"/>
       <oneOrMore>
-        <ref name="subject.element"/>
+        <ref name="subject"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- subjectset.element -->
-
-<dtd:comment> Scheme: Controlled vocabulary employed in SubjectTerms </dtd:comment>
-
-
-<dtd:pe-decl name="subjectset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectset.attlist">
-<define name="subjectset.attlist">
-  <optional>
-    <attribute name="scheme">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="subjectset.role.attrib"/>
-  <ref name="local.subjectset.attrib"/>
-</define>
-</div> <!-- subjectset.attlist -->
-</div> <!-- subjectset.module -->
-
-<dtd:pe-decl name="subject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subject.module">
-<define name="local.subject.attrib">
-  <notAllowed/>
-</define>
-<define name="subject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="subject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subject.element">
-<define name="subject.element">
-  <element name="subject">
-    <group>
+    </element>
+  </define>
+<!--end of subjectset.element-->
+<!-- Scheme: Controlled vocabulary employed in SubjectTerms -->
+  <define name="subjectset.attlist" combine="interleave">
+    <optional>
+      <attribute name="scheme">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="subjectset.role.attrib"/>
+    <ref name="local.subjectset.attrib"/>
+  </define>
+<!--end of subjectset.attlist-->
+<!--end of subjectset.module-->
+  <define name="local.subject.attrib">
+    <empty/>
+  </define>
+  <define name="subject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="subject">
+    <element name="subject">
+      <ref name="subject.attlist"/>
       <oneOrMore>
-        <ref name="subjectterm.element"/>
+        <ref name="subjectterm"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- subject.element -->
-
-<dtd:comment> Weight: Ranking of this group of SubjectTerms relative 
-		to others, 0 is low, no highest value specified </dtd:comment>
-
-
-<dtd:pe-decl name="subject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subject.attlist">
-<define name="subject.attlist">
-  <optional>
-    <attribute name="weight"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="subject.role.attrib"/>
-  <ref name="local.subject.attrib"/>
-</define>
-</div> <!-- subject.attlist -->
-</div> <!-- subject.module -->
-
-<dtd:pe-decl name="subjectterm.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectterm.module">
-<define name="local.subjectterm.attrib">
-  <notAllowed/>
-</define>
-<define name="subjectterm.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="subjectterm.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectterm.element">
-<define name="subjectterm.element">
-  <element name="subjectterm">
-    <text/>
-  </element>
-</define>
-</div> <!-- subjectterm.element -->
-
-<dtd:pe-decl name="subjectterm.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subjectterm.attlist">
-<define name="subjectterm.attlist">
-  <ref name="common.attrib"/>
-  <ref name="subjectterm.role.attrib"/>
-  <ref name="local.subjectterm.attrib"/>
-</define>
-</div> <!-- subjectterm.attlist -->
-</div> <!-- subjectterm.module -->
-</div> <!-- subjectset.content.module -->
-
-<dtd:pe-decl name="keywordset.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keywordset.content.module">
-<dtd:pe-decl name="keywordset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keywordset.module">
-<define name="local.keywordset.attrib">
-  <notAllowed/>
-</define>
-<define name="keywordset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="keywordset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keywordset.element">
-<define name="keywordset.element">
-  <element name="keywordset">
-    <group>
+    </element>
+  </define>
+<!--end of subject.element-->
+<!-- Weight: Ranking of this group of SubjectTerms relative 
+		to others, 0 is low, no highest value specified -->
+  <define name="subject.attlist" combine="interleave">
+    <optional>
+      <attribute name="weight"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="subject.role.attrib"/>
+    <ref name="local.subject.attrib"/>
+  </define>
+<!--end of subject.attlist-->
+<!--end of subject.module-->
+  <define name="local.subjectterm.attrib">
+    <empty/>
+  </define>
+  <define name="subjectterm.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="subjectterm">
+    <element name="subjectterm">
+      <ref name="subjectterm.attlist"/>
+      <text/>
+    </element>
+  </define>
+<!--end of subjectterm.element-->
+  <define name="subjectterm.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="subjectterm.role.attrib"/>
+    <ref name="local.subjectterm.attrib"/>
+  </define>
+<!--end of subjectterm.attlist-->
+<!--end of subjectterm.module-->
+<!--end of subjectset.content.module-->
+  <define name="local.keywordset.attrib">
+    <empty/>
+  </define>
+  <define name="keywordset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="keywordset">
+    <element name="keywordset">
+      <ref name="keywordset.attlist"/>
       <oneOrMore>
-        <ref name="keyword.element"/>
+        <ref name="keyword"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- keywordset.element -->
-
-<dtd:pe-decl name="keywordset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keywordset.attlist">
-<define name="keywordset.attlist">
-  <ref name="common.attrib"/>
-  <ref name="keywordset.role.attrib"/>
-  <ref name="local.keywordset.attrib"/>
-</define>
-</div> <!-- keywordset.attlist -->
-</div> <!-- keywordset.module -->
-
-<dtd:pe-decl name="keyword.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keyword.module">
-<define name="local.keyword.attrib">
-  <notAllowed/>
-</define>
-<define name="keyword.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="keyword.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keyword.element">
-<define name="keyword.element">
-  <element name="keyword">
-    <text/>
-  </element>
-</define>
-</div> <!-- keyword.element -->
-
-<dtd:pe-decl name="keyword.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keyword.attlist">
-<define name="keyword.attlist">
-  <ref name="common.attrib"/>
-  <ref name="keyword.role.attrib"/>
-  <ref name="local.keyword.attrib"/>
-</define>
-</div> <!-- keyword.attlist -->
-</div> <!-- keyword.module -->
-</div> <!-- keywordset.content.module -->
-
-<dtd:pe-decl name="itermset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="itermset.module">
-<define name="local.itermset.attrib">
-  <notAllowed/>
-</define>
-<define name="itermset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="itermset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="itermset.element">
-<define name="itermset.element">
-  <element name="itermset">
-    <group>
-      <oneOrMore>
-        <ref name="indexterm.element"/>
+    </element>
+  </define>
+<!--end of keywordset.element-->
+  <define name="keywordset.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="keywordset.role.attrib"/>
+    <ref name="local.keywordset.attrib"/>
+  </define>
+<!--end of keywordset.attlist-->
+<!--end of keywordset.module-->
+  <define name="local.keyword.attrib">
+    <empty/>
+  </define>
+  <define name="keyword.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="keyword">
+    <element name="keyword">
+      <ref name="keyword.attlist"/>
+      <text/>
+    </element>
+  </define>
+<!--end of keyword.element-->
+  <define name="keyword.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="keyword.role.attrib"/>
+    <ref name="local.keyword.attrib"/>
+  </define>
+<!--end of keyword.attlist-->
+<!--end of keyword.module-->
+<!--end of keywordset.content.module-->
+  <define name="local.itermset.attrib">
+    <empty/>
+  </define>
+  <define name="itermset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="itermset">
+    <element name="itermset">
+      <ref name="itermset.attlist"/>
+      <oneOrMore>
+        <ref name="indexterm"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- itermset.element -->
-
-<dtd:pe-decl name="itermset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="itermset.attlist">
-<define name="itermset.attlist">
-  <ref name="common.attrib"/>
-  <ref name="itermset.role.attrib"/>
-  <ref name="local.itermset.attrib"/>
-</define>
-</div> <!-- itermset.attlist -->
-</div> <!-- itermset.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Compound (section-ish) elements ...................................... </dtd:comment>
-
-<dtd:comment> Message set ...................... </dtd:comment>
-
-<dtd:pe-decl name="msgset.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgset.content.module">
-<dtd:pe-decl name="msgset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgset.module">
-<define name="local.msgset.attrib">
-  <notAllowed/>
-</define>
-<define name="msgset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgset.element">
-<define name="msgset.element">
-  <element name="msgset">
-    <group>
+    </element>
+  </define>
+<!--end of itermset.element-->
+  <define name="itermset.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="itermset.role.attrib"/>
+    <ref name="local.itermset.attrib"/>
+  </define>
+<!--end of itermset.attlist-->
+<!--end of itermset.module-->
+<!-- ...................................................................... -->
+<!-- Compound (section-ish) elements ...................................... -->
+<!-- Message set ...................... -->
+  <define name="local.msgset.attrib">
+    <empty/>
+  </define>
+  <define name="msgset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgset">
+    <element name="msgset">
+      <ref name="msgset.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <choice>
         <oneOrMore>
-          <ref name="msgentry.element"/>
+          <ref name="msgentry"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="simplemsgentry.element"/>
+          <ref name="simplemsgentry"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- msgset.element -->
-
-<dtd:pe-decl name="msgset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgset.attlist">
-<define name="msgset.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgset.role.attrib"/>
-  <ref name="local.msgset.attrib"/>
-</define>
-</div> <!-- msgset.attlist -->
-</div> <!-- msgset.module -->
-
-<dtd:pe-decl name="msgentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgentry.module">
-<define name="local.msgentry.attrib">
-  <notAllowed/>
-</define>
-<define name="msgentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgentry.element">
-<define name="msgentry.element">
-  <element name="msgentry">
-    <group>
+    </element>
+  </define>
+<!--end of msgset.element-->
+  <define name="msgset.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgset.role.attrib"/>
+    <ref name="local.msgset.attrib"/>
+  </define>
+<!--end of msgset.attlist-->
+<!--end of msgset.module-->
+  <define name="local.msgentry.attrib">
+    <empty/>
+  </define>
+  <define name="msgentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgentry">
+    <element name="msgentry">
+      <ref name="msgentry.attlist"/>
       <oneOrMore>
-        <ref name="msg.element"/>
+        <ref name="msg"/>
       </oneOrMore>
       <optional>
-        <ref name="msginfo.element"/>
+        <ref name="msginfo"/>
       </optional>
       <zeroOrMore>
-        <ref name="msgexplan.element"/>
+        <ref name="msgexplan"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- msgentry.element -->
-
-<dtd:pe-decl name="msgentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgentry.attlist">
-<define name="msgentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgentry.role.attrib"/>
-  <ref name="local.msgentry.attrib"/>
-</define>
-</div> <!-- msgentry.attlist -->
-</div> <!-- msgentry.module -->
-
-<dtd:pe-decl name="simplemsgentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplemsgentry.module">
-<define name="local.simplemsgentry.attrib">
-  <notAllowed/>
-</define>
-<define name="simplemsgentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="simplemsgentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplemsgentry.element">
-<define name="simplemsgentry.element">
-  <element name="simplemsgentry">
-    <group>
-      <ref name="msgtext.element"/>
-      <oneOrMore>
-        <ref name="msgexplan.element"/>
-      </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- simplemsgentry.element -->
-
-<dtd:pe-decl name="simplemsgentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplemsgentry.attlist">
-<define name="simplemsgentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="simplemsgentry.role.attrib"/>
-  <ref name="local.simplemsgentry.attrib"/>
-  <optional>
-    <attribute name="audience"/>
-  </optional>
-  <optional>
-    <attribute name="level"/>
-  </optional>
-  <optional>
-    <attribute name="origin"/>
-  </optional>
-</define>
-</div> <!-- simplemsgentry.attlist -->
-</div> <!-- simplemsgentry.module -->
-
-<dtd:pe-decl name="msg.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msg.module">
-<define name="local.msg.attrib">
-  <notAllowed/>
-</define>
-<define name="msg.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msg.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msg.element">
-<define name="msg.element">
-  <element name="msg">
-    <group>
+    </element>
+  </define>
+<!--end of msgentry.element-->
+  <define name="msgentry.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgentry.role.attrib"/>
+    <ref name="local.msgentry.attrib"/>
+  </define>
+<!--end of msgentry.attlist-->
+<!--end of msgentry.module-->
+  <define name="local.simplemsgentry.attrib">
+    <empty/>
+  </define>
+  <define name="simplemsgentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="simplemsgentry">
+    <element name="simplemsgentry">
+      <ref name="simplemsgentry.attlist"/>
+      <ref name="msgtext"/>
+      <ref name="msgexplan"/>
+    </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>
+    <optional>
+      <attribute name="level"/>
+    </optional>
+    <optional>
+      <attribute name="origin"/>
+    </optional>
+  </define>
+<!--end of simplemsgentry.attlist-->
+<!--end of simplemsgentry.module-->
+  <define name="local.msg.attrib">
+    <empty/>
+  </define>
+  <define name="msg.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msg">
+    <element name="msg">
+      <ref name="msg.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
-      <ref name="msgmain.element"/>
+      <ref name="msgmain"/>
       <zeroOrMore>
         <choice>
-          <ref name="msgsub.element"/>
-          <ref name="msgrel.element"/>
+          <ref name="msgsub"/>
+          <ref name="msgrel"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- msg.element -->
-
-<dtd:pe-decl name="msg.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msg.attlist">
-<define name="msg.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msg.role.attrib"/>
-  <ref name="local.msg.attrib"/>
-</define>
-</div> <!-- msg.attlist -->
-</div> <!-- msg.module -->
-
-<dtd:pe-decl name="msgmain.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgmain.module">
-<define name="local.msgmain.attrib">
-  <notAllowed/>
-</define>
-<define name="msgmain.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgmain.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgmain.element">
-<define name="msgmain.element">
-  <element name="msgmain">
-    <group>
+    </element>
+  </define>
+<!--end of msg.element-->
+  <define name="msg.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msg.role.attrib"/>
+    <ref name="local.msg.attrib"/>
+  </define>
+<!--end of msg.attlist-->
+<!--end of msg.module-->
+  <define name="local.msgmain.attrib">
+    <empty/>
+  </define>
+  <define name="msgmain.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgmain">
+    <element name="msgmain">
+      <ref name="msgmain.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
-      <ref name="msgtext.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- msgmain.element -->
-
-<dtd:pe-decl name="msgmain.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgmain.attlist">
-<define name="msgmain.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgmain.role.attrib"/>
-  <ref name="local.msgmain.attrib"/>
-</define>
-</div> <!-- msgmain.attlist -->
-</div> <!-- msgmain.module -->
-
-<dtd:pe-decl name="msgsub.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgsub.module">
-<define name="local.msgsub.attrib">
-  <notAllowed/>
-</define>
-<define name="msgsub.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgsub.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgsub.element">
-<define name="msgsub.element">
-  <element name="msgsub">
-    <group>
+      <ref name="msgtext"/>
+    </element>
+  </define>
+<!--end of msgmain.element-->
+  <define name="msgmain.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgmain.role.attrib"/>
+    <ref name="local.msgmain.attrib"/>
+  </define>
+<!--end of msgmain.attlist-->
+<!--end of msgmain.module-->
+  <define name="local.msgsub.attrib">
+    <empty/>
+  </define>
+  <define name="msgsub.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgsub">
+    <element name="msgsub">
+      <ref name="msgsub.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
-      <ref name="msgtext.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- msgsub.element -->
-
-<dtd:pe-decl name="msgsub.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgsub.attlist">
-<define name="msgsub.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgsub.role.attrib"/>
-  <ref name="local.msgsub.attrib"/>
-</define>
-</div> <!-- msgsub.attlist -->
-</div> <!-- msgsub.module -->
-
-<dtd:pe-decl name="msgrel.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgrel.module">
-<define name="local.msgrel.attrib">
-  <notAllowed/>
-</define>
-<define name="msgrel.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgrel.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgrel.element">
-<define name="msgrel.element">
-  <element name="msgrel">
-    <group>
+      <ref name="msgtext"/>
+    </element>
+  </define>
+<!--end of msgsub.element-->
+  <define name="msgsub.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgsub.role.attrib"/>
+    <ref name="local.msgsub.attrib"/>
+  </define>
+<!--end of msgsub.attlist-->
+<!--end of msgsub.module-->
+  <define name="local.msgrel.attrib">
+    <empty/>
+  </define>
+  <define name="msgrel.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgrel">
+    <element name="msgrel">
+      <ref name="msgrel.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
-      <ref name="msgtext.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- msgrel.element -->
-
-<dtd:pe-decl name="msgrel.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgrel.attlist">
-<define name="msgrel.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgrel.role.attrib"/>
-  <ref name="local.msgrel.attrib"/>
-</define>
-</div> <!-- msgrel.attlist -->
-</div> <!-- msgrel.module -->
-
-<dtd:comment> MsgText (defined in the Inlines section, below)</dtd:comment>
-
-<dtd:pe-decl name="msginfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msginfo.module">
-<define name="local.msginfo.attrib">
-  <notAllowed/>
-</define>
-<define name="msginfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msginfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msginfo.element">
-<define name="msginfo.element">
-  <element name="msginfo">
-    <group>
+      <ref name="msgtext"/>
+    </element>
+  </define>
+<!--end of msgrel.element-->
+  <define name="msgrel.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgrel.role.attrib"/>
+    <ref name="local.msgrel.attrib"/>
+  </define>
+<!--end of msgrel.attlist-->
+<!--end of msgrel.module-->
+<!-- MsgText (defined in the Inlines section, below)-->
+  <define name="local.msginfo.attrib">
+    <empty/>
+  </define>
+  <define name="msginfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msginfo">
+    <element name="msginfo">
+      <ref name="msginfo.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="msglevel.element"/>
-          <ref name="msgorig.element"/>
-          <ref name="msgaud.element"/>
+          <ref name="msglevel"/>
+          <ref name="msgorig"/>
+          <ref name="msgaud"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- msginfo.element -->
-
-<dtd:pe-decl name="msginfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msginfo.attlist">
-<define name="msginfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msginfo.role.attrib"/>
-  <ref name="local.msginfo.attrib"/>
-</define>
-</div> <!-- msginfo.attlist -->
-</div> <!-- msginfo.module -->
-
-<dtd:pe-decl name="msglevel.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msglevel.module">
-<define name="local.msglevel.attrib">
-  <notAllowed/>
-</define>
-<define name="msglevel.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msglevel.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msglevel.element">
-<define name="msglevel.element">
-  <element name="msglevel">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of msginfo.element-->
+  <define name="msginfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msginfo.role.attrib"/>
+    <ref name="local.msginfo.attrib"/>
+  </define>
+<!--end of msginfo.attlist-->
+<!--end of msginfo.module-->
+  <define name="local.msglevel.attrib">
+    <empty/>
+  </define>
+  <define name="msglevel.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msglevel">
+    <element name="msglevel">
+      <ref name="msglevel.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- msglevel.element -->
-
-<dtd:pe-decl name="msglevel.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msglevel.attlist">
-<define name="msglevel.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msglevel.role.attrib"/>
-  <ref name="local.msglevel.attrib"/>
-</define>
-</div> <!-- msglevel.attlist -->
-</div> <!-- msglevel.module -->
-
-<dtd:pe-decl name="msgorig.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgorig.module">
-<define name="local.msgorig.attrib">
-  <notAllowed/>
-</define>
-<define name="msgorig.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgorig.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgorig.element">
-<define name="msgorig.element">
-  <element name="msgorig">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of msglevel.element-->
+  <define name="msglevel.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msglevel.role.attrib"/>
+    <ref name="local.msglevel.attrib"/>
+  </define>
+<!--end of msglevel.attlist-->
+<!--end of msglevel.module-->
+  <define name="local.msgorig.attrib">
+    <empty/>
+  </define>
+  <define name="msgorig.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgorig">
+    <element name="msgorig">
+      <ref name="msgorig.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- msgorig.element -->
-
-<dtd:pe-decl name="msgorig.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgorig.attlist">
-<define name="msgorig.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgorig.role.attrib"/>
-  <ref name="local.msgorig.attrib"/>
-</define>
-</div> <!-- msgorig.attlist -->
-</div> <!-- msgorig.module -->
-
-<dtd:pe-decl name="msgaud.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgaud.module">
-<define name="local.msgaud.attrib">
-  <notAllowed/>
-</define>
-<define name="msgaud.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgaud.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgaud.element">
-<define name="msgaud.element">
-  <element name="msgaud">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of msgorig.element-->
+  <define name="msgorig.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgorig.role.attrib"/>
+    <ref name="local.msgorig.attrib"/>
+  </define>
+<!--end of msgorig.attlist-->
+<!--end of msgorig.module-->
+  <define name="local.msgaud.attrib">
+    <empty/>
+  </define>
+  <define name="msgaud.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgaud">
+    <element name="msgaud">
+      <ref name="msgaud.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- msgaud.element -->
-
-<dtd:pe-decl name="msgaud.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgaud.attlist">
-<define name="msgaud.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgaud.role.attrib"/>
-  <ref name="local.msgaud.attrib"/>
-</define>
-</div> <!-- msgaud.attlist -->
-</div> <!-- msgaud.module -->
-
-<dtd:pe-decl name="msgexplan.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgexplan.module">
-<define name="local.msgexplan.attrib">
-  <notAllowed/>
-</define>
-<define name="msgexplan.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgexplan.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgexplan.element">
-<define name="msgexplan.element">
-  <element name="msgexplan">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of msgaud.element-->
+  <define name="msgaud.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgaud.role.attrib"/>
+    <ref name="local.msgaud.attrib"/>
+  </define>
+<!--end of msgaud.attlist-->
+<!--end of msgaud.module-->
+  <define name="local.msgexplan.attrib">
+    <empty/>
+  </define>
+  <define name="msgexplan.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgexplan">
+    <element name="msgexplan">
+      <ref name="msgexplan.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- msgexplan.element -->
-
-<dtd:pe-decl name="msgexplan.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgexplan.attlist">
-<define name="msgexplan.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgexplan.role.attrib"/>
-  <ref name="local.msgexplan.attrib"/>
-</define>
-</div> <!-- msgexplan.attlist -->
-</div> <!-- msgexplan.module -->
-</div> <!-- msgset.content.module -->
-
-<dtd:comment> QandASet ........................ </dtd:comment>
-<dtd:pe-decl name="qandset.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandset.content.module">
-<dtd:pe-decl name="qandset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandset.module">
-<define name="local.qandset.attrib">
-  <notAllowed/>
-</define>
-<define name="qandset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="qandset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandset.element">
-<define name="qandaset.element">
-  <element name="qandaset">
-    <group>
+    </element>
+  </define>
+<!--end of msgexplan.element-->
+  <define name="msgexplan.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgexplan.role.attrib"/>
+    <ref name="local.msgexplan.attrib"/>
+  </define>
+<!--end of msgexplan.attlist-->
+<!--end of msgexplan.module-->
+<!--end of msgset.content.module-->
+<!-- QandASet ........................ -->
+  <define name="local.qandset.attrib">
+    <empty/>
+  </define>
+  <define name="qandset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="qandaset">
+    <element name="qandaset">
+      <ref name="qandaset.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="qandaset.mix"/>
-        </choice>
+        <ref name="qandaset.mix"/>
       </zeroOrMore>
       <choice>
         <oneOrMore>
-          <ref name="qandadiv.element"/>
+          <ref name="qandadiv"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="qandaentry.element"/>
+          <ref name="qandaentry"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- qandset.element -->
-
-<dtd:pe-decl name="qandset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandset.attlist">
-<define name="qandaset.attlist">
-  <optional>
-    <attribute name="defaultlabel">
-      <choice>
-        <value>qanda</value>
-        <value>number</value>
-        <value>none</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="qandset.role.attrib"/>
-  <ref name="local.qandset.attrib"/>
-</define>
-</div> <!-- qandset.attlist -->
-</div> <!-- qandset.module -->
-
-<dtd:pe-decl name="qandadiv.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandadiv.module">
-<define name="local.qandadiv.attrib">
-  <notAllowed/>
-</define>
-<define name="qandadiv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="qandadiv.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandadiv.element">
-<define name="qandadiv.element">
-  <element name="qandadiv">
-    <group>
+    </element>
+  </define>
+<!--end of qandset.element-->
+  <define name="qandaset.attlist" combine="interleave">
+    <optional>
+      <attribute name="defaultlabel">
+        <choice>
+          <value>qanda</value>
+          <value>number</value>
+          <value>none</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="qandset.role.attrib"/>
+    <ref name="local.qandset.attrib"/>
+  </define>
+<!--end of qandset.attlist-->
+<!--end of qandset.module-->
+  <define name="local.qandadiv.attrib">
+    <empty/>
+  </define>
+  <define name="qandadiv.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="qandadiv">
+    <element name="qandadiv">
+      <ref name="qandadiv.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="qandaset.mix"/>
-        </choice>
+        <ref name="qandaset.mix"/>
       </zeroOrMore>
       <choice>
         <oneOrMore>
-          <ref name="qandadiv.element"/>
+          <ref name="qandadiv"/>
         </oneOrMore>
         <oneOrMore>
-          <ref name="qandaentry.element"/>
+          <ref name="qandaentry"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- qandadiv.element -->
-
-<dtd:pe-decl name="qandadiv.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandadiv.attlist">
-<define name="qandadiv.attlist">
-  <ref name="common.attrib"/>
-  <ref name="qandadiv.role.attrib"/>
-  <ref name="local.qandadiv.attrib"/>
-</define>
-</div> <!-- qandadiv.attlist -->
-</div> <!-- qandadiv.module -->
-
-<dtd:pe-decl name="qandaentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandaentry.module">
-<define name="local.qandaentry.attrib">
-  <notAllowed/>
-</define>
-<define name="qandaentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="qandaentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandaentry.element">
-<define name="qandaentry.element">
-  <element name="qandaentry">
-    <group>
+    </element>
+  </define>
+<!--end of qandadiv.element-->
+  <define name="qandadiv.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="qandadiv.role.attrib"/>
+    <ref name="local.qandadiv.attrib"/>
+  </define>
+<!--end of qandadiv.attlist-->
+<!--end of qandadiv.module-->
+  <define name="local.qandaentry.attrib">
+    <empty/>
+  </define>
+  <define name="qandaentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="qandaentry">
+    <element name="qandaentry">
+      <ref name="qandaentry.attlist"/>
       <optional>
-        <ref name="revhistory.element"/>
+        <ref name="revhistory"/>
       </optional>
-      <ref name="question.element"/>
+      <ref name="question"/>
       <zeroOrMore>
-        <ref name="answer.element"/>
+        <ref name="answer"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- qandaentry.element -->
-
-<dtd:pe-decl name="qandaentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="qandaentry.attlist">
-<define name="qandaentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="qandaentry.role.attrib"/>
-  <ref name="local.qandaentry.attrib"/>
-</define>
-</div> <!-- qandaentry.attlist -->
-</div> <!-- qandaentry.module -->
-
-<dtd:pe-decl name="question.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="question.module">
-<define name="local.question.attrib">
-  <notAllowed/>
-</define>
-<define name="question.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="question.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="question.element">
-<define name="question.element">
-  <element name="question">
-    <group>
+    </element>
+  </define>
+<!--end of qandaentry.element-->
+  <define name="qandaentry.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="qandaentry.role.attrib"/>
+    <ref name="local.qandaentry.attrib"/>
+  </define>
+<!--end of qandaentry.attlist-->
+<!--end of qandaentry.module-->
+  <define name="local.question.attrib">
+    <empty/>
+  </define>
+  <define name="question.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="question">
+    <element name="question">
+      <ref name="question.attlist"/>
       <optional>
-        <ref name="label.element"/>
+        <ref name="label"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="qandaset.mix"/>
-        </choice>
+        <ref name="qandaset.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- question.element -->
-
-<dtd:pe-decl name="question.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="question.attlist">
-<define name="question.attlist">
-  <ref name="common.attrib"/>
-  <ref name="question.role.attrib"/>
-  <ref name="local.question.attrib"/>
-</define>
-</div> <!-- question.attlist -->
-</div> <!-- question.module -->
-
-<dtd:pe-decl name="answer.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="answer.module">
-<define name="local.answer.attrib">
-  <notAllowed/>
-</define>
-<define name="answer.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="answer.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="answer.element">
-<define name="answer.element">
-  <element name="answer">
-    <group>
+    </element>
+  </define>
+<!--end of question.element-->
+  <define name="question.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="question.role.attrib"/>
+    <ref name="local.question.attrib"/>
+  </define>
+<!--end of question.attlist-->
+<!--end of question.module-->
+  <define name="local.answer.attrib">
+    <empty/>
+  </define>
+  <define name="answer.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="answer">
+    <element name="answer">
+      <ref name="answer.attlist"/>
       <optional>
-        <ref name="label.element"/>
+        <ref name="label"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="qandaset.mix"/>
-        </choice>
+        <ref name="qandaset.mix"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="qandaentry.element"/>
+        <ref name="qandaentry"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- answer.element -->
-
-<dtd:pe-decl name="answer.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="answer.attlist">
-<define name="answer.attlist">
-  <ref name="common.attrib"/>
-  <ref name="answer.role.attrib"/>
-  <ref name="local.answer.attrib"/>
-</define>
-</div> <!-- answer.attlist -->
-</div> <!-- answer.module -->
-
-<dtd:pe-decl name="label.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="label.module">
-<define name="local.label.attrib">
-  <notAllowed/>
-</define>
-<define name="label.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="label.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="label.element">
-<define name="label.element">
-  <element name="label">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of answer.element-->
+  <define name="answer.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="answer.role.attrib"/>
+    <ref name="local.answer.attrib"/>
+  </define>
+<!--end of answer.attlist-->
+<!--end of answer.module-->
+  <define name="local.label.attrib">
+    <empty/>
+  </define>
+  <define name="label.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="label">
+    <element name="label">
+      <ref name="label.attlist"/>
+      <zeroOrMore>
         <ref name="word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- label.element -->
-
-<dtd:pe-decl name="label.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="label.attlist">
-<define name="label.attlist">
-  <ref name="common.attrib"/>
-  <ref name="label.role.attrib"/>
-  <ref name="local.label.attrib"/>
-</define>
-</div> <!-- label.attlist -->
-</div> <!-- label.module -->
-</div> <!-- qandset.content.module -->
-
-<dtd:comment> Procedure ........................ </dtd:comment>
-
-<dtd:pe-decl name="procedure.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="procedure.content.module">
-<dtd:pe-decl name="procedure.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="procedure.module">
-<define name="local.procedure.attrib">
-  <notAllowed/>
-</define>
-<define name="procedure.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="procedure.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="procedure.element">
-<define name="procedure.element">
-  <element name="procedure">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of label.element-->
+  <define name="label.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="label.role.attrib"/>
+    <ref name="local.label.attrib"/>
+  </define>
+<!--end of label.attlist-->
+<!--end of label.module-->
+<!--end of qandset.content.module-->
+<!-- Procedure ........................ -->
+  <define name="local.procedure.attrib">
+    <empty/>
+  </define>
+  <define name="procedure.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="procedure">
+    <element name="procedure">
+      <ref name="procedure.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </zeroOrMore>
       <oneOrMore>
-        <ref name="step.element"/>
+        <ref name="step"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- procedure.element -->
-
-<dtd:pe-decl name="procedure.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="procedure.attlist">
-<define name="procedure.attlist">
-  <ref name="common.attrib"/>
-  <ref name="procedure.role.attrib"/>
-  <ref name="local.procedure.attrib"/>
-</define>
-</div> <!-- procedure.attlist -->
-</div> <!-- procedure.module -->
-
-<dtd:pe-decl name="step.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="step.module">
-<define name="local.step.attrib">
-  <notAllowed/>
-</define>
-<define name="step.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="step.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="step.element">
-<define name="step.element">
-  <element name="step">
-    <group>
+    </element>
+  </define>
+<!--end of procedure.element-->
+  <define name="procedure.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="procedure.role.attrib"/>
+    <ref name="local.procedure.attrib"/>
+  </define>
+<!--end of procedure.attlist-->
+<!--end of procedure.module-->
+  <define name="local.step.attrib">
+    <empty/>
+  </define>
+  <define name="step.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="step">
+    <element name="step">
+      <ref name="step.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <choice>
         <group>
           <oneOrMore>
-            <choice>
-              <ref name="component.mix"/>
-            </choice>
+            <ref name="component.mix"/>
           </oneOrMore>
           <optional>
-            <group>
-              <ref name="substeps.element"/>
-              <zeroOrMore>
-                <choice>
-                  <ref name="component.mix"/>
-                </choice>
-              </zeroOrMore>
-            </group>
+            <ref name="substeps"/>
+            <zeroOrMore>
+              <ref name="component.mix"/>
+            </zeroOrMore>
           </optional>
         </group>
         <group>
-          <ref name="substeps.element"/>
+          <ref name="substeps"/>
           <zeroOrMore>
-            <choice>
-              <ref name="component.mix"/>
-            </choice>
+            <ref name="component.mix"/>
           </zeroOrMore>
         </group>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- step.element -->
-
-<dtd:comment> Performance: Whether the Step must be performed </dtd:comment>
-<dtd:comment> not #REQUIRED! </dtd:comment>
-
-
-<dtd:pe-decl name="step.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="step.attlist">
-<define name="step.attlist">
-  <optional>
-    <attribute name="performance" dtd:default="required">
-      <choice>
-        <value>optional</value>
-        <value>required</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="step.role.attrib"/>
-  <ref name="local.step.attrib"/>
-</define>
-</div> <!-- step.attlist -->
-</div> <!-- step.module -->
-
-<dtd:pe-decl name="substeps.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="substeps.module">
-<define name="local.substeps.attrib">
-  <notAllowed/>
-</define>
-<define name="substeps.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="substeps.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="substeps.element">
-<define name="substeps.element">
-  <element name="substeps">
-    <group>
+    </element>
+  </define>
+<!--end of step.element-->
+<!-- Performance: Whether the Step must be performed -->
+<!-- not #REQUIRED! -->
+  <define name="step.attlist" combine="interleave">
+    <optional>
+      <attribute name="performance" a:defaultValue="required">
+        <choice>
+          <value>optional</value>
+          <value>required</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="step.role.attrib"/>
+    <ref name="local.step.attrib"/>
+  </define>
+<!--end of step.attlist-->
+<!--end of step.module-->
+  <define name="local.substeps.attrib">
+    <empty/>
+  </define>
+  <define name="substeps.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="substeps">
+    <element name="substeps">
+      <ref name="substeps.attlist"/>
       <oneOrMore>
-        <ref name="step.element"/>
+        <ref name="step"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- substeps.element -->
-
-<dtd:comment> Performance: whether entire set of substeps must be performed </dtd:comment>
-<dtd:comment> not #REQUIRED! </dtd:comment>
-
-
-<dtd:pe-decl name="substeps.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="substeps.attlist">
-<define name="substeps.attlist">
-  <optional>
-    <attribute name="performance" dtd:default="required">
-      <choice>
-        <value>optional</value>
-        <value>required</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="substeps.role.attrib"/>
-  <ref name="local.substeps.attrib"/>
-</define>
-</div> <!-- substeps.attlist -->
-</div> <!-- substeps.module -->
-</div> <!-- procedure.content.module -->
-
-<dtd:comment> Sidebar .......................... </dtd:comment>
-
-<dtd:pe-decl name="sidebar.content.model">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebar.content.model">
-
-<dtd:pe-decl name="sidebarinfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebarinfo.module">
-<define name="local.sidebarinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="sidebarinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sidebarinfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebarinfo.element">
-<define name="sidebarinfo.element">
-  <element name="sidebarinfo">
-    <group>
+    </element>
+  </define>
+<!--end of substeps.element-->
+<!-- Performance: whether entire set of substeps must be performed -->
+<!-- not #REQUIRED! -->
+  <define name="substeps.attlist" combine="interleave">
+    <optional>
+      <attribute name="performance" a:defaultValue="required">
+        <choice>
+          <value>optional</value>
+          <value>required</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="substeps.role.attrib"/>
+    <ref name="local.substeps.attrib"/>
+  </define>
+<!--end of substeps.attlist-->
+<!--end of substeps.module-->
+<!--end of procedure.content.module-->
+<!-- Sidebar .......................... -->
+  <define name="local.sidebarinfo.attrib">
+    <empty/>
+  </define>
+  <define name="sidebarinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sidebarinfo">
+    <element name="sidebarinfo">
+      <ref name="sidebarinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- sidebarinfo.element -->
-
-<dtd:pe-decl name="sidebarinfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebarinfo.attlist">
-<define name="sidebarinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sidebarinfo.role.attrib"/>
-  <ref name="local.sidebarinfo.attrib"/>
-</define>
-</div> <!-- sidebarinfo.attlist -->
-</div> <!-- sidebarinfo.module -->
-
-<dtd:pe-decl name="sidebar.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebar.module">
-<define name="local.sidebar.attrib">
-  <notAllowed/>
-</define>
-<define name="sidebar.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sidebar.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebar.element">
-<define name="sidebar.element">
-  <element name="sidebar">
-    <group>
+    </element>
+  </define>
+<!--end of sidebarinfo.element-->
+  <define name="sidebarinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sidebarinfo.role.attrib"/>
+    <ref name="local.sidebarinfo.attrib"/>
+  </define>
+<!--end of sidebarinfo.attlist-->
+<!--end of sidebarinfo.module-->
+  <define name="local.sidebar.attrib">
+    <empty/>
+  </define>
+  <define name="sidebar.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sidebar">
+    <element name="sidebar">
+      <ref name="sidebar.attlist"/>
       <optional>
-        <ref name="sidebarinfo.element"/>
+        <ref name="sidebarinfo"/>
       </optional>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="sidebar.mix"/>
-        </choice>
+        <ref name="sidebar.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- sidebar.element -->
-
-<dtd:pe-decl name="sidebar.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sidebar.attlist">
-<define name="sidebar.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sidebar.role.attrib"/>
-  <ref name="local.sidebar.attrib"/>
-</define>
-</div> <!-- sidebar.attlist -->
-</div> <!-- sidebar.module -->
-</div> <!-- sidebar.content.model -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Paragraph-related elements ........................................... </dtd:comment>
-
-<dtd:pe-decl name="abstract.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="abstract.module">
-<define name="local.abstract.attrib">
-  <notAllowed/>
-</define>
-<define name="abstract.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="abstract.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="abstract.element">
-<define name="abstract.element">
-  <element name="abstract">
-    <group>
+    </element>
+  </define>
+<!--end of sidebar.element-->
+  <define name="sidebar.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sidebar.role.attrib"/>
+    <ref name="local.sidebar.attrib"/>
+  </define>
+<!--end of sidebar.attlist-->
+<!--end of sidebar.module-->
+<!--end of sidebar.content.model-->
+<!-- ...................................................................... -->
+<!-- Paragraph-related elements ........................................... -->
+  <define name="local.abstract.attrib">
+    <empty/>
+  </define>
+  <define name="abstract.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="abstract">
+    <element name="abstract">
+      <ref name="abstract.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="para.class"/>
-        </choice>
+        <ref name="para.class"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- abstract.element -->
-
-<dtd:pe-decl name="abstract.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="abstract.attlist">
-<define name="abstract.attlist">
-  <ref name="common.attrib"/>
-  <ref name="abstract.role.attrib"/>
-  <ref name="local.abstract.attrib"/>
-</define>
-</div> <!-- abstract.attlist -->
-</div> <!-- abstract.module -->
-
-<dtd:pe-decl name="authorblurb.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorblurb.module">
-<define name="local.authorblurb.attrib">
-  <notAllowed/>
-</define>
-<define name="authorblurb.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="authorblurb.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorblurb.element">
-<define name="authorblurb.element">
-  <element name="authorblurb">
-    <group>
+    </element>
+  </define>
+<!--end of abstract.element-->
+  <define name="abstract.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="abstract.role.attrib"/>
+    <ref name="local.abstract.attrib"/>
+  </define>
+<!--end of abstract.attlist-->
+<!--end of abstract.module-->
+  <define name="local.authorblurb.attrib">
+    <empty/>
+  </define>
+  <define name="authorblurb.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="authorblurb">
+    <element name="authorblurb">
+      <ref name="authorblurb.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="para.class"/>
-        </choice>
+        <ref name="para.class"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- authorblurb.element -->
-
-<dtd:pe-decl name="authorblurb.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorblurb.attlist">
-<define name="authorblurb.attlist">
-  <ref name="common.attrib"/>
-  <ref name="authorblurb.role.attrib"/>
-  <ref name="local.authorblurb.attrib"/>
-</define>
-</div> <!-- authorblurb.attlist -->
-</div> <!-- authorblurb.module -->
-
-<dtd:pe-decl name="blockquote.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="blockquote.module">
-
-<define name="local.blockquote.attrib">
-  <notAllowed/>
-</define>
-<define name="blockquote.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="blockquote.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="blockquote.element">
-<define name="blockquote.element">
-  <element name="blockquote">
-    <group>
+    </element>
+  </define>
+<!--end of authorblurb.element-->
+  <define name="authorblurb.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="authorblurb.role.attrib"/>
+    <ref name="local.authorblurb.attrib"/>
+  </define>
+<!--end of authorblurb.attlist-->
+<!--end of authorblurb.module-->
+  <define name="local.blockquote.attrib">
+    <empty/>
+  </define>
+  <define name="blockquote.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="blockquote">
+    <element name="blockquote">
+      <ref name="blockquote.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <optional>
-        <ref name="attribution.element"/>
+        <ref name="attribution"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- blockquote.element -->
-
-<dtd:pe-decl name="blockquote.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="blockquote.attlist">
-<define name="blockquote.attlist">
-  <ref name="common.attrib"/>
-  <ref name="blockquote.role.attrib"/>
-  <ref name="local.blockquote.attrib"/>
-</define>
-</div> <!-- blockquote.attlist -->
-</div> <!-- blockquote.module -->
-
-<dtd:pe-decl name="attribution.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="attribution.module">
-<define name="local.attribution.attrib">
-  <notAllowed/>
-</define>
-<define name="attribution.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="attribution.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="attribution.element">
-<define name="attribution.element">
-  <element name="attribution">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of blockquote.element-->
+  <define name="blockquote.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="blockquote.role.attrib"/>
+    <ref name="local.blockquote.attrib"/>
+  </define>
+<!--end of blockquote.attlist-->
+<!--end of blockquote.module-->
+  <define name="local.attribution.attrib">
+    <empty/>
+  </define>
+  <define name="attribution.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="attribution">
+    <element name="attribution">
+      <ref name="attribution.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- attribution.element -->
-
-<dtd:pe-decl name="attribution.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="attribution.attlist">
-<define name="attribution.attlist">
-  <ref name="common.attrib"/>
-  <ref name="attribution.role.attrib"/>
-  <ref name="local.attribution.attrib"/>
-</define>
-</div> <!-- attribution.attlist -->
-</div> <!-- attribution.module -->
-
-<dtd:pe-decl name="bridgehead.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bridgehead.module">
-<define name="local.bridgehead.attrib">
-  <notAllowed/>
-</define>
-<define name="bridgehead.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="bridgehead.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bridgehead.element">
-<define name="bridgehead.element">
-  <element name="bridgehead">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of attribution.element-->
+  <define name="attribution.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="attribution.role.attrib"/>
+    <ref name="local.attribution.attrib"/>
+  </define>
+<!--end of attribution.attlist-->
+<!--end of attribution.module-->
+  <define name="local.bridgehead.attrib">
+    <empty/>
+  </define>
+  <define name="bridgehead.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="bridgehead">
+    <element name="bridgehead">
+      <ref name="bridgehead.attlist"/>
+      <zeroOrMore>
         <ref name="title.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- bridgehead.element -->
-
-<dtd:comment> Renderas: Indicates the format in which the BridgeHead
-		should appear </dtd:comment>
-
-
-<dtd:pe-decl name="bridgehead.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="bridgehead.attlist">
-<define name="bridgehead.attlist">
-  <optional>
-    <attribute name="renderas">
-      <choice>
-        <value>other</value>
-        <value>sect1</value>
-        <value>sect2</value>
-        <value>sect3</value>
-        <value>sect4</value>
-        <value>sect5</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="bridgehead.role.attrib"/>
-  <ref name="local.bridgehead.attrib"/>
-</define>
-</div> <!-- bridgehead.attlist -->
-</div> <!-- bridgehead.module -->
-
-<dtd:pe-decl name="remark.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="remark.module">
-<define name="local.remark.attrib">
-  <notAllowed/>
-</define>
-<define name="remark.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="remark.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="remark.element">
-<define name="remark.element">
-  <element name="remark">
-    <zeroOrMore>
-      <choice>
-        <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- remark.element -->
-
-<dtd:pe-decl name="remark.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="remark.attlist">
-<define name="remark.attlist">
-  <ref name="common.attrib"/>
-  <ref name="remark.role.attrib"/>
-  <ref name="local.remark.attrib"/>
-</define>
-</div> <!-- remark.attlist -->
-</div> <!-- remark.module -->
-
-<dtd:pe-decl name="epigraph.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="epigraph.module">
-<define name="local.epigraph.attrib">
-  <notAllowed/>
-</define>
-<define name="epigraph.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="epigraph.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="epigraph.element">
-<define name="epigraph.element">
-  <element name="epigraph">
-    <group>
-      <optional>
-        <ref name="attribution.element"/>
-      </optional>
-      <oneOrMore>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of bridgehead.element-->
+<!-- Renderas: Indicates the format in which the BridgeHead
+		should appear -->
+  <define name="bridgehead.attlist" combine="interleave">
+    <optional>
+      <attribute name="renderas">
         <choice>
-          <ref name="para.class"/>
+          <value>other</value>
+          <value>sect1</value>
+          <value>sect2</value>
+          <value>sect3</value>
+          <value>sect4</value>
+          <value>sect5</value>
         </choice>
-      </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- epigraph.element -->
-
-<dtd:pe-decl name="epigraph.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="epigraph.attlist">
-<define name="epigraph.attlist">
-  <ref name="common.attrib"/>
-  <ref name="epigraph.role.attrib"/>
-  <ref name="local.epigraph.attrib"/>
-</define>
-</div> <!-- epigraph.attlist -->
-<dtd:comment> Attribution (defined above)</dtd:comment>
-</div> <!-- epigraph.module -->
-
-<dtd:pe-decl name="footnote.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="footnote.module">
-<define name="local.footnote.attrib">
-  <notAllowed/>
-</define>
-<define name="footnote.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="footnote.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="footnote.element">
-<define name="footnote.element">
-  <element name="footnote">
-    <group>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="bridgehead.role.attrib"/>
+    <ref name="local.bridgehead.attrib"/>
+  </define>
+<!--end of bridgehead.attlist-->
+<!--end of bridgehead.module-->
+  <define name="local.remark.attrib">
+    <empty/>
+  </define>
+  <define name="remark.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="remark">
+    <element name="remark">
+      <ref name="remark.attlist"/>
+      <zeroOrMore>
+        <ref name="para.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of remark.element-->
+  <define name="remark.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="remark.role.attrib"/>
+    <ref name="local.remark.attrib"/>
+  </define>
+<!--end of remark.attlist-->
+<!--end of remark.module-->
+  <define name="local.epigraph.attrib">
+    <empty/>
+  </define>
+  <define name="epigraph.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="epigraph">
+    <element name="epigraph">
+      <ref name="epigraph.attlist"/>
+      <optional>
+        <ref name="attribution"/>
+      </optional>
       <oneOrMore>
-        <choice>
-          <ref name="footnote.mix"/>
-        </choice>
+        <ref name="para.class"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- footnote.element -->
-
-<dtd:pe-decl name="footnote.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="footnote.attlist">
-<define name="footnote.attlist">
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="footnote.role.attrib"/>
-  <ref name="local.footnote.attrib"/>
-</define>
-</div> <!-- footnote.attlist -->
-</div> <!-- footnote.module -->
-
-<dtd:pe-decl name="highlights.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="highlights.module">
-<define name="local.highlights.attrib">
-  <notAllowed/>
-</define>
-<define name="highlights.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="highlights.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="highlights.element">
-<define name="highlights.element">
-  <element name="highlights">
-    <group>
+    </element>
+  </define>
+<!--end of epigraph.element-->
+  <define name="epigraph.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="epigraph.role.attrib"/>
+    <ref name="local.epigraph.attrib"/>
+  </define>
+<!--end of epigraph.attlist-->
+<!-- Attribution (defined above)-->
+<!--end of epigraph.module-->
+  <define name="local.footnote.attrib">
+    <empty/>
+  </define>
+  <define name="footnote.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="footnote">
+    <element name="footnote">
+      <ref name="footnote.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="highlights.mix"/>
-        </choice>
+        <ref name="footnote.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- highlights.element -->
-
-<dtd:pe-decl name="highlights.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="highlights.attlist">
-<define name="highlights.attlist">
-  <ref name="common.attrib"/>
-  <ref name="highlights.role.attrib"/>
-  <ref name="local.highlights.attrib"/>
-</define>
-</div> <!-- highlights.attlist -->
-</div> <!-- highlights.module -->
-
-<dtd:pe-decl name="formalpara.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="formalpara.module">
-<define name="local.formalpara.attrib">
-  <notAllowed/>
-</define>
-<define name="formalpara.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="formalpara.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="formalpara.element">
-<define name="formalpara.element">
-  <element name="formalpara">
-    <group>
-      <ref name="title.element"/>
+    </element>
+  </define>
+<!--end of footnote.element-->
+  <define name="footnote.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="footnote.role.attrib"/>
+    <ref name="local.footnote.attrib"/>
+  </define>
+<!--end of footnote.attlist-->
+<!--end of footnote.module-->
+  <define name="local.highlights.attrib">
+    <empty/>
+  </define>
+  <define name="highlights.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="highlights">
+    <element name="highlights">
+      <ref name="highlights.attlist"/>
+      <oneOrMore>
+        <ref name="highlights.mix"/>
+      </oneOrMore>
+    </element>
+  </define>
+<!--end of highlights.element-->
+  <define name="highlights.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="highlights.role.attrib"/>
+    <ref name="local.highlights.attrib"/>
+  </define>
+<!--end of highlights.attlist-->
+<!--end of highlights.module-->
+  <define name="local.formalpara.attrib">
+    <empty/>
+  </define>
+  <define name="formalpara.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="formalpara">
+    <element name="formalpara">
+      <ref name="formalpara.attlist"/>
+      <ref name="title"/>
+      <zeroOrMore>
+        <ref name="ndxterm.class"/>
+      </zeroOrMore>
+      <ref name="para"/>
+    </element>
+  </define>
+<!--end of formalpara.element-->
+  <define name="formalpara.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="formalpara.role.attrib"/>
+    <ref name="local.formalpara.attrib"/>
+  </define>
+<!--end of formalpara.attlist-->
+<!--end of formalpara.module-->
+  <define name="local.para.attrib">
+    <empty/>
+  </define>
+  <define name="para.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="para">
+    <element name="para">
+      <ref name="para.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="ndxterm.class"/>
+          <ref name="para.char.mix"/>
+          <ref name="para.mix"/>
         </choice>
       </zeroOrMore>
-      <ref name="para.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- formalpara.element -->
-
-<dtd:pe-decl name="formalpara.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="formalpara.attlist">
-<define name="formalpara.attlist">
-  <ref name="common.attrib"/>
-  <ref name="formalpara.role.attrib"/>
-  <ref name="local.formalpara.attrib"/>
-</define>
-</div> <!-- formalpara.attlist -->
-</div> <!-- formalpara.module -->
-
-<dtd:pe-decl name="para.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="para.module">
-<define name="local.para.attrib">
-  <notAllowed/>
-</define>
-<define name="para.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="para.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="para.element">
-<define name="para.element">
-  <element name="para">
-    <zeroOrMore>
-      <choice>
-        <ref name="para.char.mix"/>
-        <ref name="para.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- para.element -->
-
-<dtd:pe-decl name="para.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="para.attlist">
-<define name="para.attlist">
-  <ref name="common.attrib"/>
-  <ref name="para.role.attrib"/>
-  <ref name="local.para.attrib"/>
-</define>
-</div> <!-- para.attlist -->
-</div> <!-- para.module -->
-
-<dtd:pe-decl name="simpara.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simpara.module">
-<define name="local.simpara.attrib">
-  <notAllowed/>
-</define>
-<define name="simpara.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="simpara.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simpara.element">
-<define name="simpara.element">
-  <element name="simpara">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of para.element-->
+  <define name="para.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="para.role.attrib"/>
+    <ref name="local.para.attrib"/>
+  </define>
+<!--end of para.attlist-->
+<!--end of para.module-->
+  <define name="local.simpara.attrib">
+    <empty/>
+  </define>
+  <define name="simpara.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="simpara">
+    <element name="simpara">
+      <ref name="simpara.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- simpara.element -->
-
-<dtd:pe-decl name="simpara.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simpara.attlist">
-<define name="simpara.attlist">
-  <ref name="common.attrib"/>
-  <ref name="simpara.role.attrib"/>
-  <ref name="local.simpara.attrib"/>
-</define>
-</div> <!-- simpara.attlist -->
-</div> <!-- simpara.module -->
-
-<dtd:pe-decl name="admon.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="admon.module">
-<define name="local.admon.attrib">
-  <notAllowed/>
-</define>
-<define name="admon.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-
-<dtd:pe-decl name="caution.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="caution.element">
-<define name="caution.element">
-  <element name="caution">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of simpara.element-->
+  <define name="simpara.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="simpara.role.attrib"/>
+    <ref name="local.simpara.attrib"/>
+  </define>
+<!--end of simpara.attlist-->
+<!--end of simpara.module-->
+  <define name="local.admon.attrib">
+    <empty/>
+  </define>
+  <define name="admon.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="caution">
+    <element name="caution">
+      <ref name="caution.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="admon.mix"/>
-        </choice>
+        <ref name="admon.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- caution.element -->
-
-<dtd:pe-decl name="caution.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="caution.attlist">
-<define name="caution.attlist">
-  <ref name="common.attrib"/>
-  <ref name="admon.role.attrib"/>
-  <ref name="local.admon.attrib"/>
-</define>
-</div> <!-- caution.attlist -->
-
-
-<dtd:pe-decl name="important.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="important.element">
-<define name="important.element">
-  <element name="important">
-    <group>
+    </element>
+  </define>
+<!--end of caution.element-->
+  <define name="caution.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="admon.role.attrib"/>
+    <ref name="local.admon.attrib"/>
+  </define>
+<!--end of caution.attlist-->
+  <define name="important">
+    <element name="important">
+      <ref name="important.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="admon.mix"/>
-        </choice>
+        <ref name="admon.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- important.element -->
-
-<dtd:pe-decl name="important.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="important.attlist">
-<define name="important.attlist">
-  <ref name="common.attrib"/>
-  <ref name="admon.role.attrib"/>
-  <ref name="local.admon.attrib"/>
-</define>
-</div> <!-- important.attlist -->
-
-
-<dtd:pe-decl name="note.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="note.element">
-<define name="note.element">
-  <element name="note">
-    <group>
+    </element>
+  </define>
+<!--end of important.element-->
+  <define name="important.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="admon.role.attrib"/>
+    <ref name="local.admon.attrib"/>
+  </define>
+<!--end of important.attlist-->
+  <define name="note">
+    <element name="note">
+      <ref name="note.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="admon.mix"/>
-        </choice>
+        <ref name="admon.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- note.element -->
-
-<dtd:pe-decl name="note.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="note.attlist">
-<define name="note.attlist">
-  <ref name="common.attrib"/>
-  <ref name="admon.role.attrib"/>
-  <ref name="local.admon.attrib"/>
-</define>
-</div> <!-- note.attlist -->
-
-
-<dtd:pe-decl name="tip.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="tip.element">
-<define name="tip.element">
-  <element name="tip">
-    <group>
+    </element>
+  </define>
+<!--end of note.element-->
+  <define name="note.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="admon.role.attrib"/>
+    <ref name="local.admon.attrib"/>
+  </define>
+<!--end of note.attlist-->
+  <define name="tip">
+    <element name="tip">
+      <ref name="tip.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="admon.mix"/>
-        </choice>
+        <ref name="admon.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- tip.element -->
-
-<dtd:pe-decl name="tip.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="tip.attlist">
-<define name="tip.attlist">
-  <ref name="common.attrib"/>
-  <ref name="admon.role.attrib"/>
-  <ref name="local.admon.attrib"/>
-</define>
-</div> <!-- tip.attlist -->
-
-
-<dtd:pe-decl name="warning.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="warning.element">
-<define name="warning.element">
-  <element name="warning">
-    <group>
+    </element>
+  </define>
+<!--end of tip.element-->
+  <define name="tip.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="admon.role.attrib"/>
+    <ref name="local.admon.attrib"/>
+  </define>
+<!--end of tip.attlist-->
+  <define name="warning">
+    <element name="warning">
+      <ref name="warning.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="admon.mix"/>
-        </choice>
+        <ref name="admon.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- warning.element -->
-
-<dtd:pe-decl name="warning.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="warning.attlist">
-<define name="warning.attlist">
-  <ref name="common.attrib"/>
-  <ref name="admon.role.attrib"/>
-  <ref name="local.admon.attrib"/>
-</define>
-</div> <!-- warning.attlist -->
-
-</div> <!-- admon.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Lists ................................................................ </dtd:comment>
-
-<dtd:comment> GlossList ........................ </dtd:comment>
-
-<dtd:pe-decl name="glosslist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glosslist.module">
-<define name="local.glosslist.attrib">
-  <notAllowed/>
-</define>
-<define name="glosslist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glosslist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glosslist.element">
-<define name="glosslist.element">
-  <element name="glosslist">
-    <group>
+    </element>
+  </define>
+<!--end of warning.element-->
+  <define name="warning.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="admon.role.attrib"/>
+    <ref name="local.admon.attrib"/>
+  </define>
+<!--end of warning.attlist-->
+<!--end of admon.module-->
+<!-- ...................................................................... -->
+<!-- Lists ................................................................ -->
+<!-- GlossList ........................ -->
+  <define name="local.glosslist.attrib">
+    <empty/>
+  </define>
+  <define name="glosslist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glosslist">
+    <element name="glosslist">
+      <ref name="glosslist.attlist"/>
       <oneOrMore>
-        <ref name="glossentry.element"/>
+        <ref name="glossentry"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- glosslist.element -->
-
-<dtd:pe-decl name="glosslist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glosslist.attlist">
-<define name="glosslist.attlist">
-  <ref name="common.attrib"/>
-  <ref name="glosslist.role.attrib"/>
-  <ref name="local.glosslist.attrib"/>
-</define>
-</div> <!-- glosslist.attlist -->
-</div> <!-- glosslist.module -->
-
-<dtd:pe-decl name="glossentry.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossentry.content.module">
-<dtd:pe-decl name="glossentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossentry.module">
-<define name="local.glossentry.attrib">
-  <notAllowed/>
-</define>
-<define name="glossentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossentry.element">
-<define name="glossentry.element">
-  <element name="glossentry">
-    <group>
-      <ref name="glossterm.element"/>
+    </element>
+  </define>
+<!--end of glosslist.element-->
+  <define name="glosslist.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="glosslist.role.attrib"/>
+    <ref name="local.glosslist.attrib"/>
+  </define>
+<!--end of glosslist.attlist-->
+<!--end of glosslist.module-->
+  <define name="local.glossentry.attrib">
+    <empty/>
+  </define>
+  <define name="glossentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossentry">
+    <element name="glossentry">
+      <ref name="glossentry.attlist"/>
+      <ref name="glossterm"/>
       <optional>
-        <ref name="acronym.element"/>
+        <ref name="acronym"/>
       </optional>
       <optional>
-        <ref name="abbrev.element"/>
+        <ref name="abbrev"/>
       </optional>
       <zeroOrMore>
-        <choice>
-          <ref name="ndxterm.class"/>
-        </choice>
+        <ref name="ndxterm.class"/>
       </zeroOrMore>
       <optional>
-        <ref name="revhistory.element"/>
+        <ref name="revhistory"/>
       </optional>
       <choice>
-        <ref name="glosssee.element"/>
+        <ref name="glosssee"/>
         <oneOrMore>
-          <ref name="glossdef.element"/>
+          <ref name="glossdef"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- glossentry.element -->
-
-<dtd:comment> SortAs: String by which the GlossEntry is to be sorted
-		(alphabetized) in lieu of its proper content </dtd:comment>
-
-
-<dtd:pe-decl name="glossentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossentry.attlist">
-<define name="glossentry.attlist">
-  <optional>
-    <attribute name="sortas"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="glossentry.role.attrib"/>
-  <ref name="local.glossentry.attrib"/>
-</define>
-</div> <!-- glossentry.attlist -->
-</div> <!-- glossentry.module -->
-
-<dtd:comment> GlossTerm (defined in the Inlines section, below)</dtd:comment>
-<dtd:pe-decl name="glossdef.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossdef.module">
-<define name="local.glossdef.attrib">
-  <notAllowed/>
-</define>
-<define name="glossdef.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossdef.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossdef.element">
-<define name="glossdef.element">
-  <element name="glossdef">
-    <group>
+    </element>
+  </define>
+<!--end of glossentry.element-->
+<!-- SortAs: String by which the GlossEntry is to be sorted
+		(alphabetized) in lieu of its proper content -->
+  <define name="glossentry.attlist" combine="interleave">
+    <optional>
+      <attribute name="sortas"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="glossentry.role.attrib"/>
+    <ref name="local.glossentry.attrib"/>
+  </define>
+<!--end of glossentry.attlist-->
+<!--end of glossentry.module-->
+<!-- GlossTerm (defined in the Inlines section, below)-->
+  <define name="local.glossdef.attrib">
+    <empty/>
+  </define>
+  <define name="glossdef.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossdef">
+    <element name="glossdef">
+      <ref name="glossdef.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="glossdef.mix"/>
-        </choice>
+        <ref name="glossdef.mix"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="glossseealso.element"/>
+        <ref name="glossseealso"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- glossdef.element -->
-
-<dtd:comment> Subject: List of subjects; keywords for the definition </dtd:comment>
-
-
-<dtd:pe-decl name="glossdef.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossdef.attlist">
-<define name="glossdef.attlist">
-  <optional>
-    <attribute name="subject"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="glossdef.role.attrib"/>
-  <ref name="local.glossdef.attrib"/>
-</define>
-</div> <!-- glossdef.attlist -->
-</div> <!-- glossdef.module -->
-
-<dtd:pe-decl name="glosssee.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glosssee.module">
-<define name="local.glosssee.attrib">
-  <notAllowed/>
-</define>
-<define name="glosssee.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glosssee.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glosssee.element">
-<define name="glosssee.element">
-  <element name="glosssee">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of glossdef.element-->
+<!-- Subject: List of subjects; keywords for the definition -->
+  <define name="glossdef.attlist" combine="interleave">
+    <optional>
+      <attribute name="subject"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="glossdef.role.attrib"/>
+    <ref name="local.glossdef.attrib"/>
+  </define>
+<!--end of glossdef.attlist-->
+<!--end of glossdef.module-->
+  <define name="local.glosssee.attrib">
+    <empty/>
+  </define>
+  <define name="glosssee.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glosssee">
+    <element name="glosssee">
+      <ref name="glosssee.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- glosssee.element -->
-
-<dtd:comment> OtherTerm: Reference to the GlossEntry whose GlossTerm
-		should be displayed at the point of the GlossSee </dtd:comment>
-
-
-<dtd:pe-decl name="glosssee.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glosssee.attlist">
-<define name="glosssee.attlist">
-  <optional>
-    <attribute name="otherterm" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="glosssee.role.attrib"/>
-  <ref name="local.glosssee.attrib"/>
-</define>
-</div> <!-- glosssee.attlist -->
-</div> <!-- glosssee.module -->
-
-<dtd:pe-decl name="glossseealso.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossseealso.module">
-<define name="local.glossseealso.attrib">
-  <notAllowed/>
-</define>
-<define name="glossseealso.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossseealso.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossseealso.element">
-<define name="glossseealso.element">
-  <element name="glossseealso">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of glosssee.element-->
+<!-- OtherTerm: Reference to the GlossEntry whose GlossTerm
+		should be displayed at the point of the GlossSee -->
+  <define name="glosssee.attlist" combine="interleave">
+    <optional>
+      <attribute name="otherterm">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="glosssee.role.attrib"/>
+    <ref name="local.glosssee.attrib"/>
+  </define>
+<!--end of glosssee.attlist-->
+<!--end of glosssee.module-->
+  <define name="local.glossseealso.attrib">
+    <empty/>
+  </define>
+  <define name="glossseealso.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossseealso">
+    <element name="glossseealso">
+      <ref name="glossseealso.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- glossseealso.element -->
-
-<dtd:comment> OtherTerm: Reference to the GlossEntry whose GlossTerm
-		should be displayed at the point of the GlossSeeAlso </dtd:comment>
-
-
-<dtd:pe-decl name="glossseealso.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossseealso.attlist">
-<define name="glossseealso.attlist">
-  <optional>
-    <attribute name="otherterm" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="glossseealso.role.attrib"/>
-  <ref name="local.glossseealso.attrib"/>
-</define>
-</div> <!-- glossseealso.attlist -->
-</div> <!-- glossseealso.module -->
-</div> <!-- glossentry.content.module -->
-
-<dtd:comment> ItemizedList and OrderedList ..... </dtd:comment>
-
-<dtd:pe-decl name="itemizedlist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="itemizedlist.module">
-<define name="local.itemizedlist.attrib">
-  <notAllowed/>
-</define>
-<define name="itemizedlist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="itemizedlist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="itemizedlist.element">
-<define name="itemizedlist.element">
-  <element name="itemizedlist">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of glossseealso.element-->
+<!-- OtherTerm: Reference to the GlossEntry whose GlossTerm
+		should be displayed at the point of the GlossSeeAlso -->
+  <define name="glossseealso.attlist" combine="interleave">
+    <optional>
+      <attribute name="otherterm">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="glossseealso.role.attrib"/>
+    <ref name="local.glossseealso.attrib"/>
+  </define>
+<!--end of glossseealso.attlist-->
+<!--end of glossseealso.module-->
+<!--end of glossentry.content.module-->
+<!-- ItemizedList and OrderedList ..... -->
+  <define name="local.itemizedlist.attrib">
+    <empty/>
+  </define>
+  <define name="itemizedlist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="itemizedlist">
+    <element name="itemizedlist">
+      <ref name="itemizedlist.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <oneOrMore>
-        <ref name="listitem.element"/>
+        <ref name="listitem"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- itemizedlist.element -->
-
-<dtd:comment> Spacing: Whether the vertical space in the list should be
-		compressed </dtd:comment>
-<dtd:comment> Mark: Keyword, e.g., bullet, dash, checkbox, none;
-		list of keywords and defaults are implementation specific </dtd:comment>
-
-
-<dtd:pe-decl name="itemizedlist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="itemizedlist.attlist">
-<define name="itemizedlist.attlist">
-  <optional>
-    <attribute name="spacing">
-      <choice>
-        <value>normal</value>
-        <value>compact</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="mark.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="itemizedlist.role.attrib"/>
-  <ref name="local.itemizedlist.attrib"/>
-</define>
-</div> <!-- itemizedlist.attlist -->
-</div> <!-- itemizedlist.module -->
-
-<dtd:pe-decl name="orderedlist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orderedlist.module">
-<define name="local.orderedlist.attrib">
-  <notAllowed/>
-</define>
-<define name="orderedlist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="orderedlist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orderedlist.element">
-<define name="orderedlist.element">
-  <element name="orderedlist">
-    <group>
+    </element>
+  </define>
+<!--end of itemizedlist.element-->
+<!-- Spacing: Whether the vertical space in the list should be
+		compressed -->
+<!-- Mark: Keyword, e.g., bullet, dash, checkbox, none;
+		list of keywords and defaults are implementation specific -->
+  <define name="itemizedlist.attlist" combine="interleave">
+    <optional>
+      <attribute name="spacing">
+        <choice>
+          <value>normal</value>
+          <value>compact</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="mark.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="itemizedlist.role.attrib"/>
+    <ref name="local.itemizedlist.attrib"/>
+  </define>
+<!--end of itemizedlist.attlist-->
+<!--end of itemizedlist.module-->
+  <define name="local.orderedlist.attrib">
+    <empty/>
+  </define>
+  <define name="orderedlist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="orderedlist">
+    <element name="orderedlist">
+      <ref name="orderedlist.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <oneOrMore>
-        <ref name="listitem.element"/>
+        <ref name="listitem"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- orderedlist.element -->
-
-<dtd:comment> Numeration: Style of ListItem numbered; default is expected
-		to be Arabic </dtd:comment>
-<dtd:comment> InheritNum: Specifies for a nested list that the numbering
+    </element>
+  </define>
+<!--end of orderedlist.element-->
+<!-- Numeration: Style of ListItem numbered; default is expected
+		to be Arabic -->
+<!-- InheritNum: Specifies for a nested list that the numbering
 		of ListItems should include the number of the item
 		within which they are nested (e.g., 1a and 1b within 1,
-		rather than a and b) </dtd:comment>
-<dtd:comment> Continuation: Where list numbering begins afresh (Restarts,
+		rather than a and b) -->
+<!-- Continuation: Where list numbering begins afresh (Restarts,
 		the default) or continues that of the immediately preceding 
-		list (Continues) </dtd:comment>
-<dtd:comment> Spacing: Whether the vertical space in the list should be
-		compressed </dtd:comment>
-
-
-<dtd:pe-decl name="orderedlist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orderedlist.attlist">
-<define name="orderedlist.attlist">
-  <optional>
-    <attribute name="numeration">
-      <choice>
-        <value>arabic</value>
-        <value>upperalpha</value>
-        <value>loweralpha</value>
-        <value>upperroman</value>
-        <value>lowerroman</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="inheritnum" dtd:default="ignore">
-      <choice>
-        <value>inherit</value>
-        <value>ignore</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="continuation" dtd:default="restarts">
-      <choice>
-        <value>continues</value>
-        <value>restarts</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="spacing">
-      <choice>
-        <value>normal</value>
-        <value>compact</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="orderedlist.role.attrib"/>
-  <ref name="local.orderedlist.attrib"/>
-</define>
-</div> <!-- orderedlist.attlist -->
-</div> <!-- orderedlist.module -->
-
-<dtd:pe-decl name="listitem.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="listitem.module">
-<define name="local.listitem.attrib">
-  <notAllowed/>
-</define>
-<define name="listitem.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="listitem.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="listitem.element">
-<define name="listitem.element">
-  <element name="listitem">
-    <group>
-      <oneOrMore>
+		list (Continues) -->
+<!-- Spacing: Whether the vertical space in the list should be
+		compressed -->
+  <define name="orderedlist.attlist" combine="interleave">
+    <optional>
+      <attribute name="numeration">
+        <choice>
+          <value>arabic</value>
+          <value>upperalpha</value>
+          <value>loweralpha</value>
+          <value>upperroman</value>
+          <value>lowerroman</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="inheritnum" a:defaultValue="ignore">
+        <choice>
+          <value>inherit</value>
+          <value>ignore</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="continuation" a:defaultValue="restarts">
+        <choice>
+          <value>continues</value>
+          <value>restarts</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="spacing">
         <choice>
-          <ref name="component.mix"/>
+          <value>normal</value>
+          <value>compact</value>
         </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="orderedlist.role.attrib"/>
+    <ref name="local.orderedlist.attrib"/>
+  </define>
+<!--end of orderedlist.attlist-->
+<!--end of orderedlist.module-->
+  <define name="local.listitem.attrib">
+    <empty/>
+  </define>
+  <define name="listitem.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="listitem">
+    <element name="listitem">
+      <ref name="listitem.attlist"/>
+      <oneOrMore>
+        <ref name="component.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- listitem.element -->
-
-<dtd:comment> Override: Indicates the mark to be used for this ListItem
+    </element>
+  </define>
+<!--end of listitem.element-->
+<!-- Override: Indicates the mark to be used for this ListItem
 		instead of the default mark or the mark specified by
-		the Mark attribute on the enclosing ItemizedList </dtd:comment>
-
-
-<dtd:pe-decl name="listitem.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="listitem.attlist">
-<define name="listitem.attlist">
-  <optional>
-    <attribute name="override"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="listitem.role.attrib"/>
-  <ref name="local.listitem.attrib"/>
-</define>
-</div> <!-- listitem.attlist -->
-</div> <!-- listitem.module -->
-
-<dtd:comment> SegmentedList .................... </dtd:comment>
-<dtd:pe-decl name="segmentedlist.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segmentedlist.content.module">
-<dtd:pe-decl name="segmentedlist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segmentedlist.module">
-<define name="local.segmentedlist.attrib">
-  <notAllowed/>
-</define>
-<define name="segmentedlist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="segmentedlist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segmentedlist.element">
-<define name="segmentedlist.element">
-  <element name="segmentedlist">
-    <group>
+		the Mark attribute on the enclosing ItemizedList -->
+  <define name="listitem.attlist" combine="interleave">
+    <optional>
+      <attribute name="override"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="listitem.role.attrib"/>
+    <ref name="local.listitem.attrib"/>
+  </define>
+<!--end of listitem.attlist-->
+<!--end of listitem.module-->
+<!-- SegmentedList .................... -->
+  <define name="local.segmentedlist.attrib">
+    <empty/>
+  </define>
+  <define name="segmentedlist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="segmentedlist">
+    <element name="segmentedlist">
+      <ref name="segmentedlist.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
-      <ref name="segtitle.element"/>
+      <ref name="segtitle"/>
       <oneOrMore>
-        <ref name="segtitle.element"/>
+        <ref name="segtitle"/>
       </oneOrMore>
       <oneOrMore>
-        <ref name="seglistitem.element"/>
+        <ref name="seglistitem"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- segmentedlist.element -->
-
-<dtd:pe-decl name="segmentedlist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segmentedlist.attlist">
-<define name="segmentedlist.attlist">
-  <ref name="common.attrib"/>
-  <ref name="segmentedlist.role.attrib"/>
-  <ref name="local.segmentedlist.attrib"/>
-</define>
-</div> <!-- segmentedlist.attlist -->
-</div> <!-- segmentedlist.module -->
-
-<dtd:pe-decl name="segtitle.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segtitle.module">
-<define name="local.segtitle.attrib">
-  <notAllowed/>
-</define>
-<define name="segtitle.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="segtitle.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segtitle.element">
-<define name="segtitle.element">
-  <element name="segtitle">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of segmentedlist.element-->
+  <define name="segmentedlist.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="segmentedlist.role.attrib"/>
+    <ref name="local.segmentedlist.attrib"/>
+  </define>
+<!--end of segmentedlist.attlist-->
+<!--end of segmentedlist.module-->
+  <define name="local.segtitle.attrib">
+    <empty/>
+  </define>
+  <define name="segtitle.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="segtitle">
+    <element name="segtitle">
+      <ref name="segtitle.attlist"/>
+      <zeroOrMore>
         <ref name="title.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- segtitle.element -->
-
-<dtd:pe-decl name="segtitle.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="segtitle.attlist">
-<define name="segtitle.attlist">
-  <ref name="common.attrib"/>
-  <ref name="segtitle.role.attrib"/>
-  <ref name="local.segtitle.attrib"/>
-</define>
-</div> <!-- segtitle.attlist -->
-</div> <!-- segtitle.module -->
-
-<dtd:pe-decl name="seglistitem.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seglistitem.module">
-<define name="local.seglistitem.attrib">
-  <notAllowed/>
-</define>
-<define name="seglistitem.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="seglistitem.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seglistitem.element">
-<define name="seglistitem.element">
-  <element name="seglistitem">
-    <group>
-      <ref name="seg.element"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of segtitle.element-->
+  <define name="segtitle.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="segtitle.role.attrib"/>
+    <ref name="local.segtitle.attrib"/>
+  </define>
+<!--end of segtitle.attlist-->
+<!--end of segtitle.module-->
+  <define name="local.seglistitem.attrib">
+    <empty/>
+  </define>
+  <define name="seglistitem.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="seglistitem">
+    <element name="seglistitem">
+      <ref name="seglistitem.attlist"/>
+      <ref name="seg"/>
       <oneOrMore>
-        <ref name="seg.element"/>
+        <ref name="seg"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- seglistitem.element -->
-
-<dtd:pe-decl name="seglistitem.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seglistitem.attlist">
-<define name="seglistitem.attlist">
-  <ref name="common.attrib"/>
-  <ref name="seglistitem.role.attrib"/>
-  <ref name="local.seglistitem.attrib"/>
-</define>
-</div> <!-- seglistitem.attlist -->
-</div> <!-- seglistitem.module -->
-
-<dtd:pe-decl name="seg.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seg.module">
-<define name="local.seg.attrib">
-  <notAllowed/>
-</define>
-<define name="seg.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="seg.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seg.element">
-<define name="seg.element">
-  <element name="seg">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of seglistitem.element-->
+  <define name="seglistitem.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="seglistitem.role.attrib"/>
+    <ref name="local.seglistitem.attrib"/>
+  </define>
+<!--end of seglistitem.attlist-->
+<!--end of seglistitem.module-->
+  <define name="local.seg.attrib">
+    <empty/>
+  </define>
+  <define name="seg.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="seg">
+    <element name="seg">
+      <ref name="seg.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- seg.element -->
-
-<dtd:pe-decl name="seg.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seg.attlist">
-<define name="seg.attlist">
-  <ref name="common.attrib"/>
-  <ref name="seg.role.attrib"/>
-  <ref name="local.seg.attrib"/>
-</define>
-</div> <!-- seg.attlist -->
-</div> <!-- seg.module -->
-</div> <!-- segmentedlist.content.module -->
-
-<dtd:comment> SimpleList ....................... </dtd:comment>
-
-<dtd:pe-decl name="simplelist.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplelist.content.module">
-<dtd:pe-decl name="simplelist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplelist.module">
-<define name="local.simplelist.attrib">
-  <notAllowed/>
-</define>
-<define name="simplelist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="simplelist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplelist.element">
-<define name="simplelist.element">
-  <element name="simplelist">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of seg.element-->
+  <define name="seg.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="seg.role.attrib"/>
+    <ref name="local.seg.attrib"/>
+  </define>
+<!--end of seg.attlist-->
+<!--end of seg.module-->
+<!--end of segmentedlist.content.module-->
+<!-- SimpleList ....................... -->
+  <define name="local.simplelist.attrib">
+    <empty/>
+  </define>
+  <define name="simplelist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="simplelist">
+    <element name="simplelist">
+      <ref name="simplelist.attlist"/>
       <oneOrMore>
-        <ref name="member.element"/>
+        <ref name="member"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- simplelist.element -->
-
-<dtd:comment> Columns: The number of columns the array should contain </dtd:comment>
-<dtd:comment> Type: How the Members of the SimpleList should be
+    </element>
+  </define>
+<!--end of simplelist.element-->
+<!-- Columns: The number of columns the array should contain -->
+<!-- Type: How the Members of the SimpleList should be
 		formatted: Inline (members separated with commas etc.
 		inline), Vert (top to bottom in n Columns), or Horiz (in
 		the direction of text flow) in n Columns.  If Column
 		is 1 or implied, Type=Vert and Type=Horiz give the same
-		results. </dtd:comment>
-
-
-<dtd:pe-decl name="simplelist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="simplelist.attlist">
-<define name="simplelist.attlist">
-  <optional>
-    <attribute name="columns"/>
-  </optional>
-  <optional>
-    <attribute name="type" dtd:default="vert">
-      <choice>
-        <value>inline</value>
-        <value>vert</value>
-        <value>horiz</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="simplelist.role.attrib"/>
-  <ref name="local.simplelist.attrib"/>
-</define>
-</div> <!-- simplelist.attlist -->
-</div> <!-- simplelist.module -->
-
-<dtd:pe-decl name="member.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="member.module">
-<define name="local.member.attrib">
-  <notAllowed/>
-</define>
-<define name="member.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="member.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="member.element">
-<define name="member.element">
-  <element name="member">
-    <zeroOrMore>
-      <choice>
+		results. -->
+  <define name="simplelist.attlist" combine="interleave">
+    <optional>
+      <attribute name="columns"/>
+    </optional>
+    <optional>
+      <attribute name="type" a:defaultValue="vert">
+        <choice>
+          <value>inline</value>
+          <value>vert</value>
+          <value>horiz</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="simplelist.role.attrib"/>
+    <ref name="local.simplelist.attrib"/>
+  </define>
+<!--end of simplelist.attlist-->
+<!--end of simplelist.module-->
+  <define name="local.member.attrib">
+    <empty/>
+  </define>
+  <define name="member.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="member">
+    <element name="member">
+      <ref name="member.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- member.element -->
-
-<dtd:pe-decl name="member.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="member.attlist">
-<define name="member.attlist">
-  <ref name="common.attrib"/>
-  <ref name="member.role.attrib"/>
-  <ref name="local.member.attrib"/>
-</define>
-</div> <!-- member.attlist -->
-</div> <!-- member.module -->
-</div> <!-- simplelist.content.module -->
-
-<dtd:comment> VariableList ..................... </dtd:comment>
-
-<dtd:pe-decl name="variablelist.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="variablelist.content.module">
-<dtd:pe-decl name="variablelist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="variablelist.module">
-<define name="local.variablelist.attrib">
-  <notAllowed/>
-</define>
-<define name="variablelist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="variablelist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="variablelist.element">
-<define name="variablelist.element">
-  <element name="variablelist">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of member.element-->
+  <define name="member.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="member.role.attrib"/>
+    <ref name="local.member.attrib"/>
+  </define>
+<!--end of member.attlist-->
+<!--end of member.module-->
+<!--end of simplelist.content.module-->
+<!-- VariableList ..................... -->
+  <define name="local.variablelist.attrib">
+    <empty/>
+  </define>
+  <define name="variablelist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="variablelist">
+    <element name="variablelist">
+      <ref name="variablelist.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <oneOrMore>
-        <ref name="varlistentry.element"/>
+        <ref name="varlistentry"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- variablelist.element -->
-
-<dtd:comment> TermLength: Length beyond which the presentation engine
+    </element>
+  </define>
+<!--end of variablelist.element-->
+<!-- TermLength: Length beyond which the presentation engine
 		may consider the Term too long and select an alternate
-		presentation of the Term and, or, its associated ListItem. </dtd:comment>
-
-
-<dtd:pe-decl name="variablelist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="variablelist.attlist">
-<define name="variablelist.attlist">
-  <optional>
-    <attribute name="termlength"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="variablelist.role.attrib"/>
-  <ref name="local.variablelist.attrib"/>
-</define>
-</div> <!-- variablelist.attlist -->
-</div> <!-- variablelist.module -->
-
-<dtd:pe-decl name="varlistentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varlistentry.module">
-<define name="local.varlistentry.attrib">
-  <notAllowed/>
-</define>
-<define name="varlistentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="varlistentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varlistentry.element">
-<define name="varlistentry.element">
-  <element name="varlistentry">
-    <group>
+		presentation of the Term and, or, its associated ListItem. -->
+  <define name="variablelist.attlist" combine="interleave">
+    <optional>
+      <attribute name="termlength"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="variablelist.role.attrib"/>
+    <ref name="local.variablelist.attrib"/>
+  </define>
+<!--end of variablelist.attlist-->
+<!--end of variablelist.module-->
+  <define name="local.varlistentry.attrib">
+    <empty/>
+  </define>
+  <define name="varlistentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="varlistentry">
+    <element name="varlistentry">
+      <ref name="varlistentry.attlist"/>
       <oneOrMore>
-        <ref name="term.element"/>
+        <ref name="term"/>
       </oneOrMore>
-      <ref name="listitem.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- varlistentry.element -->
-
-<dtd:pe-decl name="varlistentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varlistentry.attlist">
-<define name="varlistentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="varlistentry.role.attrib"/>
-  <ref name="local.varlistentry.attrib"/>
-</define>
-</div> <!-- varlistentry.attlist -->
-</div> <!-- varlistentry.module -->
-
-<dtd:pe-decl name="term.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="term.module">
-<define name="local.term.attrib">
-  <notAllowed/>
-</define>
-<define name="term.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="term.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="term.element">
-<define name="term.element">
-  <element name="term">
-    <zeroOrMore>
-      <choice>
+      <ref name="listitem"/>
+    </element>
+  </define>
+<!--end of varlistentry.element-->
+  <define name="varlistentry.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="varlistentry.role.attrib"/>
+    <ref name="local.varlistentry.attrib"/>
+  </define>
+<!--end of varlistentry.attlist-->
+<!--end of varlistentry.module-->
+  <define name="local.term.attrib">
+    <empty/>
+  </define>
+  <define name="term.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="term">
+    <element name="term">
+      <ref name="term.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- term.element -->
-
-<dtd:pe-decl name="term.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="term.attlist">
-<define name="term.attlist">
-  <ref name="common.attrib"/>
-  <ref name="term.role.attrib"/>
-  <ref name="local.term.attrib"/>
-</define>
-</div> <!-- term.attlist -->
-</div> <!-- term.module -->
-
-<dtd:comment> ListItem (defined above)</dtd:comment>
-</div> <!-- variablelist.content.module -->
-
-<dtd:comment> CalloutList ...................... </dtd:comment>
-
-<dtd:pe-decl name="calloutlist.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="calloutlist.content.module">
-<dtd:pe-decl name="calloutlist.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="calloutlist.module">
-<define name="local.calloutlist.attrib">
-  <notAllowed/>
-</define>
-<define name="calloutlist.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="calloutlist.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="calloutlist.element">
-<define name="calloutlist.element">
-  <element name="calloutlist">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of term.element-->
+  <define name="term.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="term.role.attrib"/>
+    <ref name="local.term.attrib"/>
+  </define>
+<!--end of term.attlist-->
+<!--end of term.module-->
+<!-- ListItem (defined above)-->
+<!--end of variablelist.content.module-->
+<!-- CalloutList ...................... -->
+  <define name="local.calloutlist.attrib">
+    <empty/>
+  </define>
+  <define name="calloutlist.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="calloutlist">
+    <element name="calloutlist">
+      <ref name="calloutlist.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <oneOrMore>
-        <ref name="callout.element"/>
-      </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- calloutlist.element -->
-
-<dtd:pe-decl name="calloutlist.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="calloutlist.attlist">
-<define name="calloutlist.attlist">
-  <ref name="common.attrib"/>
-  <ref name="calloutlist.role.attrib"/>
-  <ref name="local.calloutlist.attrib"/>
-</define>
-</div> <!-- calloutlist.attlist -->
-</div> <!-- calloutlist.module -->
-
-<dtd:pe-decl name="callout.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="callout.module">
-<define name="local.callout.attrib">
-  <notAllowed/>
-</define>
-<define name="callout.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="callout.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="callout.element">
-<define name="callout.element">
-  <element name="callout">
-    <group>
-      <oneOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="callout"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- callout.element -->
-
-<dtd:comment> AreaRefs: IDs of one or more Areas or AreaSets described
-		by this Callout </dtd:comment>
-
-
-<dtd:pe-decl name="callout.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="callout.attlist">
-<define name="callout.attlist">
-  <attribute name="arearefs" a:attributeType="IDREFS">
-    <list>
+    </element>
+  </define>
+<!--end of calloutlist.element-->
+  <define name="calloutlist.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="calloutlist.role.attrib"/>
+    <ref name="local.calloutlist.attrib"/>
+  </define>
+<!--end of calloutlist.attlist-->
+<!--end of calloutlist.module-->
+  <define name="local.callout.attrib">
+    <empty/>
+  </define>
+  <define name="callout.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="callout">
+    <element name="callout">
+      <ref name="callout.attlist"/>
       <oneOrMore>
-        <data type="token"/>
+        <ref name="component.mix"/>
       </oneOrMore>
-    </list>
-  </attribute>
-  <ref name="common.attrib"/>
-  <ref name="callout.role.attrib"/>
-  <ref name="local.callout.attrib"/>
-</define>
-</div> <!-- callout.attlist -->
-</div> <!-- callout.module -->
-</div> <!-- calloutlist.content.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Objects .............................................................. </dtd:comment>
-
-<dtd:comment> Examples etc. .................... </dtd:comment>
-
-<dtd:pe-decl name="example.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="example.module">
-<define name="local.example.attrib">
-  <notAllowed/>
-</define>
-<define name="example.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="example.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="example.element">
-<define name="example.element">
-  <element name="example">
-    <group>
-      <group>
-        <ref name="formalobject.title.content"/>
-      </group>
+    </element>
+  </define>
+<!--end of callout.element-->
+<!-- AreaRefs: IDs of one or more Areas or AreaSets described
+		by this Callout -->
+  <define name="callout.attlist" combine="interleave">
+    <attribute name="arearefs">
+      <data type="IDREFS"/>
+    </attribute>
+    <ref name="common.attrib"/>
+    <ref name="callout.role.attrib"/>
+    <ref name="local.callout.attrib"/>
+  </define>
+<!--end of callout.attlist-->
+<!--end of callout.module-->
+<!--end of calloutlist.content.module-->
+<!-- ...................................................................... -->
+<!-- Objects .............................................................. -->
+<!-- Examples etc. .................... -->
+  <define name="local.example.attrib">
+    <empty/>
+  </define>
+  <define name="example.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="example">
+    <element name="example">
+      <ref name="example.attlist"/>
+      <ref name="formalobject.title.content"/>
       <oneOrMore>
-        <choice>
-          <ref name="example.mix"/>
-        </choice>
+        <ref name="example.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- example.element -->
-
-<dtd:pe-decl name="example.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="example.attlist">
-<define name="example.attlist">
-  <ref name="label.attrib"/>
-  <ref name="width.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="example.role.attrib"/>
-  <ref name="local.example.attrib"/>
-</define>
-</div> <!-- example.attlist -->
-</div> <!-- example.module -->
-
-<dtd:pe-decl name="informalexample.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalexample.module">
-<define name="local.informalexample.attrib">
-  <notAllowed/>
-</define>
-<define name="informalexample.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="informalexample.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalexample.element">
-<define name="informalexample.element">
-  <element name="informalexample">
-    <group>
+    </element>
+  </define>
+<!--end of example.element-->
+  <define name="example.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="width.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="example.role.attrib"/>
+    <ref name="local.example.attrib"/>
+  </define>
+<!--end of example.attlist-->
+<!--end of example.module-->
+  <define name="local.informalexample.attrib">
+    <empty/>
+  </define>
+  <define name="informalexample.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="informalexample">
+    <element name="informalexample">
+      <ref name="informalexample.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="example.mix"/>
-        </choice>
+        <ref name="example.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- informalexample.element -->
-
-<dtd:pe-decl name="informalexample.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalexample.attlist">
-<define name="informalexample.attlist">
-  <ref name="width.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="informalexample.role.attrib"/>
-  <ref name="local.informalexample.attrib"/>
-</define>
-</div> <!-- informalexample.attlist -->
-</div> <!-- informalexample.module -->
-
-<dtd:pe-decl name="programlistingco.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="programlistingco.module">
-<define name="local.programlistingco.attrib">
-  <notAllowed/>
-</define>
-<define name="programlistingco.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="programlistingco.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="programlistingco.element">
-<define name="programlistingco.element">
-  <element name="programlistingco">
-    <group>
-      <ref name="areaspec.element"/>
-      <ref name="programlisting.element"/>
-      <zeroOrMore>
-        <ref name="calloutlist.element"/>
-      </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- programlistingco.element -->
-
-<dtd:pe-decl name="programlistingco.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="programlistingco.attlist">
-<define name="programlistingco.attlist">
-  <ref name="common.attrib"/>
-  <ref name="programlistingco.role.attrib"/>
-  <ref name="local.programlistingco.attrib"/>
-</define>
-</div> <!-- programlistingco.attlist -->
-<dtd:comment> CalloutList (defined above in Lists)</dtd:comment>
-</div> <!-- informalexample.module -->
-
-<dtd:pe-decl name="areaspec.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaspec.content.module">
-<dtd:pe-decl name="areaspec.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaspec.module">
-<define name="local.areaspec.attrib">
-  <notAllowed/>
-</define>
-<define name="areaspec.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="areaspec.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaspec.element">
-<define name="areaspec.element">
-  <element name="areaspec">
-    <group>
+    </element>
+  </define>
+<!--end of informalexample.element-->
+  <define name="informalexample.attlist" combine="interleave">
+    <ref name="width.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="informalexample.role.attrib"/>
+    <ref name="local.informalexample.attrib"/>
+  </define>
+<!--end of informalexample.attlist-->
+<!--end of informalexample.module-->
+  <define name="local.programlistingco.attrib">
+    <empty/>
+  </define>
+  <define name="programlistingco.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="programlistingco">
+    <element name="programlistingco">
+      <ref name="programlistingco.attlist"/>
+      <ref name="areaspec"/>
+      <ref name="programlisting"/>
+      <zeroOrMore>
+        <ref name="calloutlist"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of programlistingco.element-->
+  <define name="programlistingco.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="programlistingco.role.attrib"/>
+    <ref name="local.programlistingco.attrib"/>
+  </define>
+<!--end of programlistingco.attlist-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of informalexample.module-->
+  <define name="local.areaspec.attrib">
+    <empty/>
+  </define>
+  <define name="areaspec.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="areaspec">
+    <element name="areaspec">
+      <ref name="areaspec.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="area.element"/>
-          <ref name="areaset.element"/>
+          <ref name="area"/>
+          <ref name="areaset"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- areaspec.element -->
-
-<dtd:comment> Units: global unit of measure in which coordinates in
+    </element>
+  </define>
+<!--end of areaspec.element-->
+<!-- Units: global unit of measure in which coordinates in
 		this spec are expressed:
 
 		- CALSPair "x1,y1 x2,y2": lower-left and upper-right 
@@ -4358,905 +3341,683 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 
 		The default is implementation-specific; usually dependent on 
 		the parent element (GraphicCO gets CALSPair, ProgramListingCO
-		and ScreenCO get LineColumn) </dtd:comment>
-<dtd:comment> OtherUnits: User-defined units </dtd:comment>
-
-
-<dtd:pe-decl name="areaspec.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaspec.attlist">
-<define name="areaspec.attlist">
-  <optional>
-    <attribute name="units">
-      <choice>
-        <value>calspair</value>
-        <value>linecolumn</value>
-        <value>linerange</value>
-        <value>linecolumnpair</value>
-        <value>other</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="otherunits">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="areaspec.role.attrib"/>
-  <ref name="local.areaspec.attrib"/>
-</define>
-</div> <!-- areaspec.attlist -->
-</div> <!-- areaspec.module -->
-
-<dtd:pe-decl name="area.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="area.module">
-<define name="local.area.attrib">
-  <notAllowed/>
-</define>
-<define name="area.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="area.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="area.element">
-<define name="area.element">
-  <element name="area">
-    <empty/>
-  </element>
-</define>
-</div> <!-- area.element -->
-
-<dtd:comment> bug number/symbol override or initialization </dtd:comment>
-<dtd:comment> to any related information </dtd:comment>
-<dtd:comment> Units: unit of measure in which coordinates in this
-		area are expressed; inherits from AreaSet and AreaSpec </dtd:comment>
-<dtd:comment> OtherUnits: User-defined units </dtd:comment>
-
-
-<dtd:pe-decl name="area.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="area.attlist">
-<define name="area.attlist">
-  <ref name="label.attrib"/>		
-  <ref name="linkends.attrib"/>
-  <optional>
-    <attribute name="units">
-      <choice>
-        <value>calspair</value>
-        <value>linecolumn</value>
-        <value>linerange</value>
-        <value>linecolumnpair</value>
-        <value>other</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="otherunits">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <attribute name="coords"/>
-  <ref name="idreq.common.attrib"/>
-  <ref name="area.role.attrib"/>
-  <ref name="local.area.attrib"/>
-</define>
-</div> <!-- area.attlist -->
-</div> <!-- area.module -->
-
-<dtd:pe-decl name="areaset.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaset.module">
-<define name="local.areaset.attrib">
-  <notAllowed/>
-</define>
-<define name="areaset.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="areaset.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaset.element">
-<define name="areaset.element">
-  <element name="areaset">
-    <group>
+		and ScreenCO get LineColumn) -->
+<!-- OtherUnits: User-defined units -->
+  <define name="areaspec.attlist" combine="interleave">
+    <optional>
+      <attribute name="units">
+        <choice>
+          <value>calspair</value>
+          <value>linecolumn</value>
+          <value>linerange</value>
+          <value>linecolumnpair</value>
+          <value>other</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otherunits">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="areaspec.role.attrib"/>
+    <ref name="local.areaspec.attrib"/>
+  </define>
+<!--end of areaspec.attlist-->
+<!--end of areaspec.module-->
+  <define name="local.area.attrib">
+    <empty/>
+  </define>
+  <define name="area.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="area">
+    <element name="area">
+      <ref name="area.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of area.element-->
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+<!-- Units: unit of measure in which coordinates in this
+		area are expressed; inherits from AreaSet and AreaSpec -->
+<!-- OtherUnits: User-defined units -->
+  <define name="area.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="linkends.attrib"/>
+    <optional>
+      <attribute name="units">
+        <choice>
+          <value>calspair</value>
+          <value>linecolumn</value>
+          <value>linerange</value>
+          <value>linecolumnpair</value>
+          <value>other</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otherunits">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <attribute name="coords"/>
+    <ref name="idreq.common.attrib"/>
+    <ref name="area.role.attrib"/>
+    <ref name="local.area.attrib"/>
+  </define>
+<!--end of area.attlist-->
+<!--end of area.module-->
+  <define name="local.areaset.attrib">
+    <empty/>
+  </define>
+  <define name="areaset.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="areaset">
+    <element name="areaset">
+      <ref name="areaset.attlist"/>
       <oneOrMore>
-        <ref name="area.element"/>
+        <ref name="area"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- areaset.element -->
-
-<dtd:comment> bug number/symbol override or initialization </dtd:comment>
-<dtd:comment> Units: unit of measure in which coordinates in this
-		area are expressed; inherits from AreaSpec </dtd:comment>
-
-
-<dtd:pe-decl name="areaset.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="areaset.attlist">
-<define name="areaset.attlist">
-  <ref name="label.attrib"/>
-  <optional>
-    <attribute name="units">
-      <choice>
-        <value>calspair</value>
-        <value>linecolumn</value>
-        <value>linerange</value>
-        <value>linecolumnpair</value>
-        <value>other</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="otherunits">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <attribute name="coords"/>
-  <ref name="idreq.common.attrib"/>
-  <ref name="areaset.role.attrib"/>
-  <ref name="local.areaset.attrib"/>
-</define>
-</div> <!-- areaset.attlist -->
-</div> <!-- areaset.module -->
-</div> <!-- areaspec.content.module -->
-
-<dtd:pe-decl name="programlisting.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="programlisting.module">
-<define name="local.programlisting.attrib">
-  <notAllowed/>
-</define>
-<define name="programlisting.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="programlisting.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="programlisting.element">
-<define name="programlisting.element">
-  <element name="programlisting">
-    <zeroOrMore>
-      <choice>
-        <ref name="para.char.mix"/>
-        <ref name="co.element"/>
-        <ref name="lineannotation.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- programlisting.element -->
-
-<dtd:pe-decl name="programlisting.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="programlisting.attlist">
-<define name="programlisting.attlist">
-  <ref name="width.attrib"/>
-  <ref name="linespecific.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="programlisting.role.attrib"/>
-  <ref name="local.programlisting.attrib"/>
-</define>
-</div> <!-- programlisting.attlist -->
-</div> <!-- programlisting.module -->
-
-<dtd:pe-decl name="literallayout.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="literallayout.module">
-<define name="local.literallayout.attrib">
-  <notAllowed/>
-</define>
-<define name="literallayout.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="literallayout.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="literallayout.element">
-<define name="literallayout.element">
-  <element name="literallayout">
-    <zeroOrMore>
-      <choice>
-        <ref name="para.char.mix"/>
-        <ref name="lineannotation.element"/>
-        <ref name="co.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- literallayout.element -->
-
-<dtd:pe-decl name="literallayout.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="literallayout.attlist">
-<define name="literallayout.attlist">
-  <ref name="width.attrib"/>
-  <ref name="linespecific.attrib"/>
-  <optional>
-    <attribute name="class" dtd:default="normal">
-      <choice>
-        <value>monospaced</value>
-        <value>normal</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="literallayout.role.attrib"/>
-  <ref name="local.literallayout.attrib"/>
-</define>
-</div> <!-- literallayout.attlist -->
-<dtd:comment> LineAnnotation (defined in the Inlines section, below)</dtd:comment>
-</div> <!-- literallayout.module -->
-
-<dtd:pe-decl name="screenco.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenco.module">
-<define name="local.screenco.attrib">
-  <notAllowed/>
-</define>
-<define name="screenco.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="screenco.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenco.element">
-<define name="screenco.element">
-  <element name="screenco">
-    <group>
-      <ref name="areaspec.element"/>
-      <ref name="screen.element"/>
-      <zeroOrMore>
-        <ref name="calloutlist.element"/>
-      </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- screenco.element -->
-
-<dtd:pe-decl name="screenco.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenco.attlist">
-<define name="screenco.attlist">
-  <ref name="common.attrib"/>
-  <ref name="screenco.role.attrib"/>
-  <ref name="local.screenco.attrib"/>
-</define>
-</div> <!-- screenco.attlist -->
-<dtd:comment> AreaSpec (defined above)</dtd:comment>
-<dtd:comment> CalloutList (defined above in Lists)</dtd:comment>
-</div> <!-- screenco.module -->
-
-<dtd:pe-decl name="screen.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screen.module">
-<define name="local.screen.attrib">
-  <notAllowed/>
-</define>
-<define name="screen.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="screen.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screen.element">
-<define name="screen.element">
-  <element name="screen">
-    <zeroOrMore>
-      <choice>
-        <ref name="para.char.mix"/>
-        <ref name="co.element"/>
-        <ref name="lineannotation.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- screen.element -->
-
-<dtd:pe-decl name="screen.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screen.attlist">
-<define name="screen.attlist">
-  <ref name="width.attrib"/>
-  <ref name="linespecific.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="screen.role.attrib"/>
-  <ref name="local.screen.attrib"/>
-</define>
-</div> <!-- screen.attlist -->
-</div> <!-- screen.module -->
-
-<dtd:pe-decl name="screenshot.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenshot.content.module">
-<dtd:pe-decl name="screenshot.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenshot.module">
-<define name="local.screenshot.attrib">
-  <notAllowed/>
-</define>
-<define name="screenshot.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="screenshot.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenshot.element">
-<define name="screenshot.element">
-  <element name="screenshot">
-    <group>
+    </element>
+  </define>
+<!--end of areaset.element-->
+<!-- bug number/symbol override or initialization -->
+<!-- Units: unit of measure in which coordinates in this
+		area are expressed; inherits from AreaSpec -->
+  <define name="areaset.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <optional>
+      <attribute name="units">
+        <choice>
+          <value>calspair</value>
+          <value>linecolumn</value>
+          <value>linerange</value>
+          <value>linecolumnpair</value>
+          <value>other</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="otherunits">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <attribute name="coords"/>
+    <ref name="idreq.common.attrib"/>
+    <ref name="areaset.role.attrib"/>
+    <ref name="local.areaset.attrib"/>
+  </define>
+<!--end of areaset.attlist-->
+<!--end of areaset.module-->
+<!--end of areaspec.content.module-->
+  <define name="local.programlisting.attrib">
+    <empty/>
+  </define>
+  <define name="programlisting.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="programlisting">
+    <element name="programlisting">
+      <ref name="programlisting.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="para.char.mix"/>
+          <ref name="co"/>
+          <ref name="lineannotation"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of programlisting.element-->
+  <define name="programlisting.attlist" combine="interleave">
+    <ref name="width.attrib"/>
+    <ref name="linespecific.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="programlisting.role.attrib"/>
+    <ref name="local.programlisting.attrib"/>
+  </define>
+<!--end of programlisting.attlist-->
+<!--end of programlisting.module-->
+  <define name="local.literallayout.attrib">
+    <empty/>
+  </define>
+  <define name="literallayout.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="literallayout">
+    <element name="literallayout">
+      <ref name="literallayout.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="para.char.mix"/>
+          <ref name="lineannotation"/>
+          <ref name="co"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of literallayout.element-->
+  <define name="literallayout.attlist" combine="interleave">
+    <ref name="width.attrib"/>
+    <ref name="linespecific.attrib"/>
+    <optional>
+      <attribute name="class" a:defaultValue="normal">
+        <choice>
+          <value>monospaced</value>
+          <value>normal</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="literallayout.role.attrib"/>
+    <ref name="local.literallayout.attrib"/>
+  </define>
+<!--end of literallayout.attlist-->
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!--end of literallayout.module-->
+  <define name="local.screenco.attrib">
+    <empty/>
+  </define>
+  <define name="screenco.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="screenco">
+    <element name="screenco">
+      <ref name="screenco.attlist"/>
+      <ref name="areaspec"/>
+      <ref name="screen"/>
+      <zeroOrMore>
+        <ref name="calloutlist"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of screenco.element-->
+  <define name="screenco.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="screenco.role.attrib"/>
+    <ref name="local.screenco.attrib"/>
+  </define>
+<!--end of screenco.attlist-->
+<!-- AreaSpec (defined above)-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of screenco.module-->
+  <define name="local.screen.attrib">
+    <empty/>
+  </define>
+  <define name="screen.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="screen">
+    <element name="screen">
+      <ref name="screen.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="para.char.mix"/>
+          <ref name="co"/>
+          <ref name="lineannotation"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of screen.element-->
+  <define name="screen.attlist" combine="interleave">
+    <ref name="width.attrib"/>
+    <ref name="linespecific.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="screen.role.attrib"/>
+    <ref name="local.screen.attrib"/>
+  </define>
+<!--end of screen.attlist-->
+<!--end of screen.module-->
+  <define name="local.screenshot.attrib">
+    <empty/>
+  </define>
+  <define name="screenshot.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="screenshot">
+    <element name="screenshot">
+      <ref name="screenshot.attlist"/>
       <optional>
-        <ref name="screeninfo.element"/>
+        <ref name="screeninfo"/>
       </optional>
       <choice>
-        <ref name="graphic.element"/>
-        <ref name="graphicco.element"/>
-        <ref name="mediaobject.element"/>
-        <ref name="mediaobjectco.element"/>
-      </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- screenshot.element -->
-
-<dtd:pe-decl name="screenshot.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screenshot.attlist">
-<define name="screenshot.attlist">
-  <ref name="common.attrib"/>
-  <ref name="screenshot.role.attrib"/>
-  <ref name="local.screenshot.attrib"/>
-</define>
-</div> <!-- screenshot.attlist -->
-</div> <!-- screenshot.module -->
-
-<dtd:pe-decl name="screeninfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screeninfo.module">
-<define name="local.screeninfo.attrib">
-  <notAllowed/>
-</define>
-<define name="screeninfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="screeninfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screeninfo.element">
-<define name="screeninfo.element">
-  <element name="screeninfo">
-    <zeroOrMore>
-      <choice>
+        <ref name="graphic"/>
+        <ref name="graphicco"/>
+        <ref name="mediaobject"/>
+        <ref name="mediaobjectco"/>
+      </choice>
+    </element>
+  </define>
+<!--end of screenshot.element-->
+  <define name="screenshot.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="screenshot.role.attrib"/>
+    <ref name="local.screenshot.attrib"/>
+  </define>
+<!--end of screenshot.attlist-->
+<!--end of screenshot.module-->
+  <define name="local.screeninfo.attrib">
+    <empty/>
+  </define>
+  <define name="screeninfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="screeninfo">
+    <element name="screeninfo">
+      <ref name="screeninfo.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- screeninfo.element -->
-
-<dtd:pe-decl name="screeninfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="screeninfo.attlist">
-<define name="screeninfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="screeninfo.role.attrib"/>
-  <ref name="local.screeninfo.attrib"/>
-</define>
-</div> <!-- screeninfo.attlist -->
-</div> <!-- screeninfo.module -->
-</div> <!-- screenshot.content.module -->
-
-<dtd:comment> Figures etc. ..................... </dtd:comment>
-
-<dtd:pe-decl name="figure.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="figure.module">
-<define name="local.figure.attrib">
-  <notAllowed/>
-</define>
-<define name="figure.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="figure.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="figure.element">
-<define name="figure.element">
-  <element name="figure">
-    <group>
-      <group>
-        <ref name="formalobject.title.content"/>
-      </group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of screeninfo.element-->
+  <define name="screeninfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="screeninfo.role.attrib"/>
+    <ref name="local.screeninfo.attrib"/>
+  </define>
+<!--end of screeninfo.attlist-->
+<!--end of screeninfo.module-->
+<!--end of screenshot.content.module-->
+<!-- Figures etc. ..................... -->
+  <define name="local.figure.attrib">
+    <empty/>
+  </define>
+  <define name="figure.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="figure">
+    <element name="figure">
+      <ref name="figure.attlist"/>
+      <ref name="formalobject.title.content"/>
       <oneOrMore>
         <choice>
           <ref name="figure.mix"/>
           <ref name="link.char.class"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- figure.element -->
-
-<dtd:comment> Float: Whether the Figure is supposed to be rendered
+    </element>
+  </define>
+<!--end of figure.element-->
+<!-- Float: Whether the Figure is supposed to be rendered
 		where convenient (yes (1) value) or at the place it occurs
-		in the text (no (0) value, the default) </dtd:comment>
-
-
-<dtd:pe-decl name="figure.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="figure.attlist">
-<define name="figure.attlist">
-  <optional>
-    <attribute name="float" dtd:default='0'>
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="pgwide">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="figure.role.attrib"/>
-  <ref name="local.figure.attrib"/>
-</define>
-</div> <!-- figure.attlist -->
-</div> <!-- figure.module -->
-
-<dtd:pe-decl name="informalfigure.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalfigure.module">
-<define name="local.informalfigure.attrib">
-  <notAllowed/>
-</define>
-<define name="informalfigure.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="informalfigure.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalfigure.element">
-<define name="informalfigure.element">
-  <element name="informalfigure">
-    <group>
+		in the text (no (0) value, the default) -->
+  <define name="figure.attlist" combine="interleave">
+    <optional>
+      <attribute name="float" a:defaultValue="0">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="pgwide">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="figure.role.attrib"/>
+    <ref name="local.figure.attrib"/>
+  </define>
+<!--end of figure.attlist-->
+<!--end of figure.module-->
+  <define name="local.informalfigure.attrib">
+    <empty/>
+  </define>
+  <define name="informalfigure.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="informalfigure">
+    <element name="informalfigure">
+      <ref name="informalfigure.attlist"/>
       <oneOrMore>
         <choice>
           <ref name="figure.mix"/>
           <ref name="link.char.class"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- informalfigure.element -->
-
-<dtd:pe-decl name="informalfigure.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalfigure.attlist">
-<dtd:comment>
+    </element>
+  </define>
+<!--end of informalfigure.element-->
+<!--
 Float: Whether the Figure is supposed to be rendered
 where convenient (yes (1) value) or at the place it occurs
 in the text (no (0) value, the default)
-</dtd:comment>
-<define name="informalfigure.attlist">
-  <optional>
-    <attribute name="float" dtd:default='0'>
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="pgwide">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="informalfigure.role.attrib"/>
-  <ref name="local.informalfigure.attrib"/>
-</define>
-</div> <!-- informalfigure.attlist -->
-</div> <!-- informalfigure.module -->
-
-<dtd:pe-decl name="graphicco.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="graphicco.module">
-<define name="local.graphicco.attrib">
-  <notAllowed/>
-</define>
-<define name="graphicco.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="graphicco.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="graphicco.element">
-<define name="graphicco.element">
-  <element name="graphicco">
-    <group>
-      <ref name="areaspec.element"/>
-      <ref name="graphic.element"/>
-      <zeroOrMore>
-        <ref name="calloutlist.element"/>
-      </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- graphicco.element -->
-
-<dtd:pe-decl name="graphicco.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="graphicco.attlist">
-<define name="graphicco.attlist">
-  <ref name="common.attrib"/>
-  <ref name="graphicco.role.attrib"/>
-  <ref name="local.graphicco.attrib"/>
-</define>
-</div> <!-- graphicco.attlist -->
-<dtd:comment> AreaSpec (defined above in Examples)</dtd:comment>
-<dtd:comment> CalloutList (defined above in Lists)</dtd:comment>
-</div> <!-- graphicco.module -->
-
-<dtd:comment> Graphical data can be the content of Graphic, or you can reference
+-->
+  <define name="informalfigure.attlist" combine="interleave">
+    <optional>
+      <attribute name="float" a:defaultValue="0">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="pgwide">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="informalfigure.role.attrib"/>
+    <ref name="local.informalfigure.attrib"/>
+  </define>
+<!--end of informalfigure.attlist-->
+<!--end of informalfigure.module-->
+  <define name="local.graphicco.attrib">
+    <empty/>
+  </define>
+  <define name="graphicco.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="graphicco">
+    <element name="graphicco">
+      <ref name="graphicco.attlist"/>
+      <ref name="areaspec"/>
+      <ref name="graphic"/>
+      <zeroOrMore>
+        <ref name="calloutlist"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of graphicco.element-->
+  <define name="graphicco.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="graphicco.role.attrib"/>
+    <ref name="local.graphicco.attrib"/>
+  </define>
+<!--end of graphicco.attlist-->
+<!-- AreaSpec (defined above in Examples)-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of graphicco.module-->
+<!-- Graphical data can be the content of Graphic, or you can reference
      an external file either as an entity (Entitref) or a filename
-     (Fileref). </dtd:comment>
-
-<dtd:pe-decl name="graphic.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="graphic.module">
-<define name="local.graphic.attrib">
-  <notAllowed/>
-</define>
-<define name="graphic.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="graphic.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="graphic.element">
-<define name="graphic.element">
-  <element name="graphic">
-    <empty/>
-  </element>
-</define>
-</div> <!-- graphic.element -->
-
-<dtd:pe-decl name="graphic.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="graphic.attlist">
-<define name="graphic.attlist">
-  <ref name="graphics.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="graphic.role.attrib"/>
-  <ref name="local.graphic.attrib"/>
-</define>
-</div> <!-- graphic.attlist -->
-</div> <!-- graphic.module -->
-
-<dtd:pe-decl name="inlinegraphic.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlinegraphic.module">
-<define name="local.inlinegraphic.attrib">
-  <notAllowed/>
-</define>
-<define name="inlinegraphic.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="inlinegraphic.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlinegraphic.element">
-<define name="inlinegraphic.element">
-  <element name="inlinegraphic">
-    <empty/>
-  </element>
-</define>
-</div> <!-- inlinegraphic.element -->
-
-<dtd:pe-decl name="inlinegraphic.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlinegraphic.attlist">
-<define name="inlinegraphic.attlist">
-  <ref name="graphics.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="inlinegraphic.role.attrib"/>
-  <ref name="local.inlinegraphic.attrib"/>
-</define>
-</div> <!-- inlinegraphic.attlist -->
-</div> <!-- inlinegraphic.module -->
-
-<dtd:pe-decl name="mediaobject.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobject.content.module">
-
-<dtd:pe-decl name="mediaobject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobject.module">
-<define name="local.mediaobject.attrib">
-  <notAllowed/>
-</define>
-<define name="mediaobject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="mediaobject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobject.element">
-<define name="mediaobject.element">
-  <element name="mediaobject">
-    <group>
+     (Fileref). -->
+  <define name="local.graphic.attrib">
+    <empty/>
+  </define>
+  <define name="graphic.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="graphic">
+    <element name="graphic">
+      <ref name="graphic.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of graphic.element-->
+  <define name="graphic.attlist" combine="interleave">
+    <ref name="graphics.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="graphic.role.attrib"/>
+    <ref name="local.graphic.attrib"/>
+  </define>
+<!--end of graphic.attlist-->
+<!--end of graphic.module-->
+  <define name="local.inlinegraphic.attrib">
+    <empty/>
+  </define>
+  <define name="inlinegraphic.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="inlinegraphic">
+    <element name="inlinegraphic">
+      <ref name="inlinegraphic.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of inlinegraphic.element-->
+  <define name="inlinegraphic.attlist" combine="interleave">
+    <ref name="graphics.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="inlinegraphic.role.attrib"/>
+    <ref name="local.inlinegraphic.attrib"/>
+  </define>
+<!--end of inlinegraphic.attlist-->
+<!--end of inlinegraphic.module-->
+  <define name="local.mediaobject.attrib">
+    <empty/>
+  </define>
+  <define name="mediaobject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="mediaobject">
+    <element name="mediaobject">
+      <ref name="mediaobject.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
-      <choice>
-        <ref name="mediaobject.mix"/>
-      </choice>
+      <ref name="mediaobject.mix"/>
       <zeroOrMore>
         <choice>
           <ref name="mediaobject.mix"/>
-          <ref name="textobject.element"/>
+          <ref name="textobject"/>
         </choice>
       </zeroOrMore>
       <optional>
-        <ref name="caption.element"/>
+        <ref name="caption"/>
       </optional>
-    </group>
-  </element>
-</define>
-</div> <!-- mediaobject.element -->
-
-<dtd:pe-decl name="mediaobject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobject.attlist">
-<define name="mediaobject.attlist">
-  <ref name="common.attrib"/>
-  <ref name="mediaobject.role.attrib"/>
-  <ref name="local.mediaobject.attrib"/>
-</define>
-</div> <!-- mediaobject.attlist -->
-</div> <!-- mediaobject.module -->
-
-<dtd:pe-decl name="inlinemediaobject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlinemediaobject.module">
-<define name="local.inlinemediaobject.attrib">
-  <notAllowed/>
-</define>
-<define name="inlinemediaobject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="inlinemediaobject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlinemediaobject.element">
-<define name="inlinemediaobject.element">
-  <element name="inlinemediaobject">
-    <group>
+    </element>
+  </define>
+<!--end of mediaobject.element-->
+  <define name="mediaobject.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="mediaobject.role.attrib"/>
+    <ref name="local.mediaobject.attrib"/>
+  </define>
+<!--end of mediaobject.attlist-->
+<!--end of mediaobject.module-->
+  <define name="local.inlinemediaobject.attrib">
+    <empty/>
+  </define>
+  <define name="inlinemediaobject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="inlinemediaobject">
+    <element name="inlinemediaobject">
+      <ref name="inlinemediaobject.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
-      <choice>
-        <ref name="mediaobject.mix"/>
-      </choice>
+      <ref name="mediaobject.mix"/>
       <zeroOrMore>
         <choice>
           <ref name="mediaobject.mix"/>
-          <ref name="textobject.element"/>
+          <ref name="textobject"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- inlinemediaobject.element -->
-
-<dtd:pe-decl name="inlinemediaobject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlinemediaobject.attlist">
-<define name="inlinemediaobject.attlist">
-  <ref name="common.attrib"/>
-  <ref name="inlinemediaobject.role.attrib"/>
-  <ref name="local.inlinemediaobject.attrib"/>
-</define>
-</div> <!-- inlinemediaobject.attlist -->
-</div> <!-- inlinemediaobject.module -->
-
-<dtd:pe-decl name="videoobject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="videoobject.module">
-<define name="local.videoobject.attrib">
-  <notAllowed/>
-</define>
-<define name="videoobject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="videoobject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="videoobject.element">
-<define name="videoobject.element">
-  <element name="videoobject">
-    <group>
+    </element>
+  </define>
+<!--end of inlinemediaobject.element-->
+  <define name="inlinemediaobject.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="inlinemediaobject.role.attrib"/>
+    <ref name="local.inlinemediaobject.attrib"/>
+  </define>
+<!--end of inlinemediaobject.attlist-->
+<!--end of inlinemediaobject.module-->
+  <define name="local.videoobject.attrib">
+    <empty/>
+  </define>
+  <define name="videoobject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="videoobject">
+    <element name="videoobject">
+      <ref name="videoobject.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
-      <ref name="videodata.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- videoobject.element -->
-
-<dtd:pe-decl name="videoobject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="videoobject.attlist">
-<define name="videoobject.attlist">
-  <ref name="common.attrib"/>
-  <ref name="videoobject.role.attrib"/>
-  <ref name="local.videoobject.attrib"/>
-</define>
-</div> <!-- videoobject.attlist -->
-</div> <!-- videoobject.module -->
-
-<dtd:pe-decl name="audioobject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="audioobject.module">
-<define name="local.audioobject.attrib">
-  <notAllowed/>
-</define>
-<define name="audioobject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="audioobject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="audioobject.element">
-<define name="audioobject.element">
-  <element name="audioobject">
-    <group>
+      <ref name="videodata"/>
+    </element>
+  </define>
+<!--end of videoobject.element-->
+  <define name="videoobject.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="videoobject.role.attrib"/>
+    <ref name="local.videoobject.attrib"/>
+  </define>
+<!--end of videoobject.attlist-->
+<!--end of videoobject.module-->
+  <define name="local.audioobject.attrib">
+    <empty/>
+  </define>
+  <define name="audioobject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="audioobject">
+    <element name="audioobject">
+      <ref name="audioobject.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
-      <ref name="audiodata.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- audioobject.element -->
-
-<dtd:pe-decl name="audioobject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="audioobject.attlist">
-<define name="audioobject.attlist">
-  <ref name="common.attrib"/>
-  <ref name="audioobject.role.attrib"/>
-  <ref name="local.audioobject.attrib"/>
-</define>
-</div> <!-- audioobject.attlist -->
-</div> <!-- audioobject.module -->
-
-<dtd:pe-decl name="imageobject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imageobject.module">
-<define name="local.imageobject.attrib">
-  <notAllowed/>
-</define>
-<define name="imageobject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="imageobject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imageobject.element">
-<define name="imageobject.element">
-  <element name="imageobject">
-    <group>
+      <ref name="audiodata"/>
+    </element>
+  </define>
+<!--end of audioobject.element-->
+  <define name="audioobject.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="audioobject.role.attrib"/>
+    <ref name="local.audioobject.attrib"/>
+  </define>
+<!--end of audioobject.attlist-->
+<!--end of audioobject.module-->
+  <define name="local.imageobject.attrib">
+    <empty/>
+  </define>
+  <define name="imageobject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="imageobject">
+    <element name="imageobject">
+      <ref name="imageobject.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
-      <ref name="imagedata.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- imageobject.element -->
-
-<dtd:pe-decl name="imageobject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imageobject.attlist">
-<define name="imageobject.attlist">
-  <ref name="common.attrib"/>
-  <ref name="imageobject.role.attrib"/>
-  <ref name="local.imageobject.attrib"/>
-</define>
-</div> <!-- imageobject.attlist -->
-</div> <!-- imageobject.module -->
-
-<dtd:pe-decl name="textobject.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="textobject.module">
-<define name="local.textobject.attrib">
-  <notAllowed/>
-</define>
-<define name="textobject.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="textobject.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="textobject.element">
-<define name="textobject.element">
-  <element name="textobject">
-    <group>
+      <ref name="imagedata"/>
+    </element>
+  </define>
+<!--end of imageobject.element-->
+  <define name="imageobject.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="imageobject.role.attrib"/>
+    <ref name="local.imageobject.attrib"/>
+  </define>
+<!--end of imageobject.attlist-->
+<!--end of imageobject.module-->
+  <define name="local.textobject.attrib">
+    <empty/>
+  </define>
+  <define name="textobject.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="textobject">
+    <element name="textobject">
+      <ref name="textobject.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
       <choice>
-        <ref name="phrase.element"/>
+        <ref name="phrase"/>
         <oneOrMore>
-          <choice>
-            <ref name="textobject.mix"/>
-          </choice>
+          <ref name="textobject.mix"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- textobject.element -->
-
-<dtd:pe-decl name="textobject.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="textobject.attlist">
-<define name="textobject.attlist">
-  <ref name="common.attrib"/>
-  <ref name="textobject.role.attrib"/>
-  <ref name="local.textobject.attrib"/>
-</define>
-</div> <!-- textobject.attlist -->
-</div> <!-- textobject.module -->
-
-<dtd:pe-decl name="objectinfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="objectinfo.module">
-<define name="local.objectinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="objectinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="objectinfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="objectinfo.element">
-<define name="objectinfo.element">
-  <element name="objectinfo">
-    <group>
+    </element>
+  </define>
+<!--end of textobject.element-->
+  <define name="textobject.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="textobject.role.attrib"/>
+    <ref name="local.textobject.attrib"/>
+  </define>
+<!--end of textobject.attlist-->
+<!--end of textobject.module-->
+  <define name="local.objectinfo.attrib">
+    <empty/>
+  </define>
+  <define name="objectinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="objectinfo">
+    <element name="objectinfo">
+      <ref name="objectinfo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="graphic.element"/>
-          <ref name="mediaobject.element"/>
-          <ref name="legalnotice.element"/>
-          <ref name="modespec.element"/>
-          <ref name="subjectset.element"/>
-          <ref name="keywordset.element"/>
-          <ref name="itermset.element"/>
+          <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>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- objectinfo.element -->
-
-<dtd:pe-decl name="objectinfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="objectinfo.attlist">
-<define name="objectinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="objectinfo.role.attrib"/>
-  <ref name="local.objectinfo.attrib"/>
-</define>
-</div> <!-- objectinfo.attlist -->
-</div> <!-- objectinfo.module -->
-
-<dtd:comment>EntityRef: Name of an external entity containing the content
-	of the object data</dtd:comment>
-<dtd:comment>FileRef: Filename, qualified by a pathname if desired, 
-	designating the file containing the content of the object data</dtd:comment>
-<dtd:comment>Format: Notation of the element content, if any</dtd:comment>
-<dtd:comment>SrcCredit: Information about the source of the image</dtd:comment>
-<define name="local.objectdata.attrib">
-  <notAllowed/>
-</define>
-
-<define name="objectdata.attrib">
-  <optional>
-    <attribute name="entityref">
-      <data type="ENTITY"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="fileref"/>
-  </optional>
-  <optional>
-    <attribute name="format" dtd:type="NOTATION">
-      <ref name="notation.class"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="srccredit"/>
-  </optional>
-  <ref name="local.objectdata.attrib"/>
-</define>
-
-<dtd:pe-decl name="videodata.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="videodata.module">
-<define name="local.videodata.attrib">
-  <notAllowed/>
-</define>
-<define name="videodata.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="videodata.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="videodata.element">
-<define name="videodata.element">
-  <element name="videodata">
-    <empty/>
-  </element>
-</define>
-</div> <!-- videodata.element -->
-
-<dtd:pe-decl name="videodata.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="videodata.attlist">
-
-<dtd:comment>Width: Same as CALS reprowid (desired width)</dtd:comment>
-<dtd:comment>Depth: Same as CALS reprodep (desired depth)</dtd:comment>
-<dtd:comment>Align: Same as CALS hplace with 'none' removed; #IMPLIED means 
-	application-specific</dtd:comment>
-<dtd:comment>Scale: Conflation of CALS hscale and vscale</dtd:comment>
-<dtd:comment>Scalefit: Same as CALS scalefit</dtd:comment>
-<define name="videodata.attlist">
-  <ref name="common.attrib"/>
-  <ref name="objectdata.attrib"/>
+    </element>
+  </define>
+<!--end of objectinfo.element-->
+  <define name="objectinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="objectinfo.role.attrib"/>
+    <ref name="local.objectinfo.attrib"/>
+  </define>
+<!--end of objectinfo.attlist-->
+<!--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, 
+	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-->
+  <define name="local.objectdata.attrib">
+    <empty/>
+  </define>
+  <define name="objectdata.attrib">
+    <optional>
+      <attribute name="entityref">
+        <data type="ENTITY"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="fileref"/>
+    </optional>
+    <optional>
+      <attribute name="format">
+        <choice>
+          <ref name="notation.class"/>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="srccredit"/>
+    </optional>
+    <ref name="local.objectdata.attrib"/>
+  </define>
+  <define name="local.videodata.attrib">
+    <empty/>
+  </define>
+  <define name="videodata.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="videodata">
+    <element name="videodata">
+      <ref name="videodata.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--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 
+	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>
@@ -5275,76 +4036,59 @@ in the text (no (0) value, the default)
     <optional>
       <attribute name="scale"/>
     </optional>
-  <optional>
-    <attribute name="scalefit">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <ref name="videodata.role.attrib"/>
-  <ref name="local.videodata.attrib"/>
-</define>
-</div> <!-- videodata.attlist -->
-</div> <!-- videodata.module -->
-
-<dtd:pe-decl name="audiodata.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="audiodata.module">
-<define name="local.audiodata.attrib">
-  <notAllowed/>
-</define>
-<define name="audiodata.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="audiodata.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="audiodata.element">
-<define name="audiodata.element">
-  <element name="audiodata">
-    <empty/>
-  </element>
-</define>
-</div> <!-- audiodata.element -->
-
-<dtd:pe-decl name="audiodata.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="audiodata.attlist">
-<define name="audiodata.attlist">
-  <ref name="common.attrib"/>
-  <ref name="objectdata.attrib"/>
-  <ref name="local.audiodata.attrib"/>
-  <ref name="audiodata.role.attrib"/>
-</define>
-</div> <!-- audiodata.attlist -->
-</div> <!-- audiodata.module -->
-
-<dtd:pe-decl name="imagedata.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imagedata.module">
-<define name="local.imagedata.attrib">
-  <notAllowed/>
-</define>
-<define name="imagedata.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="imagedata.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imagedata.element">
-<define name="imagedata.element">
-  <element name="imagedata">
-    <empty/>
-  </element>
-</define>
-</div> <!-- imagedata.element -->
-
-<dtd:pe-decl name="imagedata.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imagedata.attlist">
-
-<dtd:comment>Width: Same as CALS reprowid (desired width)</dtd:comment>
-<dtd:comment>Depth: Same as CALS reprodep (desired depth)</dtd:comment>
-<dtd:comment>Align: Same as CALS hplace with 'none' removed; #IMPLIED means 
-	application-specific</dtd:comment>
-<dtd:comment>Scale: Conflation of CALS hscale and vscale</dtd:comment>
-<dtd:comment>Scalefit: Same as CALS scalefit</dtd:comment>
-<define name="imagedata.attlist">
-  <ref name="common.attrib"/>
-  <ref name="objectdata.attrib"/>
+    <optional>
+      <attribute name="scalefit">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <ref name="videodata.role.attrib"/>
+    <ref name="local.videodata.attrib"/>
+  </define>
+<!--end of videodata.attlist-->
+<!--end of videodata.module-->
+  <define name="local.audiodata.attrib">
+    <empty/>
+  </define>
+  <define name="audiodata.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="audiodata">
+    <element name="audiodata">
+      <ref name="audiodata.attlist"/>
+      <empty/>
+    </element>
+  </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="audiodata.role.attrib"/>
+  </define>
+<!--end of audiodata.attlist-->
+<!--end of audiodata.module-->
+  <define name="local.imagedata.attrib">
+    <empty/>
+  </define>
+  <define name="imagedata.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="imagedata">
+    <element name="imagedata">
+      <ref name="imagedata.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--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 
+	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>
@@ -5363,7136 +4107,5022 @@ in the text (no (0) value, the default)
     <optional>
       <attribute name="scale"/>
     </optional>
-  <optional>
-    <attribute name="scalefit">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <ref name="local.imagedata.attrib"/>
-  <ref name="imagedata.role.attrib"/>
-</define>
-</div> <!-- imagedata.attlist -->
-</div> <!-- imagedata.module -->
-
-<dtd:pe-decl name="caption.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="caption.module">
-<define name="local.caption.attrib">
-  <notAllowed/>
-</define>
-<define name="caption.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="caption.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="caption.element">
-<define name="caption.element">
-  <element name="caption">
-    <zeroOrMore>
-      <choice>
+    <optional>
+      <attribute name="scalefit">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <ref name="local.imagedata.attrib"/>
+    <ref name="imagedata.role.attrib"/>
+  </define>
+<!--end of imagedata.attlist-->
+<!--end of imagedata.module-->
+  <define name="local.caption.attrib">
+    <empty/>
+  </define>
+  <define name="caption.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="caption">
+    <element name="caption">
+      <ref name="caption.attlist"/>
+      <zeroOrMore>
         <ref name="textobject.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- caption.element -->
-
-<dtd:pe-decl name="caption.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="caption.attlist">
-<define name="caption.attlist">
-  <ref name="common.attrib"/>
-  <ref name="local.caption.attrib"/>
-  <ref name="caption.role.attrib"/>
-</define>
-</div> <!-- caption.attlist -->
-</div> <!-- caption.module -->
-
-<dtd:pe-decl name="mediaobjectco.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobjectco.module">
-<define name="local.mediaobjectco.attrib">
-  <notAllowed/>
-</define>
-<define name="mediaobjectco.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="mediaobjectco.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobjectco.element">
-<define name="mediaobjectco.element">
-  <element name="mediaobjectco">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of caption.element-->
+  <define name="caption.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="local.caption.attrib"/>
+    <ref name="caption.role.attrib"/>
+  </define>
+<!--end of caption.attlist-->
+<!--end of caption.module-->
+  <define name="local.mediaobjectco.attrib">
+    <empty/>
+  </define>
+  <define name="mediaobjectco.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="mediaobjectco">
+    <element name="mediaobjectco">
+      <ref name="mediaobjectco.attlist"/>
       <optional>
-        <ref name="objectinfo.element"/>
+        <ref name="objectinfo"/>
       </optional>
-      <ref name="imageobjectco.element"/>
+      <ref name="imageobjectco"/>
       <zeroOrMore>
         <choice>
-          <ref name="imageobjectco.element"/>
-          <ref name="textobject.element"/>
+          <ref name="imageobjectco"/>
+          <ref name="textobject"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- mediaobjectco.element -->
-
-<dtd:pe-decl name="mediaobjectco.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mediaobjectco.attlist">
-<define name="mediaobjectco.attlist">
-  <ref name="common.attrib"/>
-  <ref name="mediaobjectco.role.attrib"/>
-  <ref name="local.mediaobjectco.attrib"/>
-</define>
-</div> <!-- mediaobjectco.attlist -->
-</div> <!-- mediaobjectco.module -->
-
-<dtd:pe-decl name="imageobjectco.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imageobjectco.module">
-<define name="local.imageobjectco.attrib">
-  <notAllowed/>
-</define>
-<define name="imageobjectco.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="imageobjectco.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imageobjectco.element">
-<define name="imageobjectco.element">
-  <element name="imageobjectco">
-    <group>
-      <ref name="areaspec.element"/>
-      <ref name="imageobject.element"/>
-      <zeroOrMore>
-        <ref name="calloutlist.element"/>
-      </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- imageobjectco.element -->
-
-<dtd:pe-decl name="imageobjectco.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="imageobjectco.attlist">
-<define name="imageobjectco.attlist">
-  <ref name="common.attrib"/>
-  <ref name="imageobjectco.role.attrib"/>
-  <ref name="local.imageobjectco.attrib"/>
-</define>
-</div> <!-- imageobjectco.attlist -->
-</div> <!-- imageobjectco.module -->
-</div> <!-- mediaobject.content.module -->
-
-<dtd:comment> Equations ........................ </dtd:comment>
-
-<dtd:comment> This PE provides a mechanism for replacing equation content, </dtd:comment>
-<dtd:comment> perhaps adding a new or different model (e.g., MathML) </dtd:comment>
-
-<define name="equation.content">
-  <group>
+    </element>
+  </define>
+<!--end of mediaobjectco.element-->
+  <define name="mediaobjectco.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="mediaobjectco.role.attrib"/>
+    <ref name="local.mediaobjectco.attrib"/>
+  </define>
+<!--end of mediaobjectco.attlist-->
+<!--end of mediaobjectco.module-->
+  <define name="local.imageobjectco.attrib">
+    <empty/>
+  </define>
+  <define name="imageobjectco.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="imageobjectco">
+    <element name="imageobjectco">
+      <ref name="imageobjectco.attlist"/>
+      <ref name="areaspec"/>
+      <ref name="imageobject"/>
+      <zeroOrMore>
+        <ref name="calloutlist"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of imageobjectco.element-->
+  <define name="imageobjectco.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="imageobjectco.role.attrib"/>
+    <ref name="local.imageobjectco.attrib"/>
+  </define>
+<!--end of imageobjectco.attlist-->
+<!--end of imageobjectco.module-->
+<!--end of mediaobject.content.module-->
+<!-- Equations ........................ -->
+<!-- This PE provides a mechanism for replacing equation content, -->
+<!-- perhaps adding a new or different model (e.g., MathML) -->
+  <define name="equation.content">
     <optional>
-      <ref name="alt.element"/>
+      <ref name="alt"/>
     </optional>
     <choice>
       <oneOrMore>
-        <ref name="graphic.element"/>
+        <ref name="graphic"/>
       </oneOrMore>
       <oneOrMore>
-        <ref name="mediaobject.element"/>
+        <ref name="mediaobject"/>
       </oneOrMore>
     </choice>
-  </group>
-</define>
-
-<define name="inlineequation.content">
-  <group>
+  </define>
+  <define name="inlineequation.content">
     <optional>
-      <ref name="alt.element"/>
+      <ref name="alt"/>
     </optional>
     <choice>
       <oneOrMore>
-        <ref name="graphic.element"/>
+        <ref name="graphic"/>
       </oneOrMore>
       <oneOrMore>
-        <ref name="inlinemediaobject.element"/>
+        <ref name="inlinemediaobject"/>
       </oneOrMore>
     </choice>
-  </group>
-</define>
-
-<dtd:pe-decl name="equation.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="equation.module">
-<define name="local.equation.attrib">
-  <notAllowed/>
-</define>
-<define name="equation.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="equation.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="equation.element">
-<define name="equation.element">
-  <element name="equation">
-    <group>
+  </define>
+  <define name="local.equation.attrib">
+    <empty/>
+  </define>
+  <define name="equation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="equation">
+    <element name="equation">
+      <ref name="equation.attlist"/>
       <optional>
-        <group>
-          <ref name="formalobject.title.content"/>
-        </group>
+        <ref name="formalobject.title.content"/>
       </optional>
       <choice>
-        <ref name="informalequation.element"/>
+        <ref name="informalequation"/>
         <ref name="equation.content"/>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- equation.element -->
-
-<dtd:pe-decl name="equation.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="equation.attlist">
-<define name="equation.attlist">
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="equation.role.attrib"/>
-  <ref name="local.equation.attrib"/>
-</define>
-</div> <!-- equation.attlist -->
-</div> <!-- equation.module -->
-
-<dtd:pe-decl name="informalequation.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalequation.module">
-<define name="local.informalequation.attrib">
-  <notAllowed/>
-</define>
-<define name="informalequation.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="informalequation.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalequation.element">
-<define name="informalequation.element">
-  <element name="informalequation">
-    <group>
+    </element>
+  </define>
+<!--end of equation.element-->
+  <define name="equation.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="equation.role.attrib"/>
+    <ref name="local.equation.attrib"/>
+  </define>
+<!--end of equation.attlist-->
+<!--end of equation.module-->
+  <define name="local.informalequation.attrib">
+    <empty/>
+  </define>
+  <define name="informalequation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="informalequation">
+    <element name="informalequation">
+      <ref name="informalequation.attlist"/>
       <ref name="equation.content"/>
-    </group>
-  </element>
-</define>
-</div> <!-- informalequation.element -->
-
-<dtd:pe-decl name="informalequation.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informalequation.attlist">
-<define name="informalequation.attlist">
-  <ref name="common.attrib"/>
-  <ref name="informalequation.role.attrib"/>
-  <ref name="local.informalequation.attrib"/>
-</define>
-</div> <!-- informalequation.attlist -->
-</div> <!-- informalequation.module -->
-
-<dtd:pe-decl name="inlineequation.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlineequation.module">
-<define name="local.inlineequation.attrib">
-  <notAllowed/>
-</define>
-<define name="inlineequation.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="inlineequation.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlineequation.element">
-<define name="inlineequation.element">
-  <element name="inlineequation">
-    <group>
+    </element>
+  </define>
+<!--end of informalequation.element-->
+  <define name="informalequation.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="informalequation.role.attrib"/>
+    <ref name="local.informalequation.attrib"/>
+  </define>
+<!--end of informalequation.attlist-->
+<!--end of informalequation.module-->
+  <define name="local.inlineequation.attrib">
+    <empty/>
+  </define>
+  <define name="inlineequation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="inlineequation">
+    <element name="inlineequation">
+      <ref name="inlineequation.attlist"/>
       <ref name="inlineequation.content"/>
-    </group>
-  </element>
-</define>
-</div> <!-- inlineequation.element -->
-
-<dtd:pe-decl name="inlineequation.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="inlineequation.attlist">
-<define name="inlineequation.attlist">
-  <ref name="common.attrib"/>
-  <ref name="inlineequation.role.attrib"/>
-  <ref name="local.inlineequation.attrib"/>
-</define>
-</div> <!-- inlineequation.attlist -->
-</div> <!-- inlineequation.module -->
-
-<dtd:pe-decl name="alt.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="alt.module">
-<define name="local.alt.attrib">
-  <notAllowed/>
-</define>
-<define name="alt.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="alt.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="alt.element">
-<define name="alt.element">
-  <element name="alt">
-    <text/>
-  </element>
-</define>
-</div> <!-- alt.element -->
-
-<dtd:pe-decl name="alt.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="alt.attlist">
-<define name="alt.attlist">
-  <ref name="common.attrib"/>
-  <ref name="alt.role.attrib"/>
-  <ref name="local.alt.attrib"/>
-</define>
-</div> <!-- alt.attlist -->
-</div> <!-- alt.module -->
-
-<dtd:comment> Tables ........................... </dtd:comment>
-
-<dtd:pe-decl name="table.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="table.module">
-
-<dtd:comment> Choose a table model. CALS or OASIS XML Exchange </dtd:comment>
-
-<dtd:pe-decl name="cals.table.module">IGNORE</dtd:pe-decl>
-<dtd:div dtd:marked-section="cals.table.module">
-<dtd:pe-decl name="exchange.table.module">IGNORE</dtd:pe-decl>
-</dtd:div> <!-- cals.table.module -->
-
-<define name="tables.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<!-- hacks -->
-<define name="common.table.attribs">
-  <ref name="bodyatt"/>
-  <ref name="secur"/>
-</define>
-<define name="secur">
-  <ref name="common.attrib"/>
-  <ref name="tables.role.attrib"/>
-</define>
-<!-- /hacks -->
-
-
-<!--
-<div dtd:marked-section="cals.table.module">
-<dtd:comment> Add label and role attributes to table and informaltable </dtd:comment>
-<define name="bodyatt">
-  <ref name="label.attrib"/>
-</define>
-
-<dtd:comment> Add common attributes to Table, TGroup, TBody, THead, TFoot, Row, 
-     EntryTbl, and Entry (and InformalTable element). </dtd:comment>
-
-<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>
-
-<dtd:comment> Content model for Table. </dtd:comment>
-
-<define name="tbl.table.mdl">
-  <group>
-    <choice>
-      <ref name="formalobject.title.content"/>
-    </choice>
-    <zeroOrMore>
-      <choice>
-        <ref name="ndxterm.class"/>
-      </choice>
+    </element>
+  </define>
+<!--end of inlineequation.element-->
+  <define name="inlineequation.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="inlineequation.role.attrib"/>
+    <ref name="local.inlineequation.attrib"/>
+  </define>
+<!--end of inlineequation.attlist-->
+<!--end of inlineequation.module-->
+  <define name="local.alt.attrib">
+    <empty/>
+  </define>
+  <define name="alt.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="alt">
+    <element name="alt">
+      <ref name="alt.attlist"/>
+      <text/>
+    </element>
+  </define>
+<!--end of alt.element-->
+  <define name="alt.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="alt.role.attrib"/>
+    <ref name="local.alt.attrib"/>
+  </define>
+<!--end of alt.attlist-->
+<!--end of alt.module-->
+<!-- Tables ........................... -->
+<!-- Choose a table model. CALS or OASIS XML Exchange -->
+  <define name="tables.role.attrib">
+    <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. -->
+  <define name="tbl.table.mdl">
+    <ref name="formalobject.title.content"/>
+    <zeroOrMore>
+      <ref name="ndxterm.class"/>
     </zeroOrMore>
     <choice>
       <oneOrMore>
-        <ref name="graphic.element"/>
+        <ref name="graphic"/>
       </oneOrMore>
       <oneOrMore>
-        <ref name="mediaobject.element"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="tgroup.element"/>
-      </oneOrMore>
-    </choice>
-  </group>
-</define>
-
-<dtd:comment> Allow either objects or inlines; beware of REs between elements. </dtd:comment>
-
-<define name="tbl.entry.mdl">
-  <ref name="para.char.mix"/>
-  <ref name="tabentry.mix"/>
-</define>
-
-<dtd:comment> Reference CALS Table Model </dtd:comment>
-<dtd:pe-decl name="tablemodel"
-             public="-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN"
-             system="calstblx.dtd"/>
-</div>
--->
- <!-- cals.table.module -->
-
-<!--
-<dtd:pe-decl name="exchange.table.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="exchange.table.module">
-<dtd:comment> Add common attributes and the Label attribute to Table and </dtd:comment>
-<dtd:comment> InformalTable.                                             </dtd:comment>
-<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>
-
-<dtd:comment> Add common attributes to TGroup, ColSpec, TBody, THead, Row, Entry </dtd:comment>
-
-<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>
-
-<dtd:comment> Content model for Table. </dtd:comment>
-
-<define name="tbl.table.mdl">
-  <group>
-    <choice>
-      <ref name="formalobject.title.content"/>
-    </choice>
-    <zeroOrMore>
-      <choice>
-        <ref name="ndxterm.class"/>
-      </choice>
-    </zeroOrMore>
-    <choice>
-      <oneOrMore>
-        <ref name="graphic.element"/>
+        <ref name="mediaobject"/>
       </oneOrMore>
       <oneOrMore>
-        <ref name="tgroup.element"/>
+        <ref name="tgroup"/>
       </oneOrMore>
     </choice>
-  </group>
-</define>
-
-<dtd:comment> Allow either objects or inlines; beware of REs between elements. </dtd:comment>
-
-<define name="tbl.entry.mdl">
-  <zeroOrMore>
+  </define>
+<!-- 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>
-  </zeroOrMore>
-</define>
-
-<dtd:comment> Reference OASIS Exchange Table Model </dtd:comment>
-<dtd:pe-decl name="tablemodel"
-             public="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-             system="soextblx.dtd"/>
-</div>
--->
-<!-- exchange.table.module -->
-<dtd:pe-ref name="tablemodel"/>
-
-<include href="soextblx.rng"/>
-
-</div> <!-- table.module -->
-
-<dtd:pe-decl name="informaltable.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informaltable.module">
-
-<dtd:comment> Note that InformalTable is dependent on some of the entity
-     declarations that customize Table. </dtd:comment>
-
-<define name="local.informaltable.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:pe-decl name="informaltable.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informaltable.element">
-<define name="informaltable.element">
-  <element name="informaltable">
-    <choice>
-      <oneOrMore>
-        <ref name="graphic.element"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="mediaobject.element"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="tgroup.element"/>
-      </oneOrMore>
-    </choice>
-  </element>
-</define>
-</div> <!-- informaltable.element -->
-
-<dtd:comment> Frame, Colsep, and Rowsep must be repeated because
-		they are not in entities in the table module. </dtd:comment>
-<dtd:comment> includes TabStyle, ToCentry, ShortEntry, 
-				Orient, PgWide </dtd:comment>
-<dtd:comment> includes Label </dtd:comment>
-<dtd:comment> includes common attributes </dtd:comment>
-
-
-<dtd:pe-decl name="informaltable.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="informaltable.attlist">
-<define name="informaltable.attlist">
-  <optional>
-    <attribute name="frame">
-      <choice>
-        <value>top</value>
-        <value>bottom</value>
-        <value>topbot</value>
-        <value>all</value>
-        <value>sides</value>
-        <value>none</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="colsep">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="rowsep">
-      <ref name="yesorno.attvals"/>
-    </attribute>
-  </optional>
-  <ref name="common.table.attribs"/>
-  <ref name="tbl.table.att"/>
-  <ref name="local.informaltable.attrib"/>
-</define>
-</div> <!-- informaltable.attlist -->
-</div> <!-- informaltable.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Synopses ............................................................. </dtd:comment>
-
-<dtd:comment> Synopsis ......................... </dtd:comment>
-
-<dtd:pe-decl name="synopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopsis.module">
-<define name="local.synopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="synopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="synopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopsis.element">
-<define name="synopsis.element">
-  <element name="synopsis">
-    <zeroOrMore>
+  </define>
+<!-- Reference CALS Table Model -->
+  <include href="calstblx.rng"/>
+<!--end of table.module-->
+<!-- Note that InformalTable is dependent on some of the entity
+     declarations that customize Table. -->
+  <define name="local.informaltable.attrib">
+    <empty/>
+  </define>
+  <define name="informaltable">
+    <element name="informaltable">
+      <ref name="informaltable.attlist"/>
       <choice>
-        <ref name="para.char.mix"/>
-        <ref name="graphic.element"/>
-        <ref name="mediaobject.element"/>
-        <ref name="lineannotation.element"/>
-        <ref name="co.element"/>
+        <oneOrMore>
+          <ref name="graphic"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="mediaobject"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="tgroup"/>
+        </oneOrMore>
       </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- synopsis.element -->
-
-<dtd:pe-decl name="synopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopsis.attlist">
-<define name="synopsis.attlist">
-  <ref name="label.attrib"/>
-  <ref name="linespecific.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="synopsis.role.attrib"/>
-  <ref name="local.synopsis.attrib"/>
-</define>
-</div> <!-- synopsis.attlist -->
-
-<dtd:comment> LineAnnotation (defined in the Inlines section, below)</dtd:comment>
-</div> <!-- synopsis.module -->
-
-<dtd:comment> CmdSynopsis ...................... </dtd:comment>
-
-<dtd:pe-decl name="cmdsynopsis.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="cmdsynopsis.content.module">
-<dtd:pe-decl name="cmdsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="cmdsynopsis.module">
-<define name="local.cmdsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="cmdsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="cmdsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="cmdsynopsis.element">
-<define name="cmdsynopsis.element">
-  <element name="cmdsynopsis">
-    <group>
+    </element>
+  </define>
+<!--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, 
+				Orient, PgWide -->
+<!-- includes Label -->
+<!-- includes common attributes -->
+  <define name="informaltable.attlist" combine="interleave">
+    <optional>
+      <attribute name="frame">
+        <choice>
+          <value>top</value>
+          <value>bottom</value>
+          <value>topbot</value>
+          <value>all</value>
+          <value>sides</value>
+          <value>none</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno.attvals"/>
+      </attribute>
+    </optional>
+    <ref name="common.table.attribs"/>
+    <ref name="tbl.table.att"/>
+    <ref name="local.informaltable.attrib"/>
+  </define>
+<!--end of informaltable.attlist-->
+<!--end of informaltable.module-->
+<!-- ...................................................................... -->
+<!-- Synopses ............................................................. -->
+<!-- Synopsis ......................... -->
+  <define name="local.synopsis.attrib">
+    <empty/>
+  </define>
+  <define name="synopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="synopsis">
+    <element name="synopsis">
+      <ref name="synopsis.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="para.char.mix"/>
+          <ref name="graphic"/>
+          <ref name="mediaobject"/>
+          <ref name="lineannotation"/>
+          <ref name="co"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of synopsis.element-->
+  <define name="synopsis.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="linespecific.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="synopsis.role.attrib"/>
+    <ref name="local.synopsis.attrib"/>
+  </define>
+<!--end of synopsis.attlist-->
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!--end of synopsis.module-->
+<!-- CmdSynopsis ...................... -->
+  <define name="local.cmdsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="cmdsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="cmdsynopsis">
+    <element name="cmdsynopsis">
+      <ref name="cmdsynopsis.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="command.element"/>
-          <ref name="arg.element"/>
-          <ref name="group.element"/>
-          <ref name="sbr.element"/>
+          <ref name="command"/>
+          <ref name="arg"/>
+          <ref name="group"/>
+          <ref name="sbr"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="synopfragment.element"/>
+        <ref name="synopfragment"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- cmdsynopsis.element -->
-
-<dtd:comment> Sepchar: Character that should separate command and all 
-		top-level arguments; alternate value might be e.g., &#38;Delta; </dtd:comment>
-
-
-<dtd:pe-decl name="cmdsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="cmdsynopsis.attlist">
-<define name="cmdsynopsis.attlist">
-  <ref name="label.attrib"/>
-  <optional>
-    <attribute name="sepchar" dtd:default=" "/>
-  </optional>
-  <optional>
-    <attribute name="cmdlength"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="cmdsynopsis.role.attrib"/>
-  <ref name="local.cmdsynopsis.attrib"/>
-</define>
-</div> <!-- cmdsynopsis.attlist -->
-</div> <!-- cmdsynopsis.module -->
-
-<dtd:pe-decl name="arg.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="arg.module">
-<define name="local.arg.attrib">
-  <notAllowed/>
-</define>
-<define name="arg.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="arg.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="arg.element">
-<define name="arg.element">
-  <element name="arg">
-    <mixed>
+    </element>
+  </define>
+<!--end of cmdsynopsis.element-->
+<!-- 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"/>
+    <optional>
+      <attribute name="sepchar" a:defaultValue=" "/>
+    </optional>
+    <optional>
+      <attribute name="cmdlength"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="cmdsynopsis.role.attrib"/>
+    <ref name="local.cmdsynopsis.attrib"/>
+  </define>
+<!--end of cmdsynopsis.attlist-->
+<!--end of cmdsynopsis.module-->
+  <define name="local.arg.attrib">
+    <empty/>
+  </define>
+  <define name="arg.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="arg">
+    <element name="arg">
+      <ref name="arg.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="arg.element"/>
-          <ref name="group.element"/>
-          <ref name="option.element"/>
-          <ref name="synopfragmentref.element"/>
-          <ref name="replaceable.element"/>
-          <ref name="sbr.element"/>
+          <text/>
+          <ref name="arg"/>
+          <ref name="group"/>
+          <ref name="option"/>
+          <ref name="synopfragmentref"/>
+          <ref name="replaceable"/>
+          <ref name="sbr"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- arg.element -->
-
-<dtd:comment> Choice: Whether Arg must be supplied: Opt (optional to 
+    </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, 
-		e.g. {arg}), or Plain (required to supply, e.g. arg) </dtd:comment>
-<dtd:comment> Rep: whether Arg is repeatable: Norepeat (e.g. arg without 
-		ellipsis; the default), or Repeat (e.g. arg...) </dtd:comment>
-
-
-<dtd:pe-decl name="arg.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="arg.attlist">
-<define name="arg.attlist">
-  <optional>
-    <attribute name="choice" dtd:default="opt">
-      <choice>
-	<value>opt</value>
-	<value>req</value>
-	<value>plain</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="rep" dtd:default="norepeat">
-      <choice>
-	<value>norepeat</value>
-	<value>repeat</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="arg.role.attrib"/>
-  <ref name="local.arg.attrib"/>
-</define>
-</div> <!-- arg.attlist -->
-</div> <!-- arg.module -->
-
-<dtd:pe-decl name="group.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="group.module">
-
-<define name="local.group.attrib">
-  <notAllowed/>
-</define>
-<define name="group.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="group.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="group.element">
-<define name="group.element">
-  <element name="group">
-    <group>
+		e.g. {arg}), or Plain (required to supply, e.g. arg) -->
+<!-- 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>
+      <attribute name="choice" a:defaultValue="opt">
+        <choice>
+          <value>opt</value>
+          <value>req</value>
+          <value>plain</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rep" a:defaultValue="norepeat">
+        <choice>
+          <value>norepeat</value>
+          <value>repeat</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="arg.role.attrib"/>
+    <ref name="local.arg.attrib"/>
+  </define>
+<!--end of arg.attlist-->
+<!--end of arg.module-->
+  <define name="local.group.attrib">
+    <empty/>
+  </define>
+  <define name="group.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="group">
+    <element name="group">
+      <ref name="group.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="arg.element"/>
-          <ref name="group.element"/>
-          <ref name="option.element"/>
-          <ref name="synopfragmentref.element"/>
-          <ref name="replaceable.element"/>
-          <ref name="sbr.element"/>
+          <ref name="arg"/>
+          <ref name="group"/>
+          <ref name="option"/>
+          <ref name="synopfragmentref"/>
+          <ref name="replaceable"/>
+          <ref name="sbr"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- group.element -->
-
-<dtd:comment> Choice: Whether Group must be supplied: Opt (optional to
+    </element>
+  </define>
+<!--end of group.element-->
+<!-- Choice: Whether Group must be supplied: Opt (optional to
 		supply, e.g.  [g1|g2|g3]; the default), Req (required to
 		supply, e.g.  {g1|g2|g3}), Plain (required to supply,
 		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}}) </dtd:comment>
-<dtd:comment> Rep: whether Group is repeatable: Norepeat (e.g. group 
-		without ellipsis; the default), or Repeat (e.g. group...) </dtd:comment>
-
-
-<dtd:pe-decl name="group.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="group.attlist">
-<define name="group.attlist">
-  <optional>
-    <attribute name="choice" dtd:default="opt">
-      <choice>
-	<value>opt</value>
-	<value>req</value>
-	<value>plain</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="rep" dtd:default="norepeat">
-      <choice>
-	<value>norepeat</value>
-	<value>repeat</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="group.role.attrib"/>
-  <ref name="local.group.attrib"/>
-</define>
-</div> <!-- group.attlist -->
-</div> <!-- group.module -->
-
-<dtd:pe-decl name="sbr.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sbr.module">
-<define name="local.sbr.attrib">
-  <notAllowed/>
-</define>
-<dtd:comment> Synopsis break </dtd:comment>
-<define name="sbr.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sbr.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sbr.element">
-<define name="sbr.element">
-  <element name="sbr">
-    <empty/>
-  </element>
-</define>
-</div> <!-- sbr.element -->
-
-<dtd:pe-decl name="sbr.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sbr.attlist">
-<define name="sbr.attlist">
-  <ref name="common.attrib"/>
-  <ref name="sbr.role.attrib"/>
-  <ref name="local.sbr.attrib"/>
-</define>
-</div> <!-- sbr.attlist -->
-</div> <!-- sbr.module -->
-
-<dtd:pe-decl name="synopfragmentref.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopfragmentref.module">
-<define name="local.synopfragmentref.attrib">
-  <notAllowed/>
-</define>
-<define name="synopfragmentref.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="synopfragmentref.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopfragmentref.element">
-<define name="synopfragmentref.element">
-  <element name="synopfragmentref">
-    <text/>
-  </element>
-</define>
-</div> <!-- synopfragmentref.element -->
-
-<dtd:comment> to SynopFragment of complex synopsis
-			material for separate referencing </dtd:comment>
-
-
-<dtd:pe-decl name="synopfragmentref.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopfragmentref.attlist">
-<define name="synopfragmentref.attlist">
-  <ref name="linkendreq.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="synopfragmentref.role.attrib"/>
-  <ref name="local.synopfragmentref.attrib"/>
-</define>
-</div> <!-- synopfragmentref.attlist -->
-</div> <!-- synopfragmentref.module -->
-
-<dtd:pe-decl name="synopfragment.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopfragment.module">
-<define name="local.synopfragment.attrib">
-  <notAllowed/>
-</define>
-<define name="synopfragment.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="synopfragment.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopfragment.element">
-<define name="synopfragment.element">
-  <element name="synopfragment">
-    <group>
+		{{g1|g2|g3}}) -->
+<!-- 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>
+      <attribute name="choice" a:defaultValue="opt">
+        <choice>
+          <value>opt</value>
+          <value>req</value>
+          <value>plain</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rep" a:defaultValue="norepeat">
+        <choice>
+          <value>norepeat</value>
+          <value>repeat</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="group.role.attrib"/>
+    <ref name="local.group.attrib"/>
+  </define>
+<!--end of group.attlist-->
+<!--end of group.module-->
+  <define name="local.sbr.attrib">
+    <empty/>
+  </define>
+<!-- Synopsis break -->
+  <define name="sbr.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sbr">
+    <element name="sbr">
+      <ref name="sbr.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of sbr.element-->
+  <define name="sbr.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="sbr.role.attrib"/>
+    <ref name="local.sbr.attrib"/>
+  </define>
+<!--end of sbr.attlist-->
+<!--end of sbr.module-->
+  <define name="local.synopfragmentref.attrib">
+    <empty/>
+  </define>
+  <define name="synopfragmentref.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="synopfragmentref">
+    <element name="synopfragmentref">
+      <ref name="synopfragmentref.attlist"/>
+      <text/>
+    </element>
+  </define>
+<!--end of synopfragmentref.element-->
+<!-- to SynopFragment of complex synopsis
+			material for separate referencing -->
+  <define name="synopfragmentref.attlist" combine="interleave">
+    <ref name="linkendreq.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="synopfragmentref.role.attrib"/>
+    <ref name="local.synopfragmentref.attrib"/>
+  </define>
+<!--end of synopfragmentref.attlist-->
+<!--end of synopfragmentref.module-->
+  <define name="local.synopfragment.attrib">
+    <empty/>
+  </define>
+  <define name="synopfragment.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="synopfragment">
+    <element name="synopfragment">
+      <ref name="synopfragment.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="arg.element"/>
-          <ref name="group.element"/>
+          <ref name="arg"/>
+          <ref name="group"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- synopfragment.element -->
-
-<dtd:pe-decl name="synopfragment.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="synopfragment.attlist">
-<define name="synopfragment.attlist">
-  <ref name="idreq.common.attrib"/>
-  <ref name="synopfragment.role.attrib"/>
-  <ref name="local.synopfragment.attrib"/>
-</define>
-</div> <!-- synopfragment.attlist -->
-</div> <!-- synopfragment.module -->
-
-<dtd:comment> Command (defined in the Inlines section, below)</dtd:comment>
-<dtd:comment> Option (defined in the Inlines section, below)</dtd:comment>
-<dtd:comment> Replaceable (defined in the Inlines section, below)</dtd:comment>
-</div> <!-- cmdsynopsis.content.module -->
-
-<dtd:comment> FuncSynopsis ..................... </dtd:comment>
-
-<dtd:pe-decl name="funcsynopsis.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsis.content.module">
-<dtd:pe-decl name="funcsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsis.module">
-
-<define name="local.funcsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="funcsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="funcsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsis.element">
-<define name="funcsynopsis.element">
-  <element name="funcsynopsis">
-    <group>
+    </element>
+  </define>
+<!--end of synopfragment.element-->
+  <define name="synopfragment.attlist" combine="interleave">
+    <ref name="idreq.common.attrib"/>
+    <ref name="synopfragment.role.attrib"/>
+    <ref name="local.synopfragment.attrib"/>
+  </define>
+<!--end of synopfragment.attlist-->
+<!--end of synopfragment.module-->
+<!-- Command (defined in the Inlines section, below)-->
+<!-- Option (defined in the Inlines section, below)-->
+<!-- Replaceable (defined in the Inlines section, below)-->
+<!--end of cmdsynopsis.content.module-->
+<!-- FuncSynopsis ..................... -->
+  <define name="local.funcsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="funcsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="funcsynopsis">
+    <element name="funcsynopsis">
+      <ref name="funcsynopsis.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="funcsynopsisinfo.element"/>
-          <ref name="funcprototype.element"/>
+          <ref name="funcsynopsisinfo"/>
+          <ref name="funcprototype"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- funcsynopsis.element -->
-
-<dtd:pe-decl name="funcsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsis.attlist">
-<define name="funcsynopsis.attlist">
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="funcsynopsis.role.attrib"/>
-  <ref name="local.funcsynopsis.attrib"/>
-</define>
-</div> <!-- funcsynopsis.attlist -->
-</div> <!-- funcsynopsis.module -->
-
-<dtd:pe-decl name="funcsynopsisinfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsisinfo.module">
-<define name="local.funcsynopsisinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="funcsynopsisinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="funcsynopsisinfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsisinfo.element">
-<define name="funcsynopsisinfo.element">
-  <element name="funcsynopsisinfo">
-    <zeroOrMore>
-      <choice>
-        <ref name="cptr.char.mix"/>
-        <ref name="lineannotation.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- funcsynopsisinfo.element -->
-
-<dtd:pe-decl name="funcsynopsisinfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcsynopsisinfo.attlist">
-<define name="funcsynopsisinfo.attlist">
-  <ref name="linespecific.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="funcsynopsisinfo.role.attrib"/>
-  <ref name="local.funcsynopsisinfo.attrib"/>
-</define>
-</div> <!-- funcsynopsisinfo.attlist -->
-</div> <!-- funcsynopsisinfo.module -->
-
-<dtd:pe-decl name="funcprototype.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcprototype.module">
-<define name="local.funcprototype.attrib">
-  <notAllowed/>
-</define>
-<define name="funcprototype.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="funcprototype.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcprototype.element">
-<define name="funcprototype.element">
-  <element name="funcprototype">
-    <group>
-      <ref name="funcdef.element"/>
-      <choice>
-        <ref name="void.element"/>
-        <ref name="varargs.element"/>
+    </element>
+  </define>
+<!--end of funcsynopsis.element-->
+  <define name="funcsynopsis.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="funcsynopsis.role.attrib"/>
+    <ref name="local.funcsynopsis.attrib"/>
+  </define>
+<!--end of funcsynopsis.attlist-->
+<!--end of funcsynopsis.module-->
+  <define name="local.funcsynopsisinfo.attrib">
+    <empty/>
+  </define>
+  <define name="funcsynopsisinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="funcsynopsisinfo">
+    <element name="funcsynopsisinfo">
+      <ref name="funcsynopsisinfo.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="cptr.char.mix"/>
+          <ref name="lineannotation"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of funcsynopsisinfo.element-->
+  <define name="funcsynopsisinfo.attlist" combine="interleave">
+    <ref name="linespecific.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="funcsynopsisinfo.role.attrib"/>
+    <ref name="local.funcsynopsisinfo.attrib"/>
+  </define>
+<!--end of funcsynopsisinfo.attlist-->
+<!--end of funcsynopsisinfo.module-->
+  <define name="local.funcprototype.attrib">
+    <empty/>
+  </define>
+  <define name="funcprototype.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="funcprototype">
+    <element name="funcprototype">
+      <ref name="funcprototype.attlist"/>
+      <ref name="funcdef"/>
+      <choice>
+        <ref name="void"/>
+        <ref name="varargs"/>
         <oneOrMore>
-          <ref name="paramdef.element"/>
+          <ref name="paramdef"/>
         </oneOrMore>
       </choice>
-    </group>
-  </element>
-</define>
-</div> <!-- funcprototype.element -->
-
-<dtd:pe-decl name="funcprototype.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcprototype.attlist">
-<define name="funcprototype.attlist">
-  <ref name="common.attrib"/>
-  <ref name="funcprototype.role.attrib"/>
-  <ref name="local.funcprototype.attrib"/>
-</define>
-</div> <!-- funcprototype.attlist -->
-</div> <!-- funcprototype.module -->
-
-<dtd:pe-decl name="funcdef.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcdef.module">
-<define name="local.funcdef.attrib">
-  <notAllowed/>
-</define>
-<define name="funcdef.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="funcdef.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcdef.element">
-<define name="funcdef.element">
-  <element name="funcdef">
-    <mixed>
+    </element>
+  </define>
+<!--end of funcprototype.element-->
+  <define name="funcprototype.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="funcprototype.role.attrib"/>
+    <ref name="local.funcprototype.attrib"/>
+  </define>
+<!--end of funcprototype.attlist-->
+<!--end of funcprototype.module-->
+  <define name="local.funcdef.attrib">
+    <empty/>
+  </define>
+  <define name="funcdef.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="funcdef">
+    <element name="funcdef">
+      <ref name="funcdef.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="replaceable.element"/>
-          <ref name="function.element"/>
+          <text/>
+          <ref name="replaceable"/>
+          <ref name="function"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- funcdef.element -->
-
-<dtd:pe-decl name="funcdef.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcdef.attlist">
-<define name="funcdef.attlist">
-  <ref name="common.attrib"/>
-  <ref name="funcdef.role.attrib"/>
-  <ref name="local.funcdef.attrib"/>
-</define>
-</div> <!-- funcdef.attlist -->
-</div> <!-- funcdef.module -->
-
-<dtd:pe-decl name="void.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="void.module">
-<define name="local.void.attrib">
-  <notAllowed/>
-</define>
-<define name="void.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="void.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="void.element">
-<define name="void.element">
-  <element name="void">
-    <empty/>
-  </element>
-</define>
-</div> <!-- void.element -->
-
-<dtd:pe-decl name="void.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="void.attlist">
-<define name="void.attlist">
-  <ref name="common.attrib"/>
-  <ref name="void.role.attrib"/>
-  <ref name="local.void.attrib"/>
-</define>
-</div> <!-- void.attlist -->
-</div> <!-- void.module -->
-
-<dtd:pe-decl name="varargs.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varargs.module">
-<define name="local.varargs.attrib">
-  <notAllowed/>
-</define>
-<define name="varargs.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="varargs.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varargs.element">
-<define name="varargs.element">
-  <element name="varargs">
-    <empty/>
-  </element>
-</define>
-</div> <!-- varargs.element -->
-
-<dtd:pe-decl name="varargs.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varargs.attlist">
-<define name="varargs.attlist">
-  <ref name="common.attrib"/>
-  <ref name="varargs.role.attrib"/>
-  <ref name="local.varargs.attrib"/>
-</define>
-</div> <!-- varargs.attlist -->
-</div> <!-- varargs.module -->
-
-<dtd:comment> Processing assumes that only one Parameter will appear in a
+    </element>
+  </define>
+<!--end of funcdef.element-->
+  <define name="funcdef.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="funcdef.role.attrib"/>
+    <ref name="local.funcdef.attrib"/>
+  </define>
+<!--end of funcdef.attlist-->
+<!--end of funcdef.module-->
+  <define name="local.void.attrib">
+    <empty/>
+  </define>
+  <define name="void.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="void">
+    <element name="void">
+      <ref name="void.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of void.element-->
+  <define name="void.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="void.role.attrib"/>
+    <ref name="local.void.attrib"/>
+  </define>
+<!--end of void.attlist-->
+<!--end of void.module-->
+  <define name="local.varargs.attrib">
+    <empty/>
+  </define>
+  <define name="varargs.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="varargs">
+    <element name="varargs">
+      <ref name="varargs.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of varargs.element-->
+  <define name="varargs.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="varargs.role.attrib"/>
+    <ref name="local.varargs.attrib"/>
+  </define>
+<!--end of varargs.attlist-->
+<!--end of varargs.module-->
+<!-- Processing assumes that only one Parameter will appear in a
      ParamDef, and that FuncParams will be used at most once, for
      providing information on the "inner parameters" for parameters that
-     are pointers to functions. </dtd:comment>
-
-<dtd:pe-decl name="paramdef.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="paramdef.module">
-<define name="local.paramdef.attrib">
-  <notAllowed/>
-</define>
-<define name="paramdef.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="paramdef.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="paramdef.element">
-<define name="paramdef.element">
-  <element name="paramdef">
-    <mixed>
+     are pointers to functions. -->
+  <define name="local.paramdef.attrib">
+    <empty/>
+  </define>
+  <define name="paramdef.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="paramdef">
+    <element name="paramdef">
+      <ref name="paramdef.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="replaceable.element"/>
-          <ref name="parameter.element"/>
-          <ref name="funcparams.element"/>
+          <text/>
+          <ref name="replaceable"/>
+          <ref name="parameter"/>
+          <ref name="funcparams"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- paramdef.element -->
-
-<dtd:pe-decl name="paramdef.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="paramdef.attlist">
-<define name="paramdef.attlist">
-  <ref name="common.attrib"/>
-  <ref name="paramdef.role.attrib"/>
-  <ref name="local.paramdef.attrib"/>
-</define>
-</div> <!-- paramdef.attlist -->
-</div> <!-- paramdef.module -->
-
-<dtd:pe-decl name="funcparams.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcparams.module">
-<define name="local.funcparams.attrib">
-  <notAllowed/>
-</define>
-<define name="funcparams.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="funcparams.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcparams.element">
-<define name="funcparams.element">
-  <element name="funcparams">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of paramdef.element-->
+  <define name="paramdef.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="paramdef.role.attrib"/>
+    <ref name="local.paramdef.attrib"/>
+  </define>
+<!--end of paramdef.attlist-->
+<!--end of paramdef.module-->
+  <define name="local.funcparams.attrib">
+    <empty/>
+  </define>
+  <define name="funcparams.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="funcparams">
+    <element name="funcparams">
+      <ref name="funcparams.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- funcparams.element -->
-
-<dtd:pe-decl name="funcparams.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="funcparams.attlist">
-<define name="funcparams.attlist">
-  <ref name="common.attrib"/>
-  <ref name="funcparams.role.attrib"/>
-  <ref name="local.funcparams.attrib"/>
-</define>
-</div> <!-- funcparams.attlist -->
-</div> <!-- funcparams.module -->
-
-<dtd:comment> LineAnnotation (defined in the Inlines section, below)</dtd:comment>
-<dtd:comment> Replaceable (defined in the Inlines section, below)</dtd:comment>
-<dtd:comment> Function (defined in the Inlines section, below)</dtd:comment>
-<dtd:comment> Parameter (defined in the Inlines section, below)</dtd:comment>
-</div> <!-- funcsynopsis.content.module -->
-
-<dtd:comment> ClassSynopsis ..................... </dtd:comment>
-
-<dtd:pe-decl name="classsynopsis.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsis.content.module">
-
-<dtd:pe-decl name="classsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsis.module">
-<define name="local.classsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="classsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="classsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsis.element">
-<define name="classsynopsis.element">
-  <element name="classsynopsis">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of funcparams.element-->
+  <define name="funcparams.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="funcparams.role.attrib"/>
+    <ref name="local.funcparams.attrib"/>
+  </define>
+<!--end of funcparams.attlist-->
+<!--end of funcparams.module-->
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!-- Replaceable (defined in the Inlines section, below)-->
+<!-- Function (defined in the Inlines section, below)-->
+<!-- Parameter (defined in the Inlines section, below)-->
+<!--end of funcsynopsis.content.module-->
+<!-- ClassSynopsis ..................... -->
+  <define name="local.classsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="classsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="classsynopsis">
+    <element name="classsynopsis">
+      <ref name="classsynopsis.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="ooclass.element"/>
-          <ref name="oointerface.element"/>
-          <ref name="ooexception.element"/>
+          <ref name="ooclass"/>
+          <ref name="oointerface"/>
+          <ref name="ooexception"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
         <choice>
-          <ref name="classsynopsisinfo.element"/>
-          <ref name="fieldsynopsis.element"/>
+          <ref name="classsynopsisinfo"/>
+          <ref name="fieldsynopsis"/>
           <ref name="method.synop.class"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- classsynopsis.element -->
-
-<dtd:pe-decl name="classsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsis.attlist">
-<define name="classsynopsis.attlist">
-  <ref name="common.attrib"/>
-  <ref name="classsynopsis.role.attrib"/>
-  <ref name="local.classsynopsis.attrib"/>
-  <optional>
-    <attribute name="language"/>
-  </optional>
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>class</value>
-        <value>interface</value>
-      </choice>
-    </attribute>
-  </optional>
-</define>
-</div> <!-- classsynopsis.attlist -->
-</div> <!-- classsynopsis.module -->
-
-<dtd:pe-decl name="classsynopsisinfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsisinfo.module">
-<define name="local.classsynopsisinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="classsynopsisinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="classsynopsisinfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsisinfo.element">
-<define name="classsynopsisinfo.element">
-  <element name="classsynopsisinfo">
-    <zeroOrMore>
-      <choice>
-        <ref name="cptr.char.mix"/>
-        <ref name="lineannotation.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- classsynopsisinfo.element -->
-
-<dtd:pe-decl name="classsynopsisinfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classsynopsisinfo.attlist">
-<define name="classsynopsisinfo.attlist">
-  <ref name="linespecific.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="classsynopsisinfo.role.attrib"/>
-  <ref name="local.classsynopsisinfo.attrib"/>
-</define>
-</div> <!-- classsynopsisinfo.attlist -->
-</div> <!-- classsynopsisinfo.module -->
-
-<dtd:pe-decl name="ooclass.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ooclass.module">
-<define name="local.ooclass.attrib">
-  <notAllowed/>
-</define>
-<define name="ooclass.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="ooclass.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ooclass.element">
-<define name="ooclass.element">
-  <element name="ooclass">
-    <group>
-      <zeroOrMore>
-        <ref name="modifier.element"/>
-      </zeroOrMore>
-      <ref name="classname.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- ooclass.element -->
-
-<dtd:pe-decl name="ooclass.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ooclass.attlist">
-<define name="ooclass.attlist">
-  <ref name="common.attrib"/>
-  <ref name="ooclass.role.attrib"/>
-  <ref name="local.ooclass.attrib"/>
-</define>
-</div> <!-- ooclass.attlist -->
-</div> <!-- ooclass.module -->
-
-<dtd:pe-decl name="oointerface.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="oointerface.module">
-<define name="local.oointerface.attrib">
-  <notAllowed/>
-</define>
-<define name="oointerface.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="oointerface.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="oointerface.element">
-<define name="oointerface.element">
-  <element name="oointerface">
-    <group>
-      <zeroOrMore>
-        <ref name="modifier.element"/>
-      </zeroOrMore>
-      <ref name="interfacename.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- oointerface.element -->
-
-<dtd:pe-decl name="oointerface.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="oointerface.attlist">
-<define name="oointerface.attlist">
-  <ref name="common.attrib"/>
-  <ref name="oointerface.role.attrib"/>
-  <ref name="local.oointerface.attrib"/>
-</define>
-</div> <!-- oointerface.attlist -->
-</div> <!-- oointerface.module -->
-
-<dtd:pe-decl name="ooexception.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ooexception.module">
-<define name="local.ooexception.attrib">
-  <notAllowed/>
-</define>
-<define name="ooexception.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="ooexception.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ooexception.element">
-<define name="ooexception.element">
-  <element name="ooexception">
-    <group>
-      <zeroOrMore>
-        <ref name="modifier.element"/>
-      </zeroOrMore>
-      <ref name="exceptionname.element"/>
-    </group>
-  </element>
-</define>
-</div> <!-- ooexception.element -->
-
-<dtd:pe-decl name="ooexception.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ooexception.attlist">
-<define name="ooexception.attlist">
-  <ref name="common.attrib"/>
-  <ref name="ooexception.role.attrib"/>
-  <ref name="local.ooexception.attrib"/>
-</define>
-</div> <!-- ooexception.attlist -->
-</div> <!-- ooexception.module -->
-
-<dtd:pe-decl name="modifier.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="modifier.module">
-<define name="local.modifier.attrib">
-  <notAllowed/>
-</define>
-<define name="modifier.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="modifier.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="modifier.element">
-<define name="modifier.element">
-  <element name="modifier">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </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>
+    <optional>
+      <attribute name="class" a:defaultValue="class">
+        <choice>
+          <value>class</value>
+          <value>interface</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+<!--end of classsynopsis.attlist-->
+<!--end of classsynopsis.module-->
+  <define name="local.classsynopsisinfo.attrib">
+    <empty/>
+  </define>
+  <define name="classsynopsisinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="classsynopsisinfo">
+    <element name="classsynopsisinfo">
+      <ref name="classsynopsisinfo.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="cptr.char.mix"/>
+          <ref name="lineannotation"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of classsynopsisinfo.element-->
+  <define name="classsynopsisinfo.attlist" combine="interleave">
+    <ref name="linespecific.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="classsynopsisinfo.role.attrib"/>
+    <ref name="local.classsynopsisinfo.attrib"/>
+  </define>
+<!--end of classsynopsisinfo.attlist-->
+<!--end of classsynopsisinfo.module-->
+  <define name="local.ooclass.attrib">
+    <empty/>
+  </define>
+  <define name="ooclass.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="ooclass">
+    <element name="ooclass">
+      <ref name="ooclass.attlist"/>
+      <zeroOrMore>
+        <ref name="modifier"/>
+      </zeroOrMore>
+      <ref name="classname"/>
+    </element>
+  </define>
+<!--end of ooclass.element-->
+  <define name="ooclass.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="ooclass.role.attrib"/>
+    <ref name="local.ooclass.attrib"/>
+  </define>
+<!--end of ooclass.attlist-->
+<!--end of ooclass.module-->
+  <define name="local.oointerface.attrib">
+    <empty/>
+  </define>
+  <define name="oointerface.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="oointerface">
+    <element name="oointerface">
+      <ref name="oointerface.attlist"/>
+      <zeroOrMore>
+        <ref name="modifier"/>
+      </zeroOrMore>
+      <ref name="interfacename"/>
+    </element>
+  </define>
+<!--end of oointerface.element-->
+  <define name="oointerface.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="oointerface.role.attrib"/>
+    <ref name="local.oointerface.attrib"/>
+  </define>
+<!--end of oointerface.attlist-->
+<!--end of oointerface.module-->
+  <define name="local.ooexception.attrib">
+    <empty/>
+  </define>
+  <define name="ooexception.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="ooexception">
+    <element name="ooexception">
+      <ref name="ooexception.attlist"/>
+      <zeroOrMore>
+        <ref name="modifier"/>
+      </zeroOrMore>
+      <ref name="exceptionname"/>
+    </element>
+  </define>
+<!--end of ooexception.element-->
+  <define name="ooexception.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="ooexception.role.attrib"/>
+    <ref name="local.ooexception.attrib"/>
+  </define>
+<!--end of ooexception.attlist-->
+<!--end of ooexception.module-->
+  <define name="local.modifier.attrib">
+    <empty/>
+  </define>
+  <define name="modifier.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="modifier">
+    <element name="modifier">
+      <ref name="modifier.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- modifier.element -->
-
-<dtd:pe-decl name="modifier.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="modifier.attlist">
-<define name="modifier.attlist">
-  <ref name="common.attrib"/>
-  <ref name="modifier.role.attrib"/>
-  <ref name="local.modifier.attrib"/>
-</define>
-</div> <!-- modifier.attlist -->
-</div> <!-- modifier.module -->
-
-<dtd:pe-decl name="interfacename.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="interfacename.module">
-<define name="local.interfacename.attrib">
-  <notAllowed/>
-</define>
-<define name="interfacename.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="interfacename.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="interfacename.element">
-<define name="interfacename.element">
-  <element name="interfacename">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of modifier.element-->
+  <define name="modifier.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="modifier.role.attrib"/>
+    <ref name="local.modifier.attrib"/>
+  </define>
+<!--end of modifier.attlist-->
+<!--end of modifier.module-->
+  <define name="local.interfacename.attrib">
+    <empty/>
+  </define>
+  <define name="interfacename.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="interfacename">
+    <element name="interfacename">
+      <ref name="interfacename.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- interfacename.element -->
-
-<dtd:pe-decl name="interfacename.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="interfacename.attlist">
-<define name="interfacename.attlist">
-  <ref name="common.attrib"/>
-  <ref name="interfacename.role.attrib"/>
-  <ref name="local.interfacename.attrib"/>
-</define>
-</div> <!-- interfacename.attlist -->
-</div> <!-- interfacename.module -->
-
-<dtd:pe-decl name="exceptionname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="exceptionname.module">
-<define name="local.exceptionname.attrib">
-  <notAllowed/>
-</define>
-<define name="exceptionname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="exceptionname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="exceptionname.element">
-<define name="exceptionname.element">
-  <element name="exceptionname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of interfacename.element-->
+  <define name="interfacename.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="interfacename.role.attrib"/>
+    <ref name="local.interfacename.attrib"/>
+  </define>
+<!--end of interfacename.attlist-->
+<!--end of interfacename.module-->
+  <define name="local.exceptionname.attrib">
+    <empty/>
+  </define>
+  <define name="exceptionname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="exceptionname">
+    <element name="exceptionname">
+      <ref name="exceptionname.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- exceptionname.element -->
-
-<dtd:pe-decl name="exceptionname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="exceptionname.attlist">
-<define name="exceptionname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="exceptionname.role.attrib"/>
-  <ref name="local.exceptionname.attrib"/>
-</define>
-</div> <!-- exceptionname.attlist -->
-</div> <!-- exceptionname.module -->
-
-<dtd:pe-decl name="fieldsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="fieldsynopsis.module">
-<define name="local.fieldsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="fieldsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="fieldsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="fieldsynopsis.element">
-<define name="fieldsynopsis.element">
-  <element name="fieldsynopsis">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of exceptionname.element-->
+  <define name="exceptionname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="exceptionname.role.attrib"/>
+    <ref name="local.exceptionname.attrib"/>
+  </define>
+<!--end of exceptionname.attlist-->
+<!--end of exceptionname.module-->
+  <define name="local.fieldsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="fieldsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="fieldsynopsis">
+    <element name="fieldsynopsis">
+      <ref name="fieldsynopsis.attlist"/>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
       <optional>
-        <ref name="type.element"/>
+        <ref name="type"/>
       </optional>
-      <ref name="varname.element"/>
+      <ref name="varname"/>
       <optional>
-        <ref name="initializer.element"/>
+        <ref name="initializer"/>
       </optional>
-    </group>
-  </element>
-</define>
-</div> <!-- fieldsynopsis.element -->
-
-<dtd:pe-decl name="fieldsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="fieldsynopsis.attlist">
-<define name="fieldsynopsis.attlist">
-  <ref name="common.attrib"/>
-  <ref name="fieldsynopsis.role.attrib"/>
-  <ref name="local.fieldsynopsis.attrib"/>
-</define>
-</div> <!-- fieldsynopsis.attlist -->
-</div> <!-- fieldsynopsis.module -->
-
-<dtd:pe-decl name="initializer.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="initializer.module">
-<define name="local.initializer.attrib">
-  <notAllowed/>
-</define>
-<define name="initializer.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="initializer.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="initializer.element">
-<define name="initializer.element">
-  <element name="initializer">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of fieldsynopsis.element-->
+  <define name="fieldsynopsis.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="fieldsynopsis.role.attrib"/>
+    <ref name="local.fieldsynopsis.attrib"/>
+  </define>
+<!--end of fieldsynopsis.attlist-->
+<!--end of fieldsynopsis.module-->
+  <define name="local.initializer.attrib">
+    <empty/>
+  </define>
+  <define name="initializer.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="initializer">
+    <element name="initializer">
+      <ref name="initializer.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- initializer.element -->
-
-<dtd:pe-decl name="initializer.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="initializer.attlist">
-<define name="initializer.attlist">
-  <ref name="common.attrib"/>
-  <ref name="initializer.role.attrib"/>
-  <ref name="local.initializer.attrib"/>
-</define>
-</div> <!-- initializer.attlist -->
-</div> <!-- initializer.module -->
-
-<dtd:pe-decl name="constructorsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="constructorsynopsis.module">
-<define name="local.constructorsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="constructorsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="constructorsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="constructorsynopsis.element">
-<define name="constructorsynopsis.element">
-  <element name="constructorsynopsis">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of initializer.element-->
+  <define name="initializer.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="initializer.role.attrib"/>
+    <ref name="local.initializer.attrib"/>
+  </define>
+<!--end of initializer.attlist-->
+<!--end of initializer.module-->
+  <define name="local.constructorsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="constructorsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="constructorsynopsis">
+    <element name="constructorsynopsis">
+      <ref name="constructorsynopsis.attlist"/>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
       <optional>
-        <ref name="methodname.element"/>
+        <ref name="methodname"/>
       </optional>
       <choice>
         <oneOrMore>
-          <ref name="methodparam.element"/>
+          <ref name="methodparam"/>
         </oneOrMore>
-        <ref name="void.element"/>
+        <ref name="void"/>
       </choice>
       <zeroOrMore>
-        <ref name="exceptionname.element"/>
+        <ref name="exceptionname"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- constructorsynopsis.element -->
-
-<dtd:pe-decl name="constructorsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="constructorsynopsis.attlist">
-<define name="constructorsynopsis.attlist">
-  <ref name="common.attrib"/>
-  <ref name="constructorsynopsis.role.attrib"/>
-  <ref name="local.constructorsynopsis.attrib"/>
-</define>
-</div> <!-- constructorsynopsis.attlist -->
-</div> <!-- constructorsynopsis.module -->
-
-<dtd:pe-decl name="destructorsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="destructorsynopsis.module">
-<define name="local.destructorsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="destructorsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="destructorsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="destructorsynopsis.element">
-<define name="destructorsynopsis.element">
-  <element name="destructorsynopsis">
-    <group>
+    </element>
+  </define>
+<!--end of constructorsynopsis.element-->
+  <define name="constructorsynopsis.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="constructorsynopsis.role.attrib"/>
+    <ref name="local.constructorsynopsis.attrib"/>
+  </define>
+<!--end of constructorsynopsis.attlist-->
+<!--end of constructorsynopsis.module-->
+  <define name="local.destructorsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="destructorsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="destructorsynopsis">
+    <element name="destructorsynopsis">
+      <ref name="destructorsynopsis.attlist"/>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
       <optional>
-        <ref name="methodname.element"/>
+        <ref name="methodname"/>
       </optional>
       <choice>
         <oneOrMore>
-          <ref name="methodparam.element"/>
+          <ref name="methodparam"/>
         </oneOrMore>
-        <ref name="void.element"/>
+        <ref name="void"/>
       </choice>
       <zeroOrMore>
-        <ref name="exceptionname.element"/>
+        <ref name="exceptionname"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- destructorsynopsis.element -->
-
-<dtd:pe-decl name="destructorsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="destructorsynopsis.attlist">
-<define name="destructorsynopsis.attlist">
-  <ref name="common.attrib"/>
-  <ref name="destructorsynopsis.role.attrib"/>
-  <ref name="local.destructorsynopsis.attrib"/>
-</define>
-</div> <!-- destructorsynopsis.attlist -->
-</div> <!-- destructorsynopsis.module -->
-
-<dtd:pe-decl name="methodsynopsis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodsynopsis.module">
-<define name="local.methodsynopsis.attrib">
-  <notAllowed/>
-</define>
-<define name="methodsynopsis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="methodsynopsis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodsynopsis.element">
-<define name="methodsynopsis.element">
-  <element name="methodsynopsis">
-    <group>
+    </element>
+  </define>
+<!--end of destructorsynopsis.element-->
+  <define name="destructorsynopsis.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="destructorsynopsis.role.attrib"/>
+    <ref name="local.destructorsynopsis.attrib"/>
+  </define>
+<!--end of destructorsynopsis.attlist-->
+<!--end of destructorsynopsis.module-->
+  <define name="local.methodsynopsis.attrib">
+    <empty/>
+  </define>
+  <define name="methodsynopsis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="methodsynopsis">
+    <element name="methodsynopsis">
+      <ref name="methodsynopsis.attlist"/>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
       <optional>
         <choice>
-          <ref name="type.element"/>
-          <ref name="void.element"/>
+          <ref name="type"/>
+          <ref name="void"/>
         </choice>
       </optional>
-      <ref name="methodname.element"/>
+      <ref name="methodname"/>
       <choice>
         <oneOrMore>
-          <ref name="methodparam.element"/>
+          <ref name="methodparam"/>
         </oneOrMore>
-        <ref name="void.element"/>
+        <ref name="void"/>
       </choice>
       <zeroOrMore>
-        <ref name="exceptionname.element"/>
+        <ref name="exceptionname"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- methodsynopsis.element -->
-
-<dtd:pe-decl name="methodsynopsis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodsynopsis.attlist">
-<define name="methodsynopsis.attlist">
-  <ref name="common.attrib"/>
-  <ref name="methodsynopsis.role.attrib"/>
-  <ref name="local.methodsynopsis.attrib"/>
-</define>
-</div> <!-- methodsynopsis.attlist -->
-</div> <!-- methodsynopsis.module -->
-
-<dtd:pe-decl name="methodname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodname.module">
-<define name="local.methodname.attrib">
-  <notAllowed/>
-</define>
-<define name="methodname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="methodname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodname.element">
-<define name="methodname.element">
-  <element name="methodname">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of methodsynopsis.element-->
+  <define name="methodsynopsis.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="methodsynopsis.role.attrib"/>
+    <ref name="local.methodsynopsis.attrib"/>
+  </define>
+<!--end of methodsynopsis.attlist-->
+<!--end of methodsynopsis.module-->
+  <define name="local.methodname.attrib">
+    <empty/>
+  </define>
+  <define name="methodname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="methodname">
+    <element name="methodname">
+      <ref name="methodname.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- methodname.element -->
-
-<dtd:pe-decl name="methodname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodname.attlist">
-<define name="methodname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="methodname.role.attrib"/>
-  <ref name="local.methodname.attrib"/>
-</define>
-</div> <!-- methodname.attlist -->
-</div> <!-- methodname.module -->
-
-<dtd:pe-decl name="methodparam.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodparam.module">
-<define name="local.methodparam.attrib">
-  <notAllowed/>
-</define>
-<define name="methodparam.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="methodparam.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodparam.element">
-<define name="methodparam.element">
-  <element name="methodparam">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of methodname.element-->
+  <define name="methodname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="methodname.role.attrib"/>
+    <ref name="local.methodname.attrib"/>
+  </define>
+<!--end of methodname.attlist-->
+<!--end of methodname.module-->
+  <define name="local.methodparam.attrib">
+    <empty/>
+  </define>
+  <define name="methodparam.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="methodparam">
+    <element name="methodparam">
+      <ref name="methodparam.attlist"/>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
       <optional>
-        <ref name="type.element"/>
+        <ref name="type"/>
       </optional>
       <choice>
         <group>
-          <ref name="parameter.element"/>
+          <ref name="parameter"/>
           <optional>
-            <ref name="initializer.element"/>
+            <ref name="initializer"/>
           </optional>
         </group>
-        <ref name="funcparams.element"/>
+        <ref name="funcparams"/>
       </choice>
       <zeroOrMore>
-        <ref name="modifier.element"/>
+        <ref name="modifier"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- methodparam.element -->
-
-<dtd:pe-decl name="methodparam.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="methodparam.attlist">
-<define name="methodparam.attlist">
-  <ref name="common.attrib"/>
-  <ref name="methodparam.role.attrib"/>
-  <ref name="local.methodparam.attrib"/>
-  <optional>
-    <attribute name="choice" dtd:default="opt">
-      <choice>
-	<value>opt</value>
-	<value>req</value>
-	<value>plain</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="rep" dtd:default="norepeat">
-      <choice>
-	<value>norepeat</value>
-	<value>repeat</value>
-      </choice>
-    </attribute>
-  </optional>
-</define>
-</div> <!-- methodparam.attlist -->
-</div> <!-- methodparam.module -->
-</div> <!-- classsynopsis.content.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Document information entities and elements ........................... </dtd:comment>
-
-<dtd:comment> The document information elements include some elements that are
+    </element>
+  </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>
+          <value>opt</value>
+          <value>req</value>
+          <value>plain</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rep" a:defaultValue="norepeat">
+        <choice>
+          <value>norepeat</value>
+          <value>repeat</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+<!--end of methodparam.attlist-->
+<!--end of methodparam.module-->
+<!--end of classsynopsis.content.module-->
+<!-- ...................................................................... -->
+<!-- Document information entities and elements ........................... -->
+<!-- The document information elements include some elements that are
      currently used only in the document hierarchy module. They are
      defined here so that they will be available for use in customized
-     document hierarchies. </dtd:comment>
-
-<dtd:comment> .................................. </dtd:comment>
-
-<dtd:pe-decl name="docinfo.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="docinfo.content.module">
-
-<dtd:comment> Ackno ............................ </dtd:comment>
-
-<dtd:pe-decl name="ackno.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ackno.module">
-<define name="local.ackno.attrib">
-  <notAllowed/>
-</define>
-<define name="ackno.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="ackno.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ackno.element">
-<define name="ackno.element">
-  <element name="ackno">
-    <zeroOrMore>
-      <choice>
+     document hierarchies. -->
+<!-- .................................. -->
+<!-- Ackno ............................ -->
+  <define name="local.ackno.attrib">
+    <empty/>
+  </define>
+  <define name="ackno.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="ackno">
+    <element name="ackno">
+      <ref name="ackno.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- ackno.element -->
-
-<dtd:pe-decl name="ackno.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ackno.attlist">
-<define name="ackno.attlist">
-  <ref name="common.attrib"/>
-  <ref name="ackno.role.attrib"/>
-  <ref name="local.ackno.attrib"/>
-</define>
-</div> <!-- ackno.attlist -->
-</div> <!-- ackno.module -->
-
-<dtd:comment> Address .......................... </dtd:comment>
-
-<dtd:pe-decl name="address.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="address.content.module">
-<dtd:pe-decl name="address.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="address.module">
-<define name="local.address.attrib">
-  <notAllowed/>
-</define>
-<define name="address.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="address.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="address.element">
-<define name="address.element">
-  <element name="address">
-    <mixed>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of ackno.element-->
+  <define name="ackno.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="ackno.role.attrib"/>
+    <ref name="local.ackno.attrib"/>
+  </define>
+<!--end of ackno.attlist-->
+<!--end of ackno.module-->
+<!-- Address .......................... -->
+  <define name="local.address.attrib">
+    <empty/>
+  </define>
+  <define name="address.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="address">
+    <element name="address">
+      <ref name="address.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="person.ident.mix"/>
-          <ref name="street.element"/>
-          <ref name="pob.element"/>
-          <ref name="postcode.element"/>
-          <ref name="city.element"/>
-          <ref name="state.element"/>
-          <ref name="country.element"/>
-          <ref name="phone.element"/>
-          <ref name="fax.element"/>
-          <ref name="email.element"/>
-          <ref name="otheraddr.element"/>
+          <ref name="street"/>
+          <ref name="pob"/>
+          <ref name="postcode"/>
+          <ref name="city"/>
+          <ref name="state"/>
+          <ref name="country"/>
+          <ref name="phone"/>
+          <ref name="fax"/>
+          <ref name="email"/>
+          <ref name="otheraddr"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- address.element -->
-
-<dtd:pe-decl name="address.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="address.attlist">
-<define name="address.attlist">
-  <ref name="linespecific.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="address.role.attrib"/>
-  <ref name="local.address.attrib"/>
-</define>
-</div> <!-- address.attlist -->
-</div> <!-- address.module -->
-
-    <dtd:pe-decl name="street.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="street.module">
- <define name="local.street.attrib">
-  <notAllowed/>
-</define>
+    </element>
+  </define>
+<!--end of address.element-->
+  <define name="address.attlist" combine="interleave">
+    <ref name="linespecific.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="address.role.attrib"/>
+    <ref name="local.address.attrib"/>
+  </define>
+<!--end of address.attlist-->
+<!--end of address.module-->
+  <define name="local.street.attrib">
+    <empty/>
+  </define>
   <define name="street.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="street.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="street.element">
-<define name="street.element">
-  <element name="street">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="street">
+    <element name="street">
+      <ref name="street.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- street.element -->
-  
-<dtd:pe-decl name="street.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="street.attlist">
-<define name="street.attlist">
-  <ref name="common.attrib"/>
-  <ref name="street.role.attrib"/>
-  <ref name="local.street.attrib"/>
-</define>
-</div> <!-- street.attlist -->
-  </div> <!-- street.module -->
-
-    <dtd:pe-decl name="pob.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pob.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of street.element-->
+  <define name="street.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="street.role.attrib"/>
+    <ref name="local.street.attrib"/>
+  </define>
+<!--end of street.attlist-->
+<!--end of street.module-->
   <define name="local.pob.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="pob.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="pob.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pob.element">
-<define name="pob.element">
-  <element name="pob">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="pob">
+    <element name="pob">
+      <ref name="pob.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- pob.element -->
-  
-<dtd:pe-decl name="pob.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pob.attlist">
-<define name="pob.attlist">
-  <ref name="common.attrib"/>
-  <ref name="pob.role.attrib"/>
-  <ref name="local.pob.attrib"/>
-</define>
-</div> <!-- pob.attlist -->
-  </div> <!-- pob.module -->
-
-    <dtd:pe-decl name="postcode.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="postcode.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of pob.element-->
+  <define name="pob.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="pob.role.attrib"/>
+    <ref name="local.pob.attrib"/>
+  </define>
+<!--end of pob.attlist-->
+<!--end of pob.module-->
   <define name="local.postcode.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="postcode.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="postcode.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="postcode.element">
-<define name="postcode.element">
-  <element name="postcode">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="postcode">
+    <element name="postcode">
+      <ref name="postcode.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- postcode.element -->
-  
-<dtd:pe-decl name="postcode.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="postcode.attlist">
-<define name="postcode.attlist">
-  <ref name="common.attrib"/>
-  <ref name="postcode.role.attrib"/>
-  <ref name="local.postcode.attrib"/>
-</define>
-</div> <!-- postcode.attlist -->
-  </div> <!-- postcode.module -->
-
-    <dtd:pe-decl name="city.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="city.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of postcode.element-->
+  <define name="postcode.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="postcode.role.attrib"/>
+    <ref name="local.postcode.attrib"/>
+  </define>
+<!--end of postcode.attlist-->
+<!--end of postcode.module-->
   <define name="local.city.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="city.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="city.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="city.element">
-<define name="city.element">
-  <element name="city">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="city">
+    <element name="city">
+      <ref name="city.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- city.element -->
-  
-<dtd:pe-decl name="city.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="city.attlist">
-<define name="city.attlist">
-  <ref name="common.attrib"/>
-  <ref name="city.role.attrib"/>
-  <ref name="local.city.attrib"/>
-</define>
-</div> <!-- city.attlist -->
-  </div> <!-- city.module -->
-
-    <dtd:pe-decl name="state.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="state.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of city.element-->
+  <define name="city.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="city.role.attrib"/>
+    <ref name="local.city.attrib"/>
+  </define>
+<!--end of city.attlist-->
+<!--end of city.module-->
   <define name="local.state.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="state.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="state.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="state.element">
-<define name="state.element">
-  <element name="state">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="state">
+    <element name="state">
+      <ref name="state.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- state.element -->
-  
-<dtd:pe-decl name="state.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="state.attlist">
-<define name="state.attlist">
-  <ref name="common.attrib"/>
-  <ref name="state.role.attrib"/>
-  <ref name="local.state.attrib"/>
-</define>
-</div> <!-- state.attlist -->
-  </div> <!-- state.module -->
-
-    <dtd:pe-decl name="country.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="country.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of state.element-->
+  <define name="state.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="state.role.attrib"/>
+    <ref name="local.state.attrib"/>
+  </define>
+<!--end of state.attlist-->
+<!--end of state.module-->
   <define name="local.country.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="country.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="country.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="country.element">
-<define name="country.element">
-  <element name="country">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="country">
+    <element name="country">
+      <ref name="country.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- country.element -->
-  
-<dtd:pe-decl name="country.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="country.attlist">
-<define name="country.attlist">
-  <ref name="common.attrib"/>
-  <ref name="country.role.attrib"/>
-  <ref name="local.country.attrib"/>
-</define>
-</div> <!-- country.attlist -->
-  </div> <!-- country.module -->
-
-    <dtd:pe-decl name="phone.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="phone.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of country.element-->
+  <define name="country.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="country.role.attrib"/>
+    <ref name="local.country.attrib"/>
+  </define>
+<!--end of country.attlist-->
+<!--end of country.module-->
   <define name="local.phone.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="phone.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="phone.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="phone.element">
-<define name="phone.element">
-  <element name="phone">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="phone">
+    <element name="phone">
+      <ref name="phone.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- phone.element -->
-  
-<dtd:pe-decl name="phone.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="phone.attlist">
-<define name="phone.attlist">
-  <ref name="common.attrib"/>
-  <ref name="phone.role.attrib"/>
-  <ref name="local.phone.attrib"/>
-</define>
-</div> <!-- phone.attlist -->
-  </div> <!-- phone.module -->
-
-    <dtd:pe-decl name="fax.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="fax.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of phone.element-->
+  <define name="phone.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="phone.role.attrib"/>
+    <ref name="local.phone.attrib"/>
+  </define>
+<!--end of phone.attlist-->
+<!--end of phone.module-->
   <define name="local.fax.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="fax.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="fax.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="fax.element">
-<define name="fax.element">
-  <element name="fax">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="fax">
+    <element name="fax">
+      <ref name="fax.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- fax.element -->
-  
-<dtd:pe-decl name="fax.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="fax.attlist">
-<define name="fax.attlist">
-  <ref name="common.attrib"/>
-  <ref name="fax.role.attrib"/>
-  <ref name="local.fax.attrib"/>
-</define>
-</div> <!-- fax.attlist -->
-  </div> <!-- fax.module -->
-
-  <dtd:comment> Email (defined in the Inlines section, below)</dtd:comment>
-
-    <dtd:pe-decl name="otheraddr.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="otheraddr.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of fax.element-->
+  <define name="fax.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="fax.role.attrib"/>
+    <ref name="local.fax.attrib"/>
+  </define>
+<!--end of fax.attlist-->
+<!--end of fax.module-->
+<!-- Email (defined in the Inlines section, below)-->
   <define name="local.otheraddr.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="otheraddr.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="otheraddr.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="otheraddr.element">
-<define name="otheraddr.element">
-  <element name="otheraddr">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="otheraddr">
+    <element name="otheraddr">
+      <ref name="otheraddr.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- otheraddr.element -->
-  
-<dtd:pe-decl name="otheraddr.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="otheraddr.attlist">
-<define name="otheraddr.attlist">
-  <ref name="common.attrib"/>
-  <ref name="otheraddr.role.attrib"/>
-  <ref name="local.otheraddr.attrib"/>
-</define>
-</div> <!-- otheraddr.attlist -->
-  </div> <!-- otheraddr.module -->
-</div> <!-- address.content.module -->
-
-<dtd:comment> Affiliation ...................... </dtd:comment>
-
-<dtd:pe-decl name="affiliation.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="affiliation.content.module">
-<dtd:pe-decl name="affiliation.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="affiliation.module">
-<define name="local.affiliation.attrib">
-  <notAllowed/>
-</define>
-<define name="affiliation.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="affiliation.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="affiliation.element">
-<define name="affiliation.element">
-  <element name="affiliation">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of otheraddr.element-->
+  <define name="otheraddr.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="otheraddr.role.attrib"/>
+    <ref name="local.otheraddr.attrib"/>
+  </define>
+<!--end of otheraddr.attlist-->
+<!--end of otheraddr.module-->
+<!--end of address.content.module-->
+<!-- Affiliation ...................... -->
+  <define name="local.affiliation.attrib">
+    <empty/>
+  </define>
+  <define name="affiliation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="affiliation">
+    <element name="affiliation">
+      <ref name="affiliation.attlist"/>
       <optional>
-        <ref name="shortaffil.element"/>
+        <ref name="shortaffil"/>
       </optional>
       <zeroOrMore>
-        <ref name="jobtitle.element"/>
+        <ref name="jobtitle"/>
       </zeroOrMore>
       <optional>
-        <ref name="orgname.element"/>
+        <ref name="orgname"/>
       </optional>
       <zeroOrMore>
-        <ref name="orgdiv.element"/>
+        <ref name="orgdiv"/>
       </zeroOrMore>
       <zeroOrMore>
-        <ref name="address.element"/>
+        <ref name="address"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- affiliation.element -->
-
-<dtd:pe-decl name="affiliation.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="affiliation.attlist">
-<define name="affiliation.attlist">
-  <ref name="common.attrib"/>
-  <ref name="affiliation.role.attrib"/>
-  <ref name="local.affiliation.attrib"/>
-</define>
-</div> <!-- affiliation.attlist -->
-</div> <!-- affiliation.module -->
-
-    <dtd:pe-decl name="shortaffil.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="shortaffil.module">
+    </element>
+  </define>
+<!--end of affiliation.element-->
+  <define name="affiliation.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="affiliation.role.attrib"/>
+    <ref name="local.affiliation.attrib"/>
+  </define>
+<!--end of affiliation.attlist-->
+<!--end of affiliation.module-->
   <define name="local.shortaffil.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="shortaffil.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="shortaffil.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="shortaffil.element">
-<define name="shortaffil.element">
-  <element name="shortaffil">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="shortaffil">
+    <element name="shortaffil">
+      <ref name="shortaffil.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- shortaffil.element -->
-  
-<dtd:pe-decl name="shortaffil.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="shortaffil.attlist">
-<define name="shortaffil.attlist">
-  <ref name="common.attrib"/>
-  <ref name="shortaffil.role.attrib"/>
-  <ref name="local.shortaffil.attrib"/>
-</define>
-</div> <!-- shortaffil.attlist -->
-  </div> <!-- shortaffil.module -->
-
-    <dtd:pe-decl name="jobtitle.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="jobtitle.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of shortaffil.element-->
+  <define name="shortaffil.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="shortaffil.role.attrib"/>
+    <ref name="local.shortaffil.attrib"/>
+  </define>
+<!--end of shortaffil.attlist-->
+<!--end of shortaffil.module-->
   <define name="local.jobtitle.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="jobtitle.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="jobtitle.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="jobtitle.element">
-<define name="jobtitle.element">
-  <element name="jobtitle">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="jobtitle">
+    <element name="jobtitle">
+      <ref name="jobtitle.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- jobtitle.element -->
-  
-<dtd:pe-decl name="jobtitle.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="jobtitle.attlist">
-<define name="jobtitle.attlist">
-  <ref name="common.attrib"/>
-  <ref name="jobtitle.role.attrib"/>
-  <ref name="local.jobtitle.attrib"/>
-</define>
-</div> <!-- jobtitle.attlist -->
-  </div> <!-- jobtitle.module -->
-
-  <dtd:comment> OrgName (defined elsewhere in this section)</dtd:comment>
-
-    <dtd:pe-decl name="orgdiv.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orgdiv.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of jobtitle.element-->
+  <define name="jobtitle.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="jobtitle.role.attrib"/>
+    <ref name="local.jobtitle.attrib"/>
+  </define>
+<!--end of jobtitle.attlist-->
+<!--end of jobtitle.module-->
+<!-- OrgName (defined elsewhere in this section)-->
   <define name="local.orgdiv.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="orgdiv.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="orgdiv.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orgdiv.element">
-<define name="orgdiv.element">
-  <element name="orgdiv">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="orgdiv">
+    <element name="orgdiv">
+      <ref name="orgdiv.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- orgdiv.element -->
-  
-<dtd:pe-decl name="orgdiv.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orgdiv.attlist">
-<define name="orgdiv.attlist">
-  <ref name="common.attrib"/>
-  <ref name="orgdiv.role.attrib"/>
-  <ref name="local.orgdiv.attrib"/>
-</define>
-</div> <!-- orgdiv.attlist -->
-  </div> <!-- orgdiv.module -->
-
-  <dtd:comment> Address (defined elsewhere in this section)</dtd:comment>
-</div> <!-- affiliation.content.module -->
-
-<dtd:comment> ArtPageNums ...................... </dtd:comment>
-
-<dtd:pe-decl name="artpagenums.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="artpagenums.module">
-<define name="local.artpagenums.attrib">
-  <notAllowed/>
-</define>
-<define name="artpagenums.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="artpagenums.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="artpagenums.element">
-<define name="artpagenums.element">
-  <element name="artpagenums">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of orgdiv.element-->
+  <define name="orgdiv.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="orgdiv.role.attrib"/>
+    <ref name="local.orgdiv.attrib"/>
+  </define>
+<!--end of orgdiv.attlist-->
+<!--end of orgdiv.module-->
+<!-- Address (defined elsewhere in this section)-->
+<!--end of affiliation.content.module-->
+<!-- ArtPageNums ...................... -->
+  <define name="local.artpagenums.attrib">
+    <empty/>
+  </define>
+  <define name="artpagenums.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="artpagenums">
+    <element name="artpagenums">
+      <ref name="artpagenums.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- artpagenums.element -->
-
-<dtd:pe-decl name="artpagenums.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="artpagenums.attlist">
-<define name="artpagenums.attlist">
-  <ref name="common.attrib"/>
-  <ref name="artpagenums.role.attrib"/>
-  <ref name="local.artpagenums.attrib"/>
-</define>
-</div> <!-- artpagenums.attlist -->
-</div> <!-- artpagenums.module -->
-
-<dtd:comment> Author ........................... </dtd:comment>
-
-<dtd:pe-decl name="author.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="author.module">
-<define name="local.author.attrib">
-  <notAllowed/>
-</define>
-<define name="author.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="author.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="author.element">
-<define name="author.element">
-  <element name="author">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of artpagenums.element-->
+  <define name="artpagenums.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="artpagenums.role.attrib"/>
+    <ref name="local.artpagenums.attrib"/>
+  </define>
+<!--end of artpagenums.attlist-->
+<!--end of artpagenums.module-->
+<!-- Author ........................... -->
+  <define name="local.author.attrib">
+    <empty/>
+  </define>
+  <define name="author.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="author">
+    <element name="author">
+      <ref name="author.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="person.ident.mix"/>
-        </choice>
+        <ref name="person.ident.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- author.element -->
-
-<dtd:pe-decl name="author.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="author.attlist">
-<define name="author.attlist">
-  <ref name="common.attrib"/>
-  <ref name="author.role.attrib"/>
-  <ref name="local.author.attrib"/>
-</define>
-</div> <!-- author.attlist -->
-<dtd:comment>(see "Personal identity elements" for %person.ident.mix;)</dtd:comment>
-</div> <!-- author.module -->
-
-<dtd:comment> AuthorGroup ...................... </dtd:comment>
-
-<dtd:pe-decl name="authorgroup.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorgroup.content.module">
-<dtd:pe-decl name="authorgroup.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorgroup.module">
-<define name="local.authorgroup.attrib">
-  <notAllowed/>
-</define>
-<define name="authorgroup.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="authorgroup.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorgroup.element">
-<define name="authorgroup.element">
-  <element name="authorgroup">
-    <group>
+    </element>
+  </define>
+<!--end of author.element-->
+  <define name="author.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="author.role.attrib"/>
+    <ref name="local.author.attrib"/>
+  </define>
+<!--end of author.attlist-->
+<!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of author.module-->
+<!-- AuthorGroup ...................... -->
+  <define name="local.authorgroup.attrib">
+    <empty/>
+  </define>
+  <define name="authorgroup.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="authorgroup">
+    <element name="authorgroup">
+      <ref name="authorgroup.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="author.element"/>
-          <ref name="editor.element"/>
-          <ref name="collab.element"/>
-          <ref name="corpauthor.element"/>
-          <ref name="othercredit.element"/>
+          <ref name="author"/>
+          <ref name="editor"/>
+          <ref name="collab"/>
+          <ref name="corpauthor"/>
+          <ref name="othercredit"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- authorgroup.element -->
-
-<dtd:pe-decl name="authorgroup.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorgroup.attlist">
-<define name="authorgroup.attlist">
-  <ref name="common.attrib"/>
-  <ref name="authorgroup.role.attrib"/>
-  <ref name="local.authorgroup.attrib"/>
-</define>
-</div> <!-- authorgroup.attlist -->
-</div> <!-- authorgroup.module -->
-
-  <dtd:comment> Author (defined elsewhere in this section)</dtd:comment>
-  <dtd:comment> Editor (defined elsewhere in this section)</dtd:comment>
-
-    <dtd:pe-decl name="collab.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collab.content.module">
-    <dtd:pe-decl name="collab.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collab.module">
+    </element>
+  </define>
+<!--end of authorgroup.element-->
+  <define name="authorgroup.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="authorgroup.role.attrib"/>
+    <ref name="local.authorgroup.attrib"/>
+  </define>
+<!--end of authorgroup.attlist-->
+<!--end of authorgroup.module-->
+<!-- Author (defined elsewhere in this section)-->
+<!-- Editor (defined elsewhere in this section)-->
   <define name="local.collab.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="collab.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="collab.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collab.element">
-<define name="collab.element">
-  <element name="collab">
-    <group>
-      <ref name="collabname.element"/>
-      <zeroOrMore>
-        <ref name="affiliation.element"/>
-      </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- collab.element -->
-  
-<dtd:pe-decl name="collab.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collab.attlist">
-<define name="collab.attlist">
-  <ref name="common.attrib"/>
-  <ref name="collab.role.attrib"/>
-  <ref name="local.collab.attrib"/>
-</define>
-</div> <!-- collab.attlist -->
-  </div> <!-- collab.module -->
-
-      <dtd:pe-decl name="collabname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collabname.module">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="collab">
+    <element name="collab">
+      <ref name="collab.attlist"/>
+      <ref name="collabname"/>
+      <zeroOrMore>
+        <ref name="affiliation"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of collab.element-->
+  <define name="collab.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="collab.role.attrib"/>
+    <ref name="local.collab.attrib"/>
+  </define>
+<!--end of collab.attlist-->
+<!--end of collab.module-->
   <define name="local.collabname.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="collabname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-    
-<dtd:pe-decl name="collabname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collabname.element">
-<define name="collabname.element">
-  <element name="collabname">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="collabname">
+    <element name="collabname">
+      <ref name="collabname.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- collabname.element -->
-    
-<dtd:pe-decl name="collabname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="collabname.attlist">
-<define name="collabname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="collabname.role.attrib"/>
-  <ref name="local.collabname.attrib"/>
-</define>
-</div> <!-- collabname.attlist -->
-    </div> <!-- collabname.module -->
-
-    <dtd:comment> Affiliation (defined elsewhere in this section)</dtd:comment>
-  </div> <!-- collab.content.module -->
-
-  <dtd:comment> CorpAuthor (defined elsewhere in this section)</dtd:comment>
-  <dtd:comment> OtherCredit (defined elsewhere in this section)</dtd:comment>
-
-</div> <!-- authorgroup.content.module -->
-
-<dtd:comment> AuthorInitials ................... </dtd:comment>
-
-<dtd:pe-decl name="authorinitials.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorinitials.module">
-<define name="local.authorinitials.attrib">
-  <notAllowed/>
-</define>
-<define name="authorinitials.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="authorinitials.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorinitials.element">
-<define name="authorinitials.element">
-  <element name="authorinitials">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of collabname.element-->
+  <define name="collabname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="collabname.role.attrib"/>
+    <ref name="local.collabname.attrib"/>
+  </define>
+<!--end of collabname.attlist-->
+<!--end of collabname.module-->
+<!-- Affiliation (defined elsewhere in this section)-->
+<!--end of collab.content.module-->
+<!-- CorpAuthor (defined elsewhere in this section)-->
+<!-- OtherCredit (defined elsewhere in this section)-->
+<!--end of authorgroup.content.module-->
+<!-- AuthorInitials ................... -->
+  <define name="local.authorinitials.attrib">
+    <empty/>
+  </define>
+  <define name="authorinitials.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="authorinitials">
+    <element name="authorinitials">
+      <ref name="authorinitials.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- authorinitials.element -->
-
-<dtd:pe-decl name="authorinitials.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="authorinitials.attlist">
-<define name="authorinitials.attlist">
-  <ref name="common.attrib"/>
-  <ref name="authorinitials.role.attrib"/>
-  <ref name="local.authorinitials.attrib"/>
-</define>
-</div> <!-- authorinitials.attlist -->
-</div> <!-- authorinitials.module -->
-
-<dtd:comment> ConfGroup ........................ </dtd:comment>
-
-<dtd:pe-decl name="confgroup.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confgroup.content.module">
-<dtd:pe-decl name="confgroup.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confgroup.module">
-<define name="local.confgroup.attrib">
-  <notAllowed/>
-</define>
-<define name="confgroup.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="confgroup.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confgroup.element">
-<define name="confgroup.element">
-  <element name="confgroup">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of authorinitials.element-->
+  <define name="authorinitials.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="authorinitials.role.attrib"/>
+    <ref name="local.authorinitials.attrib"/>
+  </define>
+<!--end of authorinitials.attlist-->
+<!--end of authorinitials.module-->
+<!-- ConfGroup ........................ -->
+  <define name="local.confgroup.attrib">
+    <empty/>
+  </define>
+  <define name="confgroup.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="confgroup">
+    <element name="confgroup">
+      <ref name="confgroup.attlist"/>
       <zeroOrMore>
         <choice>
-          <ref name="confdates.element"/>
-          <ref name="conftitle.element"/>
-          <ref name="confnum.element"/>
-          <ref name="address.element"/>
-          <ref name="confsponsor.element"/>
+          <ref name="confdates"/>
+          <ref name="conftitle"/>
+          <ref name="confnum"/>
+          <ref name="address"/>
+          <ref name="confsponsor"/>
         </choice>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- confgroup.element -->
-
-<dtd:pe-decl name="confgroup.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confgroup.attlist">
-<define name="confgroup.attlist">
-  <ref name="common.attrib"/>
-  <ref name="confgroup.role.attrib"/>
-  <ref name="local.confgroup.attrib"/>
-</define>
-</div> <!-- confgroup.attlist -->
-</div> <!-- confgroup.module -->
-
-    <dtd:pe-decl name="confdates.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confdates.module">
+    </element>
+  </define>
+<!--end of confgroup.element-->
+  <define name="confgroup.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="confgroup.role.attrib"/>
+    <ref name="local.confgroup.attrib"/>
+  </define>
+<!--end of confgroup.attlist-->
+<!--end of confgroup.module-->
   <define name="local.confdates.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="confdates.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="confdates.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confdates.element">
-<define name="confdates.element">
-  <element name="confdates">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="confdates">
+    <element name="confdates">
+      <ref name="confdates.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- confdates.element -->
-  
-<dtd:pe-decl name="confdates.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confdates.attlist">
-<define name="confdates.attlist">
-  <ref name="common.attrib"/>
-  <ref name="confdates.role.attrib"/>
-  <ref name="local.confdates.attrib"/>
-</define>
-</div> <!-- confdates.attlist -->
-  </div> <!-- confdates.module -->
-
-    <dtd:pe-decl name="conftitle.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="conftitle.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of confdates.element-->
+  <define name="confdates.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="confdates.role.attrib"/>
+    <ref name="local.confdates.attrib"/>
+  </define>
+<!--end of confdates.attlist-->
+<!--end of confdates.module-->
   <define name="local.conftitle.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="conftitle.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="conftitle.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="conftitle.element">
-<define name="conftitle.element">
-  <element name="conftitle">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="conftitle">
+    <element name="conftitle">
+      <ref name="conftitle.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- conftitle.element -->
-  
-<dtd:pe-decl name="conftitle.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="conftitle.attlist">
-<define name="conftitle.attlist">
-  <ref name="common.attrib"/>
-  <ref name="conftitle.role.attrib"/>
-  <ref name="local.conftitle.attrib"/>
-</define>
-</div> <!-- conftitle.attlist -->
-  </div> <!-- conftitle.module -->
-
-    <dtd:pe-decl name="confnum.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confnum.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of conftitle.element-->
+  <define name="conftitle.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="conftitle.role.attrib"/>
+    <ref name="local.conftitle.attrib"/>
+  </define>
+<!--end of conftitle.attlist-->
+<!--end of conftitle.module-->
   <define name="local.confnum.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="confnum.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="confnum.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confnum.element">
-<define name="confnum.element">
-  <element name="confnum">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="confnum">
+    <element name="confnum">
+      <ref name="confnum.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- confnum.element -->
-  
-<dtd:pe-decl name="confnum.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confnum.attlist">
-<define name="confnum.attlist">
-  <ref name="common.attrib"/>
-  <ref name="confnum.role.attrib"/>
-  <ref name="local.confnum.attrib"/>
-</define>
-</div> <!-- confnum.attlist -->
-  </div> <!-- confnum.module -->
-
-  <dtd:comment> Address (defined elsewhere in this section)</dtd:comment>
-
-    <dtd:pe-decl name="confsponsor.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confsponsor.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of confnum.element-->
+  <define name="confnum.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="confnum.role.attrib"/>
+    <ref name="local.confnum.attrib"/>
+  </define>
+<!--end of confnum.attlist-->
+<!--end of confnum.module-->
+<!-- Address (defined elsewhere in this section)-->
   <define name="local.confsponsor.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="confsponsor.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="confsponsor.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confsponsor.element">
-<define name="confsponsor.element">
-  <element name="confsponsor">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="confsponsor">
+    <element name="confsponsor">
+      <ref name="confsponsor.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- confsponsor.element -->
-  
-<dtd:pe-decl name="confsponsor.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="confsponsor.attlist">
-<define name="confsponsor.attlist">
-  <ref name="common.attrib"/>
-  <ref name="confsponsor.role.attrib"/>
-  <ref name="local.confsponsor.attrib"/>
-</define>
-</div> <!-- confsponsor.attlist -->
-  </div> <!-- confsponsor.module -->
-</div> <!-- confgroup.content.module -->
-
-<dtd:comment> ContractNum ...................... </dtd:comment>
-
-<dtd:pe-decl name="contractnum.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contractnum.module">
-<define name="local.contractnum.attrib">
-  <notAllowed/>
-</define>
-<define name="contractnum.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="contractnum.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contractnum.element">
-<define name="contractnum.element">
-  <element name="contractnum">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of confsponsor.element-->
+  <define name="confsponsor.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="confsponsor.role.attrib"/>
+    <ref name="local.confsponsor.attrib"/>
+  </define>
+<!--end of confsponsor.attlist-->
+<!--end of confsponsor.module-->
+<!--end of confgroup.content.module-->
+<!-- ContractNum ...................... -->
+  <define name="local.contractnum.attrib">
+    <empty/>
+  </define>
+  <define name="contractnum.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="contractnum">
+    <element name="contractnum">
+      <ref name="contractnum.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- contractnum.element -->
-
-<dtd:pe-decl name="contractnum.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contractnum.attlist">
-<define name="contractnum.attlist">
-  <ref name="common.attrib"/>
-  <ref name="contractnum.role.attrib"/>
-  <ref name="local.contractnum.attrib"/>
-</define>
-</div> <!-- contractnum.attlist -->
-</div> <!-- contractnum.module -->
-
-<dtd:comment> ContractSponsor .................. </dtd:comment>
-
-<dtd:pe-decl name="contractsponsor.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contractsponsor.module">
-<define name="local.contractsponsor.attrib">
-  <notAllowed/>
-</define>
-<define name="contractsponsor.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="contractsponsor.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contractsponsor.element">
-<define name="contractsponsor.element">
-  <element name="contractsponsor">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of contractnum.element-->
+  <define name="contractnum.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="contractnum.role.attrib"/>
+    <ref name="local.contractnum.attrib"/>
+  </define>
+<!--end of contractnum.attlist-->
+<!--end of contractnum.module-->
+<!-- ContractSponsor .................. -->
+  <define name="local.contractsponsor.attrib">
+    <empty/>
+  </define>
+  <define name="contractsponsor.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="contractsponsor">
+    <element name="contractsponsor">
+      <ref name="contractsponsor.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- contractsponsor.element -->
-
-<dtd:pe-decl name="contractsponsor.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contractsponsor.attlist">
-<define name="contractsponsor.attlist">
-  <ref name="common.attrib"/>
-  <ref name="contractsponsor.role.attrib"/>
-  <ref name="local.contractsponsor.attrib"/>
-</define>
-</div> <!-- contractsponsor.attlist -->
-</div> <!-- contractsponsor.module -->
-
-<dtd:comment> Copyright ........................ </dtd:comment>
-
-<dtd:pe-decl name="copyright.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="copyright.content.module">
-<dtd:pe-decl name="copyright.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="copyright.module">
-<define name="local.copyright.attrib">
-  <notAllowed/>
-</define>
-<define name="copyright.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="copyright.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="copyright.element">
-<define name="copyright.element">
-  <element name="copyright">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of contractsponsor.element-->
+  <define name="contractsponsor.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="contractsponsor.role.attrib"/>
+    <ref name="local.contractsponsor.attrib"/>
+  </define>
+<!--end of contractsponsor.attlist-->
+<!--end of contractsponsor.module-->
+<!-- Copyright ........................ -->
+  <define name="local.copyright.attrib">
+    <empty/>
+  </define>
+  <define name="copyright.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="copyright">
+    <element name="copyright">
+      <ref name="copyright.attlist"/>
       <oneOrMore>
-        <ref name="year.element"/>
+        <ref name="year"/>
       </oneOrMore>
       <zeroOrMore>
-        <ref name="holder.element"/>
+        <ref name="holder"/>
       </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- copyright.element -->
-
-<dtd:pe-decl name="copyright.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="copyright.attlist">
-<define name="copyright.attlist">
-  <ref name="common.attrib"/>
-  <ref name="copyright.role.attrib"/>
-  <ref name="local.copyright.attrib"/>
-</define>
-</div> <!-- copyright.attlist -->
-</div> <!-- copyright.module -->
-
-    <dtd:pe-decl name="year.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="year.module">
+    </element>
+  </define>
+<!--end of copyright.element-->
+  <define name="copyright.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="copyright.role.attrib"/>
+    <ref name="local.copyright.attrib"/>
+  </define>
+<!--end of copyright.attlist-->
+<!--end of copyright.module-->
   <define name="local.year.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="year.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="year.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="year.element">
-<define name="year.element">
-  <element name="year">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="year">
+    <element name="year">
+      <ref name="year.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- year.element -->
-  
-<dtd:pe-decl name="year.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="year.attlist">
-<define name="year.attlist">
-  <ref name="common.attrib"/>
-  <ref name="year.role.attrib"/>
-  <ref name="local.year.attrib"/>
-</define>
-</div> <!-- year.attlist -->
-  </div> <!-- year.module -->
-
-    <dtd:pe-decl name="holder.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="holder.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of year.element-->
+  <define name="year.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="year.role.attrib"/>
+    <ref name="local.year.attrib"/>
+  </define>
+<!--end of year.attlist-->
+<!--end of year.module-->
   <define name="local.holder.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="holder.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="holder.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="holder.element">
-<define name="holder.element">
-  <element name="holder">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="holder">
+    <element name="holder">
+      <ref name="holder.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- holder.element -->
-  
-<dtd:pe-decl name="holder.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="holder.attlist">
-<define name="holder.attlist">
-  <ref name="common.attrib"/>
-  <ref name="holder.role.attrib"/>
-  <ref name="local.holder.attrib"/>
-</define>
-</div> <!-- holder.attlist -->
-  </div> <!-- holder.module -->
-</div> <!-- copyright.content.module -->
-
-<dtd:comment> CorpAuthor ....................... </dtd:comment>
-
-<dtd:pe-decl name="corpauthor.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="corpauthor.module">
-<define name="local.corpauthor.attrib">
-  <notAllowed/>
-</define>
-<define name="corpauthor.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="corpauthor.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="corpauthor.element">
-<define name="corpauthor.element">
-  <element name="corpauthor">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of holder.element-->
+  <define name="holder.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="holder.role.attrib"/>
+    <ref name="local.holder.attrib"/>
+  </define>
+<!--end of holder.attlist-->
+<!--end of holder.module-->
+<!--end of copyright.content.module-->
+<!-- CorpAuthor ....................... -->
+  <define name="local.corpauthor.attrib">
+    <empty/>
+  </define>
+  <define name="corpauthor.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="corpauthor">
+    <element name="corpauthor">
+      <ref name="corpauthor.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- corpauthor.element -->
-
-<dtd:pe-decl name="corpauthor.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="corpauthor.attlist">
-<define name="corpauthor.attlist">
-  <ref name="common.attrib"/>
-  <ref name="corpauthor.role.attrib"/>
-  <ref name="local.corpauthor.attrib"/>
-</define>
-</div> <!-- corpauthor.attlist -->
-</div> <!-- corpauthor.module -->
-
-<dtd:comment> CorpName ......................... </dtd:comment>
-
-<dtd:pe-decl name="corpname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="corpname.module">
-<define name="local.corpname.attrib">
-  <notAllowed/>
-</define>
-
-<dtd:pe-decl name="corpname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="corpname.element">
-<define name="corpname.element">
-  <element name="corpname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of corpauthor.element-->
+  <define name="corpauthor.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="corpauthor.role.attrib"/>
+    <ref name="local.corpauthor.attrib"/>
+  </define>
+<!--end of corpauthor.attlist-->
+<!--end of corpauthor.module-->
+<!-- CorpName ......................... -->
+  <define name="local.corpname.attrib">
+    <empty/>
+  </define>
+  <define name="corpname">
+    <element name="corpname">
+      <ref name="corpname.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- corpname.element -->
-<define name="corpname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="corpname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="corpname.attlist">
-<define name="corpname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="corpname.role.attrib"/>
-  <ref name="local.corpname.attrib"/>
-</define>
-</div> <!-- corpname.attlist -->
-</div> <!-- corpname.module -->
-
-<dtd:comment> Date ............................. </dtd:comment>
-
-<dtd:pe-decl name="date.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="date.module">
-<define name="local.date.attrib">
-  <notAllowed/>
-</define>
-<define name="date.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="date.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="date.element">
-<define name="date.element">
-  <element name="date">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of corpname.element-->
+  <define name="corpname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="corpname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="corpname.role.attrib"/>
+    <ref name="local.corpname.attrib"/>
+  </define>
+<!--end of corpname.attlist-->
+<!--end of corpname.module-->
+<!-- Date ............................. -->
+  <define name="local.date.attrib">
+    <empty/>
+  </define>
+  <define name="date.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="date">
+    <element name="date">
+      <ref name="date.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- date.element -->
-
-<dtd:pe-decl name="date.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="date.attlist">
-<define name="date.attlist">
-  <ref name="common.attrib"/>
-  <ref name="date.role.attrib"/>
-  <ref name="local.date.attrib"/>
-</define>
-</div> <!-- date.attlist -->
-</div> <!-- date.module -->
-
-<dtd:comment> Edition .......................... </dtd:comment>
-
-<dtd:pe-decl name="edition.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="edition.module">
-<define name="local.edition.attrib">
-  <notAllowed/>
-</define>
-<define name="edition.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="edition.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="edition.element">
-<define name="edition.element">
-  <element name="edition">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of date.element-->
+  <define name="date.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="date.role.attrib"/>
+    <ref name="local.date.attrib"/>
+  </define>
+<!--end of date.attlist-->
+<!--end of date.module-->
+<!-- Edition .......................... -->
+  <define name="local.edition.attrib">
+    <empty/>
+  </define>
+  <define name="edition.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="edition">
+    <element name="edition">
+      <ref name="edition.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- edition.element -->
-
-<dtd:pe-decl name="edition.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="edition.attlist">
-<define name="edition.attlist">
-  <ref name="common.attrib"/>
-  <ref name="edition.role.attrib"/>
-  <ref name="local.edition.attrib"/>
-</define>
-</div> <!-- edition.attlist -->
-</div> <!-- edition.module -->
-
-<dtd:comment> Editor ........................... </dtd:comment>
-
-<dtd:pe-decl name="editor.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="editor.module">
-<define name="local.editor.attrib">
-  <notAllowed/>
-</define>
-<define name="editor.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="editor.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="editor.element">
-<define name="editor.element">
-  <element name="editor">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of edition.element-->
+  <define name="edition.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="edition.role.attrib"/>
+    <ref name="local.edition.attrib"/>
+  </define>
+<!--end of edition.attlist-->
+<!--end of edition.module-->
+<!-- Editor ........................... -->
+  <define name="local.editor.attrib">
+    <empty/>
+  </define>
+  <define name="editor.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="editor">
+    <element name="editor">
+      <ref name="editor.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="person.ident.mix"/>
-        </choice>
+        <ref name="person.ident.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- editor.element -->
-
-<dtd:pe-decl name="editor.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="editor.attlist">
-<define name="editor.attlist">
-  <ref name="common.attrib"/>
-  <ref name="editor.role.attrib"/>
-  <ref name="local.editor.attrib"/>
-</define>
-</div> <!-- editor.attlist -->
-  <dtd:comment>(see "Personal identity elements" for %person.ident.mix;)</dtd:comment>
-</div> <!-- editor.module -->
-
-<dtd:comment> ISBN ............................. </dtd:comment>
-
-<dtd:pe-decl name="isbn.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="isbn.module">
-<define name="local.isbn.attrib">
-  <notAllowed/>
-</define>
-<define name="isbn.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="isbn.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="isbn.element">
-<define name="isbn.element">
-  <element name="isbn">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of editor.element-->
+  <define name="editor.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="editor.role.attrib"/>
+    <ref name="local.editor.attrib"/>
+  </define>
+<!--end of editor.attlist-->
+<!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of editor.module-->
+<!-- ISBN ............................. -->
+  <define name="local.isbn.attrib">
+    <empty/>
+  </define>
+  <define name="isbn.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="isbn">
+    <element name="isbn">
+      <ref name="isbn.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- isbn.element -->
-
-<dtd:pe-decl name="isbn.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="isbn.attlist">
-<define name="isbn.attlist">
-  <ref name="common.attrib"/>
-  <ref name="isbn.role.attrib"/>
-  <ref name="local.isbn.attrib"/>
-</define>
-</div> <!-- isbn.attlist -->
-</div> <!-- isbn.module -->
-
-<dtd:comment> ISSN ............................. </dtd:comment>
-
-<dtd:pe-decl name="issn.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="issn.module">
-<define name="local.issn.attrib">
-  <notAllowed/>
-</define>
-<define name="issn.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="issn.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="issn.element">
-<define name="issn.element">
-  <element name="issn">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of isbn.element-->
+  <define name="isbn.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="isbn.role.attrib"/>
+    <ref name="local.isbn.attrib"/>
+  </define>
+<!--end of isbn.attlist-->
+<!--end of isbn.module-->
+<!-- ISSN ............................. -->
+  <define name="local.issn.attrib">
+    <empty/>
+  </define>
+  <define name="issn.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="issn">
+    <element name="issn">
+      <ref name="issn.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- issn.element -->
-
-<dtd:pe-decl name="issn.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="issn.attlist">
-<define name="issn.attlist">
-  <ref name="common.attrib"/>
-  <ref name="issn.role.attrib"/>
-  <ref name="local.issn.attrib"/>
-</define>
-</div> <!-- issn.attlist -->
-</div> <!-- issn.module -->
-
-<dtd:comment> InvPartNumber .................... </dtd:comment>
-
-<dtd:pe-decl name="invpartnumber.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="invpartnumber.module">
-<define name="local.invpartnumber.attrib">
-  <notAllowed/>
-</define>
-<define name="invpartnumber.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="invpartnumber.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="invpartnumber.element">
-<define name="invpartnumber.element">
-  <element name="invpartnumber">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of issn.element-->
+  <define name="issn.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="issn.role.attrib"/>
+    <ref name="local.issn.attrib"/>
+  </define>
+<!--end of issn.attlist-->
+<!--end of issn.module-->
+<!-- InvPartNumber .................... -->
+  <define name="local.invpartnumber.attrib">
+    <empty/>
+  </define>
+  <define name="invpartnumber.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="invpartnumber">
+    <element name="invpartnumber">
+      <ref name="invpartnumber.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- invpartnumber.element -->
-
-<dtd:pe-decl name="invpartnumber.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="invpartnumber.attlist">
-<define name="invpartnumber.attlist">
-  <ref name="common.attrib"/>
-  <ref name="invpartnumber.role.attrib"/>
-  <ref name="local.invpartnumber.attrib"/>
-</define>
-</div> <!-- invpartnumber.attlist -->
-</div> <!-- invpartnumber.module -->
-
-<dtd:comment> IssueNum ......................... </dtd:comment>
-
-<dtd:pe-decl name="issuenum.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="issuenum.module">
-<define name="local.issuenum.attrib">
-  <notAllowed/>
-</define>
-<define name="issuenum.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="issuenum.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="issuenum.element">
-<define name="issuenum.element">
-  <element name="issuenum">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of invpartnumber.element-->
+  <define name="invpartnumber.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="invpartnumber.role.attrib"/>
+    <ref name="local.invpartnumber.attrib"/>
+  </define>
+<!--end of invpartnumber.attlist-->
+<!--end of invpartnumber.module-->
+<!-- IssueNum ......................... -->
+  <define name="local.issuenum.attrib">
+    <empty/>
+  </define>
+  <define name="issuenum.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="issuenum">
+    <element name="issuenum">
+      <ref name="issuenum.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- issuenum.element -->
-
-<dtd:pe-decl name="issuenum.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="issuenum.attlist">
-<define name="issuenum.attlist">
-  <ref name="common.attrib"/>
-  <ref name="issuenum.role.attrib"/>
-  <ref name="local.issuenum.attrib"/>
-</define>
-</div> <!-- issuenum.attlist -->
-</div> <!-- issuenum.module -->
-
-<dtd:comment> LegalNotice ...................... </dtd:comment>
-
-<dtd:pe-decl name="legalnotice.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="legalnotice.module">
-<define name="local.legalnotice.attrib">
-  <notAllowed/>
-</define>
-<define name="legalnotice.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="legalnotice.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="legalnotice.element">
-<define name="legalnotice.element">
-  <element name="legalnotice">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of issuenum.element-->
+  <define name="issuenum.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="issuenum.role.attrib"/>
+    <ref name="local.issuenum.attrib"/>
+  </define>
+<!--end of issuenum.attlist-->
+<!--end of issuenum.module-->
+<!-- LegalNotice ...................... -->
+  <define name="local.legalnotice.attrib">
+    <empty/>
+  </define>
+  <define name="legalnotice.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="legalnotice">
+    <element name="legalnotice">
+      <ref name="legalnotice.attlist"/>
       <optional>
-        <ref name="title.element"/>
+        <ref name="title"/>
       </optional>
       <oneOrMore>
-        <choice>
-          <ref name="legalnotice.mix"/>
-        </choice>
+        <ref name="legalnotice.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- legalnotice.element -->
-
-<dtd:pe-decl name="legalnotice.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="legalnotice.attlist">
-<define name="legalnotice.attlist">
-  <ref name="common.attrib"/>
-  <ref name="legalnotice.role.attrib"/>
-  <ref name="local.legalnotice.attrib"/>
-</define>
-</div> <!-- legalnotice.attlist -->
-</div> <!-- legalnotice.module -->
-
-<dtd:comment> ModeSpec ......................... </dtd:comment>
-
-<dtd:pe-decl name="modespec.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="modespec.module">
-<define name="local.modespec.attrib">
-  <notAllowed/>
-</define>
-<define name="modespec.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="modespec.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="modespec.element">
-<define name="modespec.element">
-  <element name="modespec">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of legalnotice.element-->
+  <define name="legalnotice.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="legalnotice.role.attrib"/>
+    <ref name="local.legalnotice.attrib"/>
+  </define>
+<!--end of legalnotice.attlist-->
+<!--end of legalnotice.module-->
+<!-- ModeSpec ......................... -->
+  <define name="local.modespec.attrib">
+    <empty/>
+  </define>
+  <define name="modespec.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="modespec">
+    <element name="modespec">
+      <ref name="modespec.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- modespec.element -->
-
-<dtd:comment> Application: Type of action required for completion
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of modespec.element-->
+<!-- Application: Type of action required for completion
 		of the links to which the ModeSpec is relevant (e.g.,
-		retrieval query) </dtd:comment>
-
-
-<dtd:pe-decl name="modespec.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="modespec.attlist">
-<define name="modespec.attlist">
-  <optional>
-    <attribute name="application" dtd:type="NOTATION">
-      <ref name="notation.class"/>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="modespec.role.attrib"/>
-  <ref name="local.modespec.attrib"/>
-</define>
-</div> <!-- modespec.attlist -->
-</div> <!-- modespec.module -->
-
-<dtd:comment> OrgName .......................... </dtd:comment>
-
-<dtd:pe-decl name="orgname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orgname.module">
-<define name="local.orgname.attrib">
-  <notAllowed/>
-</define>
-<define name="orgname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="orgname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orgname.element">
-<define name="orgname.element">
-  <element name="orgname">
-    <zeroOrMore>
-      <choice>
-        <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- orgname.element -->
-
-<dtd:pe-decl name="orgname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="orgname.attlist">
-<define name="orgname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="orgname.role.attrib"/>
-  <ref name="local.orgname.attrib"/>
-</define>
-</div> <!-- orgname.attlist -->
-</div> <!-- orgname.module -->
-
-<dtd:comment> OtherCredit ...................... </dtd:comment>
-
-<dtd:pe-decl name="othercredit.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="othercredit.module">
-<define name="local.othercredit.attrib">
-  <notAllowed/>
-</define>
-<define name="othercredit.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="othercredit.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="othercredit.element">
-<define name="othercredit.element">
-  <element name="othercredit">
-    <group>
-      <oneOrMore>
+		retrieval query) -->
+  <define name="modespec.attlist" combine="interleave">
+    <optional>
+      <attribute name="application">
         <choice>
-          <ref name="person.ident.mix"/>
+          <ref name="notation.class"/>
         </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="modespec.role.attrib"/>
+    <ref name="local.modespec.attrib"/>
+  </define>
+<!--end of modespec.attlist-->
+<!--end of modespec.module-->
+<!-- OrgName .......................... -->
+  <define name="local.orgname.attrib">
+    <empty/>
+  </define>
+  <define name="orgname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="orgname">
+    <element name="orgname">
+      <ref name="orgname.attlist"/>
+      <zeroOrMore>
+        <ref name="docinfo.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of orgname.element-->
+  <define name="orgname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="orgname.role.attrib"/>
+    <ref name="local.orgname.attrib"/>
+  </define>
+<!--end of orgname.attlist-->
+<!--end of orgname.module-->
+<!-- OtherCredit ...................... -->
+  <define name="local.othercredit.attrib">
+    <empty/>
+  </define>
+  <define name="othercredit.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="othercredit">
+    <element name="othercredit">
+      <ref name="othercredit.attlist"/>
+      <oneOrMore>
+        <ref name="person.ident.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- othercredit.element -->
-
-<dtd:pe-decl name="othercredit.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="othercredit.attlist">
-<define name="othercredit.attlist">
-  <ref name="common.attrib"/>
-  <ref name="othercredit.role.attrib"/>
-  <ref name="local.othercredit.attrib"/>
-</define>
-</div> <!-- othercredit.attlist -->
-  <dtd:comment>(see "Personal identity elements" for %person.ident.mix;)</dtd:comment>
-</div> <!-- othercredit.module -->
-
-<dtd:comment> PageNums ......................... </dtd:comment>
-
-<dtd:pe-decl name="pagenums.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pagenums.module">
-<define name="local.pagenums.attrib">
-  <notAllowed/>
-</define>
-<define name="pagenums.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="pagenums.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pagenums.element">
-<define name="pagenums.element">
-  <element name="pagenums">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of othercredit.element-->
+  <define name="othercredit.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="othercredit.role.attrib"/>
+    <ref name="local.othercredit.attrib"/>
+  </define>
+<!--end of othercredit.attlist-->
+<!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of othercredit.module-->
+<!-- PageNums ......................... -->
+  <define name="local.pagenums.attrib">
+    <empty/>
+  </define>
+  <define name="pagenums.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="pagenums">
+    <element name="pagenums">
+      <ref name="pagenums.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- pagenums.element -->
-
-<dtd:pe-decl name="pagenums.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pagenums.attlist">
-<define name="pagenums.attlist">
-  <ref name="common.attrib"/>
-  <ref name="pagenums.role.attrib"/>
-  <ref name="local.pagenums.attrib"/>
-</define>
-</div> <!-- pagenums.attlist -->
-</div> <!-- pagenums.module -->
-
-<dtd:comment> Personal identity elements ....... </dtd:comment>
-
-<dtd:comment> These elements are used only within Author, Editor, and 
-OtherCredit. </dtd:comment>
-
-<dtd:pe-decl name="person.ident.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="person.ident.module">
-    <dtd:pe-decl name="contrib.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contrib.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of pagenums.element-->
+  <define name="pagenums.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="pagenums.role.attrib"/>
+    <ref name="local.pagenums.attrib"/>
+  </define>
+<!--end of pagenums.attlist-->
+<!--end of pagenums.module-->
+<!-- Personal identity elements ....... -->
+<!-- These elements are used only within Author, Editor, and 
+OtherCredit. -->
   <define name="local.contrib.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="contrib.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="contrib.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contrib.element">
-<define name="contrib.element">
-  <element name="contrib">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="contrib">
+    <element name="contrib">
+      <ref name="contrib.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- contrib.element -->
-  
-<dtd:pe-decl name="contrib.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="contrib.attlist">
-<define name="contrib.attlist">
-  <ref name="common.attrib"/>
-  <ref name="contrib.role.attrib"/>
-  <ref name="local.contrib.attrib"/>
-</define>
-</div> <!-- contrib.attlist -->
-  </div> <!-- contrib.module -->
-
-    <dtd:pe-decl name="firstname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="firstname.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of contrib.element-->
+  <define name="contrib.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="contrib.role.attrib"/>
+    <ref name="local.contrib.attrib"/>
+  </define>
+<!--end of contrib.attlist-->
+<!--end of contrib.module-->
   <define name="local.firstname.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="firstname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="firstname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="firstname.element">
-<define name="firstname.element">
-  <element name="firstname">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="firstname">
+    <element name="firstname">
+      <ref name="firstname.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- firstname.element -->
-  
-<dtd:pe-decl name="firstname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="firstname.attlist">
-<define name="firstname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="firstname.role.attrib"/>
-  <ref name="local.firstname.attrib"/>
-</define>
-</div> <!-- firstname.attlist -->
-  </div> <!-- firstname.module -->
-
-    <dtd:pe-decl name="honorific.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="honorific.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of firstname.element-->
+  <define name="firstname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="firstname.role.attrib"/>
+    <ref name="local.firstname.attrib"/>
+  </define>
+<!--end of firstname.attlist-->
+<!--end of firstname.module-->
   <define name="local.honorific.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="honorific.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="honorific.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="honorific.element">
-<define name="honorific.element">
-  <element name="honorific">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="honorific">
+    <element name="honorific">
+      <ref name="honorific.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- honorific.element -->
-  
-<dtd:pe-decl name="honorific.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="honorific.attlist">
-<define name="honorific.attlist">
-  <ref name="common.attrib"/>
-  <ref name="honorific.role.attrib"/>
-  <ref name="local.honorific.attrib"/>
-</define>
-</div> <!-- honorific.attlist -->
-  </div> <!-- honorific.module -->
-
-    <dtd:pe-decl name="lineage.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="lineage.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of honorific.element-->
+  <define name="honorific.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="honorific.role.attrib"/>
+    <ref name="local.honorific.attrib"/>
+  </define>
+<!--end of honorific.attlist-->
+<!--end of honorific.module-->
   <define name="local.lineage.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="lineage.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="lineage.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="lineage.element">
-<define name="lineage.element">
-  <element name="lineage">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="lineage">
+    <element name="lineage">
+      <ref name="lineage.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- lineage.element -->
-  
-<dtd:pe-decl name="lineage.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="lineage.attlist">
-<define name="lineage.attlist">
-  <ref name="common.attrib"/>
-  <ref name="lineage.role.attrib"/>
-  <ref name="local.lineage.attrib"/>
-</define>
-</div> <!-- lineage.attlist -->
-  </div> <!-- lineage.module -->
-
-    <dtd:pe-decl name="othername.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="othername.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of lineage.element-->
+  <define name="lineage.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="lineage.role.attrib"/>
+    <ref name="local.lineage.attrib"/>
+  </define>
+<!--end of lineage.attlist-->
+<!--end of lineage.module-->
   <define name="local.othername.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="othername.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="othername.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="othername.element">
-<define name="othername.element">
-  <element name="othername">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="othername">
+    <element name="othername">
+      <ref name="othername.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- othername.element -->
-  
-<dtd:pe-decl name="othername.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="othername.attlist">
-<define name="othername.attlist">
-  <ref name="common.attrib"/>
-  <ref name="othername.role.attrib"/>
-  <ref name="local.othername.attrib"/>
-</define>
-</div> <!-- othername.attlist -->
-  </div> <!-- othername.module -->
-
-    <dtd:pe-decl name="surname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="surname.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of othername.element-->
+  <define name="othername.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="othername.role.attrib"/>
+    <ref name="local.othername.attrib"/>
+  </define>
+<!--end of othername.attlist-->
+<!--end of othername.module-->
   <define name="local.surname.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="surname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="surname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="surname.element">
-<define name="surname.element">
-  <element name="surname">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="surname">
+    <element name="surname">
+      <ref name="surname.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- surname.element -->
-  
-<dtd:pe-decl name="surname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="surname.attlist">
-<define name="surname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="surname.role.attrib"/>
-  <ref name="local.surname.attrib"/>
-</define>
-</div> <!-- surname.attlist -->
-  </div> <!-- surname.module -->
-</div> <!-- person.ident.module -->
-
-<dtd:comment> PrintHistory ..................... </dtd:comment>
-
-<dtd:pe-decl name="printhistory.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="printhistory.module">
-<define name="local.printhistory.attrib">
-  <notAllowed/>
-</define>
-<define name="printhistory.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="printhistory.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="printhistory.element">
-<define name="printhistory.element">
-  <element name="printhistory">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of surname.element-->
+  <define name="surname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="surname.role.attrib"/>
+    <ref name="local.surname.attrib"/>
+  </define>
+<!--end of surname.attlist-->
+<!--end of surname.module-->
+<!--end of person.ident.module-->
+<!-- PrintHistory ..................... -->
+  <define name="local.printhistory.attrib">
+    <empty/>
+  </define>
+  <define name="printhistory.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="printhistory">
+    <element name="printhistory">
+      <ref name="printhistory.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="para.class"/>
-        </choice>
+        <ref name="para.class"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- printhistory.element -->
-
-<dtd:pe-decl name="printhistory.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="printhistory.attlist">
-<define name="printhistory.attlist">
-  <ref name="common.attrib"/>
-  <ref name="printhistory.role.attrib"/>
-  <ref name="local.printhistory.attrib"/>
-</define>
-</div> <!-- printhistory.attlist -->
-</div> <!-- printhistory.module -->
-
-<dtd:comment> ProductName ...................... </dtd:comment>
-
-<dtd:pe-decl name="productname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="productname.module">
-<define name="local.productname.attrib">
-  <notAllowed/>
-</define>
-<define name="productname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="productname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="productname.element">
-<define name="productname.element">
-  <element name="productname">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of printhistory.element-->
+  <define name="printhistory.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="printhistory.role.attrib"/>
+    <ref name="local.printhistory.attrib"/>
+  </define>
+<!--end of printhistory.attlist-->
+<!--end of printhistory.module-->
+<!-- ProductName ...................... -->
+  <define name="local.productname.attrib">
+    <empty/>
+  </define>
+  <define name="productname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="productname">
+    <element name="productname">
+      <ref name="productname.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- productname.element -->
-
-<dtd:comment> Class: More precisely identifies the item the element names </dtd:comment>
-
-
-<dtd:pe-decl name="productname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="productname.attlist">
-<define name="productname.attlist">
-  <optional>
-    <attribute name="class" dtd:default="trade">
-      <choice>
-	<value>service</value>
-	<value>trade</value>
-	<value>registered</value>
-	<value>copyright</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="productname.role.attrib"/>
-  <ref name="local.productname.attrib"/>
-</define>
-</div> <!-- productname.attlist -->
-</div> <!-- productname.module -->
-
-<dtd:comment> ProductNumber .................... </dtd:comment>
-
-<dtd:pe-decl name="productnumber.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="productnumber.module">
-<define name="local.productnumber.attrib">
-  <notAllowed/>
-</define>
-<define name="productnumber.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="productnumber.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="productnumber.element">
-<define name="productnumber.element">
-  <element name="productnumber">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of productname.element-->
+<!-- Class: More precisely identifies the item the element names -->
+  <define name="productname.attlist" combine="interleave">
+    <optional>
+      <attribute name="class" a:defaultValue="trade">
+        <choice>
+          <value>service</value>
+          <value>trade</value>
+          <value>registered</value>
+          <value>copyright</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="productname.role.attrib"/>
+    <ref name="local.productname.attrib"/>
+  </define>
+<!--end of productname.attlist-->
+<!--end of productname.module-->
+<!-- ProductNumber .................... -->
+  <define name="local.productnumber.attrib">
+    <empty/>
+  </define>
+  <define name="productnumber.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="productnumber">
+    <element name="productnumber">
+      <ref name="productnumber.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- productnumber.element -->
-
-<dtd:pe-decl name="productnumber.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="productnumber.attlist">
-<define name="productnumber.attlist">
-  <ref name="common.attrib"/>
-  <ref name="productnumber.role.attrib"/>
-  <ref name="local.productnumber.attrib"/>
-</define>
-</div> <!-- productnumber.attlist -->
-</div> <!-- productnumber.module -->
-
-<dtd:comment> PubDate .......................... </dtd:comment>
-
-<dtd:pe-decl name="pubdate.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pubdate.module">
-<define name="local.pubdate.attrib">
-  <notAllowed/>
-</define>
-<define name="pubdate.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="pubdate.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pubdate.element">
-<define name="pubdate.element">
-  <element name="pubdate">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of productnumber.element-->
+  <define name="productnumber.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="productnumber.role.attrib"/>
+    <ref name="local.productnumber.attrib"/>
+  </define>
+<!--end of productnumber.attlist-->
+<!--end of productnumber.module-->
+<!-- PubDate .......................... -->
+  <define name="local.pubdate.attrib">
+    <empty/>
+  </define>
+  <define name="pubdate.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="pubdate">
+    <element name="pubdate">
+      <ref name="pubdate.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- pubdate.element -->
-
-<dtd:pe-decl name="pubdate.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pubdate.attlist">
-<define name="pubdate.attlist">
-  <ref name="common.attrib"/>
-  <ref name="pubdate.role.attrib"/>
-  <ref name="local.pubdate.attrib"/>
-</define>
-</div> <!-- pubdate.attlist -->
-</div> <!-- pubdate.module -->
-
-<dtd:comment> Publisher ........................ </dtd:comment>
-
-<dtd:pe-decl name="publisher.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publisher.content.module">
-<dtd:pe-decl name="publisher.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publisher.module">
-<define name="local.publisher.attrib">
-  <notAllowed/>
-</define>
-<define name="publisher.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="publisher.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publisher.element">
-<define name="publisher.element">
-  <element name="publisher">
-    <group>
-      <ref name="publishername.element"/>
-      <zeroOrMore>
-        <ref name="address.element"/>
-      </zeroOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- publisher.element -->
-
-<dtd:pe-decl name="publisher.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publisher.attlist">
-<define name="publisher.attlist">
-  <ref name="common.attrib"/>
-  <ref name="publisher.role.attrib"/>
-  <ref name="local.publisher.attrib"/>
-</define>
-</div> <!-- publisher.attlist -->
-</div> <!-- publisher.module -->
-
-    <dtd:pe-decl name="publishername.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publishername.module">
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of pubdate.element-->
+  <define name="pubdate.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="pubdate.role.attrib"/>
+    <ref name="local.pubdate.attrib"/>
+  </define>
+<!--end of pubdate.attlist-->
+<!--end of pubdate.module-->
+<!-- Publisher ........................ -->
+  <define name="local.publisher.attrib">
+    <empty/>
+  </define>
+  <define name="publisher.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="publisher">
+    <element name="publisher">
+      <ref name="publisher.attlist"/>
+      <ref name="publishername"/>
+      <zeroOrMore>
+        <ref name="address"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of publisher.element-->
+  <define name="publisher.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="publisher.role.attrib"/>
+    <ref name="local.publisher.attrib"/>
+  </define>
+<!--end of publisher.attlist-->
+<!--end of publisher.module-->
   <define name="local.publishername.attrib">
-  <notAllowed/>
-</define>
+    <empty/>
+  </define>
   <define name="publishername.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-  
-<dtd:pe-decl name="publishername.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publishername.element">
-<define name="publishername.element">
-  <element name="publishername">
-    <zeroOrMore>
-      <choice>
+    <ref name="role.attrib"/>
+  </define>
+  <define name="publishername">
+    <element name="publishername">
+      <ref name="publishername.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- publishername.element -->
-  
-<dtd:pe-decl name="publishername.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="publishername.attlist">
-<define name="publishername.attlist">
-  <ref name="common.attrib"/>
-  <ref name="publishername.role.attrib"/>
-  <ref name="local.publishername.attrib"/>
-</define>
-</div> <!-- publishername.attlist -->
-  </div> <!-- publishername.module -->
-
-  <dtd:comment> Address (defined elsewhere in this section)</dtd:comment>
-</div> <!-- publisher.content.module -->
-
-<dtd:comment> PubsNumber ....................... </dtd:comment>
-
-<dtd:pe-decl name="pubsnumber.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pubsnumber.module">
-<define name="local.pubsnumber.attrib">
-  <notAllowed/>
-</define>
-<define name="pubsnumber.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="pubsnumber.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pubsnumber.element">
-<define name="pubsnumber.element">
-  <element name="pubsnumber">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of publishername.element-->
+  <define name="publishername.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="publishername.role.attrib"/>
+    <ref name="local.publishername.attrib"/>
+  </define>
+<!--end of publishername.attlist-->
+<!--end of publishername.module-->
+<!-- Address (defined elsewhere in this section)-->
+<!--end of publisher.content.module-->
+<!-- PubsNumber ....................... -->
+  <define name="local.pubsnumber.attrib">
+    <empty/>
+  </define>
+  <define name="pubsnumber.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="pubsnumber">
+    <element name="pubsnumber">
+      <ref name="pubsnumber.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- pubsnumber.element -->
-
-<dtd:pe-decl name="pubsnumber.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="pubsnumber.attlist">
-<define name="pubsnumber.attlist">
-  <ref name="common.attrib"/>
-  <ref name="pubsnumber.role.attrib"/>
-  <ref name="local.pubsnumber.attrib"/>
-</define>
-</div> <!-- pubsnumber.attlist -->
-</div> <!-- pubsnumber.module -->
-
-<dtd:comment> ReleaseInfo ...................... </dtd:comment>
-
-<dtd:pe-decl name="releaseinfo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="releaseinfo.module">
-<define name="local.releaseinfo.attrib">
-  <notAllowed/>
-</define>
-<define name="releaseinfo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="releaseinfo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="releaseinfo.element">
-<define name="releaseinfo.element">
-  <element name="releaseinfo">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of pubsnumber.element-->
+  <define name="pubsnumber.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="pubsnumber.role.attrib"/>
+    <ref name="local.pubsnumber.attrib"/>
+  </define>
+<!--end of pubsnumber.attlist-->
+<!--end of pubsnumber.module-->
+<!-- ReleaseInfo ...................... -->
+  <define name="local.releaseinfo.attrib">
+    <empty/>
+  </define>
+  <define name="releaseinfo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="releaseinfo">
+    <element name="releaseinfo">
+      <ref name="releaseinfo.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- releaseinfo.element -->
-
-<dtd:pe-decl name="releaseinfo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="releaseinfo.attlist">
-<define name="releaseinfo.attlist">
-  <ref name="common.attrib"/>
-  <ref name="releaseinfo.role.attrib"/>
-  <ref name="local.releaseinfo.attrib"/>
-</define>
-</div> <!-- releaseinfo.attlist -->
-</div> <!-- releaseinfo.module -->
-
-<dtd:comment> RevHistory ....................... </dtd:comment>
-
-<dtd:pe-decl name="revhistory.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revhistory.content.module">
-<dtd:pe-decl name="revhistory.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revhistory.module">
-<define name="local.revhistory.attrib">
-  <notAllowed/>
-</define>
-<define name="revhistory.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="revhistory.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revhistory.element">
-<define name="revhistory.element">
-  <element name="revhistory">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of releaseinfo.element-->
+  <define name="releaseinfo.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="releaseinfo.role.attrib"/>
+    <ref name="local.releaseinfo.attrib"/>
+  </define>
+<!--end of releaseinfo.attlist-->
+<!--end of releaseinfo.module-->
+<!-- RevHistory ....................... -->
+  <define name="local.revhistory.attrib">
+    <empty/>
+  </define>
+  <define name="revhistory.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="revhistory">
+    <element name="revhistory">
+      <ref name="revhistory.attlist"/>
       <oneOrMore>
-        <ref name="revision.element"/>
+        <ref name="revision"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- revhistory.element -->
-
-<dtd:pe-decl name="revhistory.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revhistory.attlist">
-<define name="revhistory.attlist">
-  <ref name="common.attrib"/>
-  <ref name="revhistory.role.attrib"/>
-  <ref name="local.revhistory.attrib"/>
-</define>
-</div> <!-- revhistory.attlist -->
-</div> <!-- revhistory.module -->
-
-<dtd:pe-decl name="revision.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revision.module">
-<define name="local.revision.attrib">
-  <notAllowed/>
-</define>
-<define name="revision.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="revision.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revision.element">
-<define name="revision.element">
-  <element name="revision">
-    <group>
-      <ref name="revnumber.element"/>
-      <ref name="date.element"/>
+    </element>
+  </define>
+<!--end of revhistory.element-->
+  <define name="revhistory.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="revhistory.role.attrib"/>
+    <ref name="local.revhistory.attrib"/>
+  </define>
+<!--end of revhistory.attlist-->
+<!--end of revhistory.module-->
+  <define name="local.revision.attrib">
+    <empty/>
+  </define>
+  <define name="revision.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="revision">
+    <element name="revision">
+      <ref name="revision.attlist"/>
+      <ref name="revnumber"/>
+      <ref name="date"/>
       <zeroOrMore>
-        <ref name="authorinitials.element"/>
+        <ref name="authorinitials"/>
       </zeroOrMore>
       <optional>
         <choice>
-          <ref name="revremark.element"/>
-          <ref name="revdescription.element"/>
+          <ref name="revremark"/>
+          <ref name="revdescription"/>
         </choice>
       </optional>
-    </group>
-  </element>
-</define>
-</div> <!-- revision.element -->
-
-<dtd:pe-decl name="revision.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revision.attlist">
-<define name="revision.attlist">
-  <ref name="common.attrib"/>
-  <ref name="revision.role.attrib"/>
-  <ref name="local.revision.attrib"/>
-</define>
-</div> <!-- revision.attlist -->
-</div> <!-- revision.module -->
-
-<dtd:pe-decl name="revnumber.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revnumber.module">
-<define name="local.revnumber.attrib">
-  <notAllowed/>
-</define>
-<define name="revnumber.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="revnumber.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revnumber.element">
-<define name="revnumber.element">
-  <element name="revnumber">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of revision.element-->
+  <define name="revision.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="revision.role.attrib"/>
+    <ref name="local.revision.attrib"/>
+  </define>
+<!--end of revision.attlist-->
+<!--end of revision.module-->
+  <define name="local.revnumber.attrib">
+    <empty/>
+  </define>
+  <define name="revnumber.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="revnumber">
+    <element name="revnumber">
+      <ref name="revnumber.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- revnumber.element -->
-
-<dtd:pe-decl name="revnumber.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revnumber.attlist">
-<define name="revnumber.attlist">
-  <ref name="common.attrib"/>
-  <ref name="revnumber.role.attrib"/>
-  <ref name="local.revnumber.attrib"/>
-</define>
-</div> <!-- revnumber.attlist -->
-</div> <!-- revnumber.module -->
-
-<dtd:comment> Date (defined elsewhere in this section)</dtd:comment>
-<dtd:comment> AuthorInitials (defined elsewhere in this section)</dtd:comment>
-
-<dtd:pe-decl name="revremark.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revremark.module">
-<define name="local.revremark.attrib">
-  <notAllowed/>
-</define>
-<define name="revremark.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="revremark.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revremark.element">
-<define name="revremark.element">
-  <element name="revremark">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of revnumber.element-->
+  <define name="revnumber.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="revnumber.role.attrib"/>
+    <ref name="local.revnumber.attrib"/>
+  </define>
+<!--end of revnumber.attlist-->
+<!--end of revnumber.module-->
+<!-- Date (defined elsewhere in this section)-->
+<!-- AuthorInitials (defined elsewhere in this section)-->
+  <define name="local.revremark.attrib">
+    <empty/>
+  </define>
+  <define name="revremark.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="revremark">
+    <element name="revremark">
+      <ref name="revremark.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- revremark.element -->
-
-<dtd:pe-decl name="revremark.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revremark.attlist">
-<define name="revremark.attlist">
-  <ref name="common.attrib"/>
-  <ref name="revremark.role.attrib"/>
-  <ref name="local.revremark.attrib"/>
-</define>
-</div> <!-- revremark.attlist -->
-</div> <!-- revremark.module -->
-
-<dtd:pe-decl name="revdescription.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revdescription.module">
-<define name="local.revdescription.attrib">
-  <notAllowed/>
-</define>
-<define name="revdescription.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="revdescription.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revdescription.element">
-<define name="revdescription.element">
-  <element name="revdescription">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of revremark.element-->
+  <define name="revremark.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="revremark.role.attrib"/>
+    <ref name="local.revremark.attrib"/>
+  </define>
+<!--end of revremark.attlist-->
+<!--end of revremark.module-->
+  <define name="local.revdescription.attrib">
+    <empty/>
+  </define>
+  <define name="revdescription.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="revdescription">
+    <element name="revdescription">
+      <ref name="revdescription.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="revdescription.mix"/>
-        </choice>
+        <ref name="revdescription.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- revdescription.element -->
-
-<dtd:pe-decl name="revdescription.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="revdescription.attlist">
-<define name="revdescription.attlist">
-  <ref name="common.attrib"/>
-  <ref name="revdescription.role.attrib"/>
-  <ref name="local.revdescription.attrib"/>
-</define>
-</div> <!-- revdescription.attlist -->
-</div> <!-- revdescription.module -->
-</div> <!-- revhistory.content.module -->
-
-<dtd:comment> SeriesVolNums .................... </dtd:comment>
-
-<dtd:pe-decl name="seriesvolnums.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seriesvolnums.module">
-<define name="local.seriesvolnums.attrib">
-  <notAllowed/>
-</define>
-<define name="seriesvolnums.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="seriesvolnums.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seriesvolnums.element">
-<define name="seriesvolnums.element">
-  <element name="seriesvolnums">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of revdescription.element-->
+  <define name="revdescription.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="revdescription.role.attrib"/>
+    <ref name="local.revdescription.attrib"/>
+  </define>
+<!--end of revdescription.attlist-->
+<!--end of revdescription.module-->
+<!--end of revhistory.content.module-->
+<!-- SeriesVolNums .................... -->
+  <define name="local.seriesvolnums.attrib">
+    <empty/>
+  </define>
+  <define name="seriesvolnums.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="seriesvolnums">
+    <element name="seriesvolnums">
+      <ref name="seriesvolnums.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- seriesvolnums.element -->
-
-<dtd:pe-decl name="seriesvolnums.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seriesvolnums.attlist">
-<define name="seriesvolnums.attlist">
-  <ref name="common.attrib"/>
-  <ref name="seriesvolnums.role.attrib"/>
-  <ref name="local.seriesvolnums.attrib"/>
-</define>
-</div> <!-- seriesvolnums.attlist -->
-</div> <!-- seriesvolnums.module -->
-
-<dtd:comment> VolumeNum ........................ </dtd:comment>
-
-<dtd:pe-decl name="volumenum.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="volumenum.module">
-<define name="local.volumenum.attrib">
-  <notAllowed/>
-</define>
-<define name="volumenum.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="volumenum.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="volumenum.element">
-<define name="volumenum.element">
-  <element name="volumenum">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of seriesvolnums.element-->
+  <define name="seriesvolnums.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="seriesvolnums.role.attrib"/>
+    <ref name="local.seriesvolnums.attrib"/>
+  </define>
+<!--end of seriesvolnums.attlist-->
+<!--end of seriesvolnums.module-->
+<!-- VolumeNum ........................ -->
+  <define name="local.volumenum.attrib">
+    <empty/>
+  </define>
+  <define name="volumenum.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="volumenum">
+    <element name="volumenum">
+      <ref name="volumenum.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- volumenum.element -->
-
-<dtd:pe-decl name="volumenum.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="volumenum.attlist">
-<define name="volumenum.attlist">
-  <ref name="common.attrib"/>
-  <ref name="volumenum.role.attrib"/>
-  <ref name="local.volumenum.attrib"/>
-</define>
-</div> <!-- volumenum.attlist -->
-</div> <!-- volumenum.module -->
-
-<dtd:comment> .................................. </dtd:comment>
-
-</div> <!-- docinfo.content.module -->
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Inline, link, and ubiquitous elements ................................ </dtd:comment>
-
-<dtd:comment> Technical and computer terms ......................................... </dtd:comment>
-
-<dtd:pe-decl name="accel.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="accel.module">
-<define name="local.accel.attrib">
-  <notAllowed/>
-</define>
-<define name="accel.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="accel.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="accel.element">
-<define name="accel.element">
-  <element name="accel">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of volumenum.element-->
+  <define name="volumenum.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="volumenum.role.attrib"/>
+    <ref name="local.volumenum.attrib"/>
+  </define>
+<!--end of volumenum.attlist-->
+<!--end of volumenum.module-->
+<!-- .................................. -->
+<!--end of docinfo.content.module-->
+<!-- ...................................................................... -->
+<!-- Inline, link, and ubiquitous elements ................................ -->
+<!-- Technical and computer terms ......................................... -->
+  <define name="local.accel.attrib">
+    <empty/>
+  </define>
+  <define name="accel.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="accel">
+    <element name="accel">
+      <ref name="accel.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- accel.element -->
-
-<dtd:pe-decl name="accel.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="accel.attlist">
-<define name="accel.attlist">
-  <ref name="common.attrib"/>
-  <ref name="accel.role.attrib"/>
-  <ref name="local.accel.attrib"/>
-</define>
-</div> <!-- accel.attlist -->
-</div> <!-- accel.module -->
-
-<dtd:pe-decl name="action.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="action.module">
-<define name="local.action.attrib">
-  <notAllowed/>
-</define>
-<define name="action.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="action.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="action.element">
-<define name="action.element">
-  <element name="action">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of accel.element-->
+  <define name="accel.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="accel.role.attrib"/>
+    <ref name="local.accel.attrib"/>
+  </define>
+<!--end of accel.attlist-->
+<!--end of accel.module-->
+  <define name="local.action.attrib">
+    <empty/>
+  </define>
+  <define name="action.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="action">
+    <element name="action">
+      <ref name="action.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- action.element -->
-
-<dtd:pe-decl name="action.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="action.attlist">
-<define name="action.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="action.role.attrib"/>
-  <ref name="local.action.attrib"/>
-</define>
-</div> <!-- action.attlist -->
-</div> <!-- action.module -->
-
-<dtd:pe-decl name="application.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="application.module">
-<define name="local.application.attrib">
-  <notAllowed/>
-</define>
-<define name="application.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="application.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="application.element">
-<define name="application.element">
-  <element name="application">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of action.element-->
+  <define name="action.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="action.role.attrib"/>
+    <ref name="local.action.attrib"/>
+  </define>
+<!--end of action.attlist-->
+<!--end of action.module-->
+  <define name="local.application.attrib">
+    <empty/>
+  </define>
+  <define name="application.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="application">
+    <element name="application">
+      <ref name="application.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- application.element -->
-
-<dtd:pe-decl name="application.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="application.attlist">
-<define name="application.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>hardware</value>
-        <value>software</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="application.role.attrib"/>
-  <ref name="local.application.attrib"/>
-</define>
-</div> <!-- application.attlist -->
-</div> <!-- application.module -->
-
-<dtd:pe-decl name="classname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classname.module">
-<define name="local.classname.attrib">
-  <notAllowed/>
-</define>
-<define name="classname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="classname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classname.element">
-<define name="classname.element">
-  <element name="classname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of application.element-->
+  <define name="application.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>hardware</value>
+          <value>software</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="application.role.attrib"/>
+    <ref name="local.application.attrib"/>
+  </define>
+<!--end of application.attlist-->
+<!--end of application.module-->
+  <define name="local.classname.attrib">
+    <empty/>
+  </define>
+  <define name="classname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="classname">
+    <element name="classname">
+      <ref name="classname.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- classname.element -->
-
-<dtd:pe-decl name="classname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="classname.attlist">
-<define name="classname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="classname.role.attrib"/>
-  <ref name="local.classname.attrib"/>
-</define>
-</div> <!-- classname.attlist -->
-</div> <!-- classname.module -->
-
-<dtd:pe-decl name="co.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="co.module">
-<define name="local.co.attrib">
-  <notAllowed/>
-</define>
-<dtd:comment> CO is a callout area of the LineColumn unit type (a single character 
-     position); the position is directly indicated by the location of CO. </dtd:comment>
-<define name="co.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="co.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="co.element">
-<define name="co.element">
-  <element name="co">
-    <empty/>
-  </element>
-</define>
-</div> <!-- co.element -->
-
-<dtd:comment> bug number/symbol override or initialization </dtd:comment>
-<dtd:comment> to any related information </dtd:comment>
-
-
-<dtd:pe-decl name="co.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="co.attlist">
-<define name="co.attlist">
-  <ref name="label.attrib"/>
-  <ref name="linkends.attrib"/>
-  <ref name="idreq.common.attrib"/>
-  <ref name="co.role.attrib"/>
-  <ref name="local.co.attrib"/>
-</define>
-</div> <!-- co.attlist -->
-</div> <!-- co.module -->
-
-<dtd:pe-decl name="command.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="command.module">
-<define name="local.command.attrib">
-  <notAllowed/>
-</define>
-<define name="command.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="command.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="command.element">
-<define name="command.element">
-  <element name="command">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of classname.element-->
+  <define name="classname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="classname.role.attrib"/>
+    <ref name="local.classname.attrib"/>
+  </define>
+<!--end of classname.attlist-->
+<!--end of classname.module-->
+  <define name="local.co.attrib">
+    <empty/>
+  </define>
+<!-- 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"/>
+  </define>
+  <define name="co">
+    <element name="co">
+      <ref name="co.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of co.element-->
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+  <define name="co.attlist" combine="interleave">
+    <ref name="label.attrib"/>
+    <ref name="linkends.attrib"/>
+    <ref name="idreq.common.attrib"/>
+    <ref name="co.role.attrib"/>
+    <ref name="local.co.attrib"/>
+  </define>
+<!--end of co.attlist-->
+<!--end of co.module-->
+  <define name="local.command.attrib">
+    <empty/>
+  </define>
+  <define name="command.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="command">
+    <element name="command">
+      <ref name="command.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- command.element -->
-
-<dtd:pe-decl name="command.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="command.attlist">
-<define name="command.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="command.role.attrib"/>
-  <ref name="local.command.attrib"/>
-</define>
-</div> <!-- command.attlist -->
-</div> <!-- command.module -->
-
-<dtd:pe-decl name="computeroutput.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="computeroutput.module">
-<define name="local.computeroutput.attrib">
-  <notAllowed/>
-</define>
-<define name="computeroutput.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="computeroutput.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="computeroutput.element">
-<define name="computeroutput.element">
-  <element name="computeroutput">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of command.element-->
+  <define name="command.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="command.role.attrib"/>
+    <ref name="local.command.attrib"/>
+  </define>
+<!--end of command.attlist-->
+<!--end of command.module-->
+  <define name="local.computeroutput.attrib">
+    <empty/>
+  </define>
+  <define name="computeroutput.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="computeroutput">
+    <element name="computeroutput">
+      <ref name="computeroutput.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- computeroutput.element -->
-
-<dtd:pe-decl name="computeroutput.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="computeroutput.attlist">
-<define name="computeroutput.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="computeroutput.role.attrib"/>
-  <ref name="local.computeroutput.attrib"/>
-</define>
-</div> <!-- computeroutput.attlist -->
-</div> <!-- computeroutput.module -->
-
-<dtd:pe-decl name="database.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="database.module">
-<define name="local.database.attrib">
-  <notAllowed/>
-</define>
-<define name="database.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="database.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="database.element">
-<define name="database.element">
-  <element name="database">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of computeroutput.element-->
+  <define name="computeroutput.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="computeroutput.role.attrib"/>
+    <ref name="local.computeroutput.attrib"/>
+  </define>
+<!--end of computeroutput.attlist-->
+<!--end of computeroutput.module-->
+  <define name="local.database.attrib">
+    <empty/>
+  </define>
+  <define name="database.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="database">
+    <element name="database">
+      <ref name="database.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- database.element -->
-
-<dtd:comment> Class: Type of database the element names; no default </dtd:comment>
-
-
-<dtd:pe-decl name="database.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="database.attlist">
-<define name="database.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>name</value>
-        <value>table</value>
-        <value>field</value>
-        <value>key1</value>
-        <value>key2</value>
-        <value>record</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="database.role.attrib"/>
-  <ref name="local.database.attrib"/>
-</define>
-</div> <!-- database.attlist -->
-</div> <!-- database.module -->
-
-<dtd:pe-decl name="email.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="email.module">
-<define name="local.email.attrib">
-  <notAllowed/>
-</define>
-<define name="email.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="email.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="email.element">
-<define name="email.element">
-  <element name="email">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of database.element-->
+<!-- Class: Type of database the element names; no default -->
+  <define name="database.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>name</value>
+          <value>table</value>
+          <value>field</value>
+          <value>key1</value>
+          <value>key2</value>
+          <value>record</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="database.role.attrib"/>
+    <ref name="local.database.attrib"/>
+  </define>
+<!--end of database.attlist-->
+<!--end of database.module-->
+  <define name="local.email.attrib">
+    <empty/>
+  </define>
+  <define name="email.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="email">
+    <element name="email">
+      <ref name="email.attlist"/>
+      <zeroOrMore>
         <ref name="docinfo.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- email.element -->
-
-<dtd:pe-decl name="email.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="email.attlist">
-<define name="email.attlist">
-  <ref name="common.attrib"/>
-  <ref name="email.role.attrib"/>
-  <ref name="local.email.attrib"/>
-</define>
-</div> <!-- email.attlist -->
-</div> <!-- email.module -->
-
-<dtd:pe-decl name="envar.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="envar.module">
-<define name="local.envar.attrib">
-  <notAllowed/>
-</define>
-<define name="envar.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="envar.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="envar.element">
-<define name="envar.element">
-  <element name="envar">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of email.element-->
+  <define name="email.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="email.role.attrib"/>
+    <ref name="local.email.attrib"/>
+  </define>
+<!--end of email.attlist-->
+<!--end of email.module-->
+  <define name="local.envar.attrib">
+    <empty/>
+  </define>
+  <define name="envar.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="envar">
+    <element name="envar">
+      <ref name="envar.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- envar.element -->
-
-<dtd:pe-decl name="envar.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="envar.attlist">
-<define name="envar.attlist">
-  <ref name="common.attrib"/>
-  <ref name="envar.role.attrib"/>
-  <ref name="local.envar.attrib"/>
-</define>
-</div> <!-- envar.attlist -->
-</div> <!-- envar.module -->
-
-
-<dtd:pe-decl name="errorcode.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errorcode.module">
-<define name="local.errorcode.attrib">
-  <notAllowed/>
-</define>
-<define name="errorcode.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="errorcode.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errorcode.element">
-<define name="errorcode.element">
-  <element name="errorcode">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of envar.element-->
+  <define name="envar.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="envar.role.attrib"/>
+    <ref name="local.envar.attrib"/>
+  </define>
+<!--end of envar.attlist-->
+<!--end of envar.module-->
+  <define name="local.errorcode.attrib">
+    <empty/>
+  </define>
+  <define name="errorcode.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="errorcode">
+    <element name="errorcode">
+      <ref name="errorcode.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- errorcode.element -->
-
-<dtd:pe-decl name="errorcode.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errorcode.attlist">
-<define name="errorcode.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="errorcode.role.attrib"/>
-  <ref name="local.errorcode.attrib"/>
-</define>
-</div> <!-- errorcode.attlist -->
-</div> <!-- errorcode.module -->
-
-<dtd:pe-decl name="errorname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errorname.module">
-<define name="local.errorname.attrib">
-  <notAllowed/>
-</define>
-<define name="errorname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="errorname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errorname.element">
-<define name="errorname.element">
-  <element name="errorname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of errorcode.element-->
+  <define name="errorcode.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="errorcode.role.attrib"/>
+    <ref name="local.errorcode.attrib"/>
+  </define>
+<!--end of errorcode.attlist-->
+<!--end of errorcode.module-->
+  <define name="local.errorname.attrib">
+    <empty/>
+  </define>
+  <define name="errorname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="errorname">
+    <element name="errorname">
+      <ref name="errorname.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- errorname.element -->
-
-<dtd:pe-decl name="errorname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errorname.attlist">
-<define name="errorname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="errorname.role.attrib"/>
-  <ref name="local.errorname.attrib"/>
-</define>
-</div> <!-- errorname.attlist -->
-</div> <!-- errorname.module -->
-
-<dtd:pe-decl name="errortype.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errortype.module">
-<define name="local.errortype.attrib">
-  <notAllowed/>
-</define>
-<define name="errortype.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="errortype.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errortype.element">
-<define name="errortype.element">
-  <element name="errortype">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of errorname.element-->
+  <define name="errorname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="errorname.role.attrib"/>
+    <ref name="local.errorname.attrib"/>
+  </define>
+<!--end of errorname.attlist-->
+<!--end of errorname.module-->
+  <define name="local.errortype.attrib">
+    <empty/>
+  </define>
+  <define name="errortype.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="errortype">
+    <element name="errortype">
+      <ref name="errortype.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- errortype.element -->
-
-<dtd:pe-decl name="errortype.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="errortype.attlist">
-<define name="errortype.attlist">
-  <ref name="common.attrib"/>
-  <ref name="errortype.role.attrib"/>
-  <ref name="local.errortype.attrib"/>
-</define>
-</div> <!-- errortype.attlist -->
-</div> <!-- errortype.module -->
-
-<dtd:pe-decl name="filename.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="filename.module">
-<define name="local.filename.attrib">
-  <notAllowed/>
-</define>
-<define name="filename.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="filename.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="filename.element">
-<define name="filename.element">
-  <element name="filename">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of errortype.element-->
+  <define name="errortype.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="errortype.role.attrib"/>
+    <ref name="local.errortype.attrib"/>
+  </define>
+<!--end of errortype.attlist-->
+<!--end of errortype.module-->
+  <define name="local.filename.attrib">
+    <empty/>
+  </define>
+  <define name="filename.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="filename">
+    <element name="filename">
+      <ref name="filename.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- filename.element -->
-
-<dtd:comment> Class: Type of filename the element names; no default </dtd:comment>
-<dtd:comment> Path: Search path (possibly system-specific) in which 
-		file can be found </dtd:comment>
-
-
-<dtd:pe-decl name="filename.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="filename.attlist">
-<define name="filename.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>headerfile</value>
-        <value>devicefile</value>
-        <value>libraryfile</value>
-        <value>directory</value>
-        <value>symlink</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="path"/>
-  </optional>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="filename.role.attrib"/>
-  <ref name="local.filename.attrib"/>
-</define>
-</div> <!-- filename.attlist -->
-</div> <!-- filename.module -->
-
-<dtd:pe-decl name="function.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="function.module">
-<define name="local.function.attrib">
-  <notAllowed/>
-</define>
-<define name="function.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="function.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="function.element">
-<define name="function.element">
-  <element name="function">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of filename.element-->
+<!-- Class: Type of filename the element names; no default -->
+<!-- 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>devicefile</value>
+          <value>libraryfile</value>
+          <value>directory</value>
+          <value>symlink</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="filename.role.attrib"/>
+    <ref name="local.filename.attrib"/>
+  </define>
+<!--end of filename.attlist-->
+<!--end of filename.module-->
+  <define name="local.function.attrib">
+    <empty/>
+  </define>
+  <define name="function.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="function">
+    <element name="function">
+      <ref name="function.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- function.element -->
-
-<dtd:pe-decl name="function.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="function.attlist">
-<define name="function.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="function.role.attrib"/>
-  <ref name="local.function.attrib"/>
-</define>
-</div> <!-- function.attlist -->
-</div> <!-- function.module -->
-
-<dtd:pe-decl name="guibutton.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guibutton.module">
-<define name="local.guibutton.attrib">
-  <notAllowed/>
-</define>
-<define name="guibutton.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="guibutton.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guibutton.element">
-<define name="guibutton.element">
-  <element name="guibutton">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- guibutton.element -->
-
-<dtd:pe-decl name="guibutton.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guibutton.attlist">
-<define name="guibutton.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="guibutton.role.attrib"/>
-  <ref name="local.guibutton.attrib"/>
-</define>
-</div> <!-- guibutton.attlist -->
-</div> <!-- guibutton.module -->
-
-<dtd:pe-decl name="guiicon.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guiicon.module">
-<define name="local.guiicon.attrib">
-  <notAllowed/>
-</define>
-<define name="guiicon.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="guiicon.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guiicon.element">
-<define name="guiicon.element">
-  <element name="guiicon">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- guiicon.element -->
-
-<dtd:pe-decl name="guiicon.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guiicon.attlist">
-<define name="guiicon.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="guiicon.role.attrib"/>
-  <ref name="local.guiicon.attrib"/>
-</define>
-</div> <!-- guiicon.attlist -->
-</div> <!-- guiicon.module -->
-
-<dtd:pe-decl name="guilabel.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guilabel.module">
-<define name="local.guilabel.attrib">
-  <notAllowed/>
-</define>
-<define name="guilabel.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="guilabel.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guilabel.element">
-<define name="guilabel.element">
-  <element name="guilabel">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- guilabel.element -->
-
-<dtd:pe-decl name="guilabel.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guilabel.attlist">
-<define name="guilabel.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="guilabel.role.attrib"/>
-  <ref name="local.guilabel.attrib"/>
-</define>
-</div> <!-- guilabel.attlist -->
-</div> <!-- guilabel.module -->
-
-<dtd:pe-decl name="guimenu.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guimenu.module">
-<define name="local.guimenu.attrib">
-  <notAllowed/>
-</define>
-<define name="guimenu.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="guimenu.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guimenu.element">
-<define name="guimenu.element">
-  <element name="guimenu">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- guimenu.element -->
-
-<dtd:pe-decl name="guimenu.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guimenu.attlist">
-<define name="guimenu.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="guimenu.role.attrib"/>
-  <ref name="local.guimenu.attrib"/>
-</define>
-</div> <!-- guimenu.attlist -->
-</div> <!-- guimenu.module -->
-
-<dtd:pe-decl name="guimenuitem.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guimenuitem.module">
-<define name="local.guimenuitem.attrib">
-  <notAllowed/>
-</define>
-<define name="guimenuitem.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="guimenuitem.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guimenuitem.element">
-<define name="guimenuitem.element">
-  <element name="guimenuitem">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- guimenuitem.element -->
-
-<dtd:pe-decl name="guimenuitem.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guimenuitem.attlist">
-<define name="guimenuitem.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="guimenuitem.role.attrib"/>
-  <ref name="local.guimenuitem.attrib"/>
-</define>
-</div> <!-- guimenuitem.attlist -->
-</div> <!-- guimenuitem.module -->
-
-<dtd:pe-decl name="guisubmenu.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guisubmenu.module">
-<define name="local.guisubmenu.attrib">
-  <notAllowed/>
-</define>
-<define name="guisubmenu.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="guisubmenu.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guisubmenu.element">
-<define name="guisubmenu.element">
-  <element name="guisubmenu">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- guisubmenu.element -->
-
-<dtd:pe-decl name="guisubmenu.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="guisubmenu.attlist">
-<define name="guisubmenu.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="guisubmenu.role.attrib"/>
-  <ref name="local.guisubmenu.attrib"/>
-</define>
-</div> <!-- guisubmenu.attlist -->
-</div> <!-- guisubmenu.module -->
-
-<dtd:pe-decl name="hardware.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="hardware.module">
-<define name="local.hardware.attrib">
-  <notAllowed/>
-</define>
-<define name="hardware.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="hardware.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="hardware.element">
-<define name="hardware.element">
-  <element name="hardware">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- hardware.element -->
-
-<dtd:pe-decl name="hardware.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="hardware.attlist">
-<define name="hardware.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="hardware.role.attrib"/>
-  <ref name="local.hardware.attrib"/>
-</define>
-</div> <!-- hardware.attlist -->
-</div> <!-- hardware.module -->
-
-<dtd:pe-decl name="interface.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="interface.module">
-<define name="local.interface.attrib">
-  <notAllowed/>
-</define>
-<define name="interface.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="interface.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="interface.element">
-<define name="interface.element">
-  <element name="interface">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of function.element-->
+  <define name="function.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="function.role.attrib"/>
+    <ref name="local.function.attrib"/>
+  </define>
+<!--end of function.attlist-->
+<!--end of function.module-->
+  <define name="local.guibutton.attrib">
+    <empty/>
+  </define>
+  <define name="guibutton.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="guibutton">
+    <element name="guibutton">
+      <ref name="guibutton.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of guibutton.element-->
+  <define name="guibutton.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="guibutton.role.attrib"/>
+    <ref name="local.guibutton.attrib"/>
+  </define>
+<!--end of guibutton.attlist-->
+<!--end of guibutton.module-->
+  <define name="local.guiicon.attrib">
+    <empty/>
+  </define>
+  <define name="guiicon.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="guiicon">
+    <element name="guiicon">
+      <ref name="guiicon.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of guiicon.element-->
+  <define name="guiicon.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="guiicon.role.attrib"/>
+    <ref name="local.guiicon.attrib"/>
+  </define>
+<!--end of guiicon.attlist-->
+<!--end of guiicon.module-->
+  <define name="local.guilabel.attrib">
+    <empty/>
+  </define>
+  <define name="guilabel.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="guilabel">
+    <element name="guilabel">
+      <ref name="guilabel.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of guilabel.element-->
+  <define name="guilabel.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="guilabel.role.attrib"/>
+    <ref name="local.guilabel.attrib"/>
+  </define>
+<!--end of guilabel.attlist-->
+<!--end of guilabel.module-->
+  <define name="local.guimenu.attrib">
+    <empty/>
+  </define>
+  <define name="guimenu.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="guimenu">
+    <element name="guimenu">
+      <ref name="guimenu.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of guimenu.element-->
+  <define name="guimenu.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="guimenu.role.attrib"/>
+    <ref name="local.guimenu.attrib"/>
+  </define>
+<!--end of guimenu.attlist-->
+<!--end of guimenu.module-->
+  <define name="local.guimenuitem.attrib">
+    <empty/>
+  </define>
+  <define name="guimenuitem.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="guimenuitem">
+    <element name="guimenuitem">
+      <ref name="guimenuitem.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of guimenuitem.element-->
+  <define name="guimenuitem.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="guimenuitem.role.attrib"/>
+    <ref name="local.guimenuitem.attrib"/>
+  </define>
+<!--end of guimenuitem.attlist-->
+<!--end of guimenuitem.module-->
+  <define name="local.guisubmenu.attrib">
+    <empty/>
+  </define>
+  <define name="guisubmenu.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="guisubmenu">
+    <element name="guisubmenu">
+      <ref name="guisubmenu.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of guisubmenu.element-->
+  <define name="guisubmenu.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="guisubmenu.role.attrib"/>
+    <ref name="local.guisubmenu.attrib"/>
+  </define>
+<!--end of guisubmenu.attlist-->
+<!--end of guisubmenu.module-->
+  <define name="local.hardware.attrib">
+    <empty/>
+  </define>
+  <define name="hardware.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="hardware">
+    <element name="hardware">
+      <ref name="hardware.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-        <ref name="accel.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- interface.element -->
-
-<dtd:comment> Class: Type of the Interface item; no default </dtd:comment>
-
-
-<dtd:pe-decl name="interface.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="interface.attlist">
-<define name="interface.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="interface.role.attrib"/>
-  <ref name="local.interface.attrib"/>
-</define>
-</div> <!-- interface.attlist -->
-</div> <!-- interface.module -->
-
-<dtd:pe-decl name="keycap.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycap.module">
-<define name="local.keycap.attrib">
-  <notAllowed/>
-</define>
-<define name="keycap.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="keycap.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycap.element">
-<define name="keycap.element">
-  <element name="keycap">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of hardware.element-->
+  <define name="hardware.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="hardware.role.attrib"/>
+    <ref name="local.hardware.attrib"/>
+  </define>
+<!--end of hardware.attlist-->
+<!--end of hardware.module-->
+  <define name="local.interface.attrib">
+    <empty/>
+  </define>
+  <define name="interface.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="interface">
+    <element name="interface">
+      <ref name="interface.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="accel"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of interface.element-->
+<!-- Class: Type of the Interface item; no default -->
+  <define name="interface.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="interface.role.attrib"/>
+    <ref name="local.interface.attrib"/>
+  </define>
+<!--end of interface.attlist-->
+<!--end of interface.module-->
+  <define name="local.keycap.attrib">
+    <empty/>
+  </define>
+  <define name="keycap.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="keycap">
+    <element name="keycap">
+      <ref name="keycap.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- keycap.element -->
-
-<dtd:pe-decl name="keycap.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycap.attlist">
-<define name="keycap.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="keycap.role.attrib"/>
-  <ref name="local.keycap.attrib"/>
-</define>
-</div> <!-- keycap.attlist -->
-</div> <!-- keycap.module -->
-
-<dtd:pe-decl name="keycode.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycode.module">
-<define name="local.keycode.attrib">
-  <notAllowed/>
-</define>
-<define name="keycode.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="keycode.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycode.element">
-<define name="keycode.element">
-  <element name="keycode">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of keycap.element-->
+  <define name="keycap.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="keycap.role.attrib"/>
+    <ref name="local.keycap.attrib"/>
+  </define>
+<!--end of keycap.attlist-->
+<!--end of keycap.module-->
+  <define name="local.keycode.attrib">
+    <empty/>
+  </define>
+  <define name="keycode.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="keycode">
+    <element name="keycode">
+      <ref name="keycode.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- keycode.element -->
-
-<dtd:pe-decl name="keycode.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycode.attlist">
-<define name="keycode.attlist">
-  <ref name="common.attrib"/>
-  <ref name="keycode.role.attrib"/>
-  <ref name="local.keycode.attrib"/>
-</define>
-</div> <!-- keycode.attlist -->
-</div> <!-- keycode.module -->
-
-<dtd:pe-decl name="keycombo.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycombo.module">
-<define name="local.keycombo.attrib">
-  <notAllowed/>
-</define>
-<define name="keycombo.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="keycombo.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycombo.element">
-<define name="keycombo.element">
-  <element name="keycombo">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of keycode.element-->
+  <define name="keycode.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="keycode.role.attrib"/>
+    <ref name="local.keycode.attrib"/>
+  </define>
+<!--end of keycode.attlist-->
+<!--end of keycode.module-->
+  <define name="local.keycombo.attrib">
+    <empty/>
+  </define>
+  <define name="keycombo.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="keycombo">
+    <element name="keycombo">
+      <ref name="keycombo.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="keycap.element"/>
-          <ref name="keycombo.element"/>
-          <ref name="keysym.element"/>
-          <ref name="mousebutton.element"/>
+          <ref name="keycap"/>
+          <ref name="keycombo"/>
+          <ref name="keysym"/>
+          <ref name="mousebutton"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- keycombo.element -->
-
-<dtd:pe-decl name="keycombo.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keycombo.attlist">
-<define name="keycombo.attlist">
-  <ref name="keyaction.attrib"/>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="keycombo.role.attrib"/>
-  <ref name="local.keycombo.attrib"/>
-</define>
-</div> <!-- keycombo.attlist -->
-</div> <!-- keycombo.module -->
-
-<dtd:pe-decl name="keysym.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keysym.module">
-<define name="local.keysym.attrib">
-  <notAllowed/>
-</define>
-<define name="keysysm.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="keysym.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keysym.element">
-<define name="keysym.element">
-  <element name="keysym">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of keycombo.element-->
+  <define name="keycombo.attlist" combine="interleave">
+    <ref name="keyaction.attrib"/>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="keycombo.role.attrib"/>
+    <ref name="local.keycombo.attrib"/>
+  </define>
+<!--end of keycombo.attlist-->
+<!--end of keycombo.module-->
+  <define name="local.keysym.attrib">
+    <empty/>
+  </define>
+  <define name="keysysm.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="keysym">
+    <element name="keysym">
+      <ref name="keysym.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- keysym.element -->
-
-<dtd:pe-decl name="keysym.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="keysym.attlist">
-<define name="keysym.attlist">
-  <ref name="common.attrib"/>
-  <ref name="keysysm.role.attrib"/>
-  <ref name="local.keysym.attrib"/>
-</define>
-</div> <!-- keysym.attlist -->
-</div> <!-- keysym.module -->
-
-<dtd:pe-decl name="lineannotation.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="lineannotation.module">
-<define name="local.lineannotation.attrib">
-  <notAllowed/>
-</define>
-<define name="lineannotation.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="lineannotation.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="lineannotation.element">
-<define name="lineannotation.element">
-  <element name="lineannotation">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of keysym.element-->
+  <define name="keysym.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="keysysm.role.attrib"/>
+    <ref name="local.keysym.attrib"/>
+  </define>
+<!--end of keysym.attlist-->
+<!--end of keysym.module-->
+  <define name="local.lineannotation.attrib">
+    <empty/>
+  </define>
+  <define name="lineannotation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="lineannotation">
+    <element name="lineannotation">
+      <ref name="lineannotation.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- lineannotation.element -->
-
-<dtd:pe-decl name="lineannotation.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="lineannotation.attlist">
-<define name="lineannotation.attlist">
-  <ref name="common.attrib"/>
-  <ref name="lineannotation.role.attrib"/>
-  <ref name="local.lineannotation.attrib"/>
-</define>
-</div> <!-- lineannotation.attlist -->
-</div> <!-- lineannotation.module -->
-
-<dtd:pe-decl name="literal.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="literal.module">
-<define name="local.literal.attrib">
-  <notAllowed/>
-</define>
-<define name="literal.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="literal.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="literal.element">
-<define name="literal.element">
-  <element name="literal">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of lineannotation.element-->
+  <define name="lineannotation.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="lineannotation.role.attrib"/>
+    <ref name="local.lineannotation.attrib"/>
+  </define>
+<!--end of lineannotation.attlist-->
+<!--end of lineannotation.module-->
+  <define name="local.literal.attrib">
+    <empty/>
+  </define>
+  <define name="literal.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="literal">
+    <element name="literal">
+      <ref name="literal.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- literal.element -->
-
-<dtd:pe-decl name="literal.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="literal.attlist">
-<define name="literal.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="literal.role.attrib"/>
-  <ref name="local.literal.attrib"/>
-</define>
-</div> <!-- literal.attlist -->
-</div> <!-- literal.module -->
-
-<dtd:pe-decl name="constant.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="constant.module">
-<define name="local.constant.attrib">
-  <notAllowed/>
-</define>
-<define name="constant.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="constant.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="constant.element">
-<define name="constant.element">
-  <element name="constant">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of literal.element-->
+  <define name="literal.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="literal.role.attrib"/>
+    <ref name="local.literal.attrib"/>
+  </define>
+<!--end of literal.attlist-->
+<!--end of literal.module-->
+  <define name="local.constant.attrib">
+    <empty/>
+  </define>
+  <define name="constant.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="constant">
+    <element name="constant">
+      <ref name="constant.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- constant.element -->
-
-<dtd:pe-decl name="constant.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="constant.attlist">
-<define name="constant.attlist">
-  <ref name="common.attrib"/>
-  <ref name="constant.role.attrib"/>
-  <ref name="local.constant.attrib"/>
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>limit</value>
-      </choice>
-    </attribute>
-  </optional>
-</define>
-</div> <!-- constant.attlist -->
-</div> <!-- constant.module -->
-
-<dtd:pe-decl name="varname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varname.module">
-<define name="local.varname.attrib">
-  <notAllowed/>
-</define>
-<define name="varname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="varname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varname.element">
-<define name="varname.element">
-  <element name="varname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </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>
+          <value>limit</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+<!--end of constant.attlist-->
+<!--end of constant.module-->
+  <define name="local.varname.attrib">
+    <empty/>
+  </define>
+  <define name="varname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="varname">
+    <element name="varname">
+      <ref name="varname.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- varname.element -->
-
-<dtd:pe-decl name="varname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="varname.attlist">
-<define name="varname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="varname.role.attrib"/>
-  <ref name="local.varname.attrib"/>
-</define>
-</div> <!-- varname.attlist -->
-</div> <!-- varname.module -->
-
-<dtd:pe-decl name="markup.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="markup.module">
-<define name="local.markup.attrib">
-  <notAllowed/>
-</define>
-<define name="markup.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="markup.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="markup.element">
-<define name="markup.element">
-  <element name="markup">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of varname.element-->
+  <define name="varname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="varname.role.attrib"/>
+    <ref name="local.varname.attrib"/>
+  </define>
+<!--end of varname.attlist-->
+<!--end of varname.module-->
+  <define name="local.markup.attrib">
+    <empty/>
+  </define>
+  <define name="markup.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="markup">
+    <element name="markup">
+      <ref name="markup.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- markup.element -->
-
-<dtd:pe-decl name="markup.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="markup.attlist">
-<define name="markup.attlist">
-  <ref name="common.attrib"/>
-  <ref name="markup.role.attrib"/>
-  <ref name="local.markup.attrib"/>
-</define>
-</div> <!-- markup.attlist -->
-</div> <!-- markup.module -->
-
-<dtd:pe-decl name="medialabel.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="medialabel.module">
-<define name="local.medialabel.attrib">
-  <notAllowed/>
-</define>
-<define name="medialabel.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="medialabel.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="medialabel.element">
-<define name="medialabel.element">
-  <element name="medialabel">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of markup.element-->
+  <define name="markup.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="markup.role.attrib"/>
+    <ref name="local.markup.attrib"/>
+  </define>
+<!--end of markup.attlist-->
+<!--end of markup.module-->
+  <define name="local.medialabel.attrib">
+    <empty/>
+  </define>
+  <define name="medialabel.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="medialabel">
+    <element name="medialabel">
+      <ref name="medialabel.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- medialabel.element -->
-
-<dtd:comment> Class: Type of medium named by the element; no default </dtd:comment>
-
-
-<dtd:pe-decl name="medialabel.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="medialabel.attlist">
-<define name="medialabel.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>cartridge</value>
-        <value>cdrom</value>
-        <value>disk</value>
-        <value>tape</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="medialabel.role.attrib"/>
-  <ref name="local.medialabel.attrib"/>
-</define>
-</div> <!-- medialabel.attlist -->
-</div> <!-- medialabel.module -->
-
-<dtd:pe-decl name="menuchoice.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="menuchoice.content.module">
-<dtd:pe-decl name="menuchoice.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="menuchoice.module">
-<define name="local.menuchoice.attrib">
-  <notAllowed/>
-</define>
-<define name="menuchoice.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="menuchoice.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="menuchoice.element">
-<define name="menuchoice.element">
-  <element name="menuchoice">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of medialabel.element-->
+<!-- Class: Type of medium named by the element; no default -->
+  <define name="medialabel.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>cartridge</value>
+          <value>cdrom</value>
+          <value>disk</value>
+          <value>tape</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="medialabel.role.attrib"/>
+    <ref name="local.medialabel.attrib"/>
+  </define>
+<!--end of medialabel.attlist-->
+<!--end of medialabel.module-->
+  <define name="local.menuchoice.attrib">
+    <empty/>
+  </define>
+  <define name="menuchoice.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="menuchoice">
+    <element name="menuchoice">
+      <ref name="menuchoice.attlist"/>
       <optional>
-        <ref name="shortcut.element"/>
+        <ref name="shortcut"/>
       </optional>
       <oneOrMore>
         <choice>
-          <ref name="guibutton.element"/>
-          <ref name="guiicon.element"/>
-          <ref name="guilabel.element"/>
-          <ref name="guimenu.element"/>
-          <ref name="guimenuitem.element"/>
-          <ref name="guisubmenu.element"/>
-          <ref name="interface.element"/>
+          <ref name="guibutton"/>
+          <ref name="guiicon"/>
+          <ref name="guilabel"/>
+          <ref name="guimenu"/>
+          <ref name="guimenuitem"/>
+          <ref name="guisubmenu"/>
+          <ref name="interface"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- menuchoice.element -->
-
-<dtd:pe-decl name="menuchoice.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="menuchoice.attlist">
-<define name="menuchoice.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="menuchoice.role.attrib"/>
-  <ref name="local.menuchoice.attrib"/>
-</define>
-</div> <!-- menuchoice.attlist -->
-</div> <!-- menuchoice.module -->
-
-<dtd:pe-decl name="shortcut.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="shortcut.module">
-<dtd:comment> See also KeyCombo </dtd:comment>
-<define name="local.shortcut.attrib">
-  <notAllowed/>
-</define>
-<define name="shortcut.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="shortcut.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="shortcut.element">
-<define name="shortcut.element">
-  <element name="shortcut">
-    <group>
+    </element>
+  </define>
+<!--end of menuchoice.element-->
+  <define name="menuchoice.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="menuchoice.role.attrib"/>
+    <ref name="local.menuchoice.attrib"/>
+  </define>
+<!--end of menuchoice.attlist-->
+<!--end of menuchoice.module-->
+<!-- See also KeyCombo -->
+  <define name="local.shortcut.attrib">
+    <empty/>
+  </define>
+  <define name="shortcut.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="shortcut">
+    <element name="shortcut">
+      <ref name="shortcut.attlist"/>
       <oneOrMore>
         <choice>
-          <ref name="keycap.element"/>
-          <ref name="keycombo.element"/>
-          <ref name="keysym.element"/>
-          <ref name="mousebutton.element"/>
+          <ref name="keycap"/>
+          <ref name="keycombo"/>
+          <ref name="keysym"/>
+          <ref name="mousebutton"/>
         </choice>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- shortcut.element -->
-
-<dtd:pe-decl name="shortcut.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="shortcut.attlist">
-<define name="shortcut.attlist">
-  <ref name="keyaction.attrib"/>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="shortcut.role.attrib"/>
-  <ref name="local.shortcut.attrib"/>
-</define>
-</div> <!-- shortcut.attlist -->
-</div> <!-- shortcut.module -->
-</div> <!-- menuchoice.content.module -->
-
-<dtd:pe-decl name="mousebutton.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mousebutton.module">
-<define name="local.mousebutton.attrib">
-  <notAllowed/>
-</define>
-<define name="mousebutton.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="mousebutton.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mousebutton.element">
-<define name="mousebutton.element">
-  <element name="mousebutton">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of shortcut.element-->
+  <define name="shortcut.attlist" combine="interleave">
+    <ref name="keyaction.attrib"/>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="shortcut.role.attrib"/>
+    <ref name="local.shortcut.attrib"/>
+  </define>
+<!--end of shortcut.attlist-->
+<!--end of shortcut.module-->
+<!--end of menuchoice.content.module-->
+  <define name="local.mousebutton.attrib">
+    <empty/>
+  </define>
+  <define name="mousebutton.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="mousebutton">
+    <element name="mousebutton">
+      <ref name="mousebutton.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- mousebutton.element -->
-
-<dtd:pe-decl name="mousebutton.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="mousebutton.attlist">
-<define name="mousebutton.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="mousebutton.role.attrib"/>
-  <ref name="local.mousebutton.attrib"/>
-</define>
-</div> <!-- mousebutton.attlist -->
-</div> <!-- mousebutton.module -->
-
-<dtd:pe-decl name="msgtext.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgtext.module">
-<define name="local.msgtext.attrib">
-  <notAllowed/>
-</define>
-<define name="msgtext.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="msgtext.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgtext.element">
-<define name="msgtext.element">
-  <element name="msgtext">
-    <group>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of mousebutton.element-->
+  <define name="mousebutton.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="mousebutton.role.attrib"/>
+    <ref name="local.mousebutton.attrib"/>
+  </define>
+<!--end of mousebutton.attlist-->
+<!--end of mousebutton.module-->
+  <define name="local.msgtext.attrib">
+    <empty/>
+  </define>
+  <define name="msgtext.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="msgtext">
+    <element name="msgtext">
+      <ref name="msgtext.attlist"/>
       <oneOrMore>
-        <choice>
-          <ref name="component.mix"/>
-        </choice>
+        <ref name="component.mix"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-</div> <!-- msgtext.element -->
-
-<dtd:pe-decl name="msgtext.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="msgtext.attlist">
-<define name="msgtext.attlist">
-  <ref name="common.attrib"/>
-  <ref name="msgtext.role.attrib"/>
-  <ref name="local.msgtext.attrib"/>
-</define>
-</div> <!-- msgtext.attlist -->
-</div> <!-- msgtext.module -->
-
-<dtd:pe-decl name="option.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="option.module">
-<define name="local.option.attrib">
-  <notAllowed/>
-</define>
-<define name="option.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="option.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="option.element">
-<define name="option.element">
-  <element name="option">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of msgtext.element-->
+  <define name="msgtext.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="msgtext.role.attrib"/>
+    <ref name="local.msgtext.attrib"/>
+  </define>
+<!--end of msgtext.attlist-->
+<!--end of msgtext.module-->
+  <define name="local.option.attrib">
+    <empty/>
+  </define>
+  <define name="option.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="option">
+    <element name="option">
+      <ref name="option.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- option.element -->
-
-<dtd:pe-decl name="option.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="option.attlist">
-<define name="option.attlist">
-  <ref name="common.attrib"/>
-  <ref name="option.role.attrib"/>
-  <ref name="local.option.attrib"/>
-</define>
-</div> <!-- option.attlist -->
-</div> <!-- option.module -->
-
-<dtd:pe-decl name="optional.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="optional.module">
-<define name="local.optional.attrib">
-  <notAllowed/>
-</define>
-<define name="optional.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="optional.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="optional.element">
-<define name="optional.element">
-  <element name="optional">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of option.element-->
+  <define name="option.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="option.role.attrib"/>
+    <ref name="local.option.attrib"/>
+  </define>
+<!--end of option.attlist-->
+<!--end of option.module-->
+  <define name="local.optional.attrib">
+    <empty/>
+  </define>
+  <define name="optional.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="optional">
+    <element name="optional">
+      <ref name="optional.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- optional.element -->
-
-<dtd:pe-decl name="optional.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="optional.attlist">
-<define name="optional.attlist">
-  <ref name="common.attrib"/>
-  <ref name="optional.role.attrib"/>
-  <ref name="local.optional.attrib"/>
-</define>
-</div> <!-- optional.attlist -->
-</div> <!-- optional.module -->
-
-<dtd:pe-decl name="parameter.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="parameter.module">
-<define name="local.parameter.attrib">
-  <notAllowed/>
-</define>
-<define name="parameter.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="parameter.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="parameter.element">
-<define name="parameter.element">
-  <element name="parameter">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of optional.element-->
+  <define name="optional.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="optional.role.attrib"/>
+    <ref name="local.optional.attrib"/>
+  </define>
+<!--end of optional.attlist-->
+<!--end of optional.module-->
+  <define name="local.parameter.attrib">
+    <empty/>
+  </define>
+  <define name="parameter.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="parameter">
+    <element name="parameter">
+      <ref name="parameter.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- parameter.element -->
-
-<dtd:comment> Class: Type of the Parameter; no default </dtd:comment>
-
-
-<dtd:pe-decl name="parameter.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="parameter.attlist">
-<define name="parameter.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>command</value>
-        <value>function</value>
-        <value>option</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="parameter.role.attrib"/>
-  <ref name="local.parameter.attrib"/>
-</define>
-</div> <!-- parameter.attlist -->
-</div> <!-- parameter.module -->
-
-<dtd:pe-decl name="prompt.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="prompt.module">
-<define name="local.prompt.attrib">
-  <notAllowed/>
-</define>
-<define name="prompt.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="prompt.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="prompt.element">
-<define name="prompt.element">
-  <element name="prompt">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of parameter.element-->
+<!-- Class: Type of the Parameter; no default -->
+  <define name="parameter.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>command</value>
+          <value>function</value>
+          <value>option</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="parameter.role.attrib"/>
+    <ref name="local.parameter.attrib"/>
+  </define>
+<!--end of parameter.attlist-->
+<!--end of parameter.module-->
+  <define name="local.prompt.attrib">
+    <empty/>
+  </define>
+  <define name="prompt.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="prompt">
+    <element name="prompt">
+      <ref name="prompt.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- prompt.element -->
-
-<dtd:pe-decl name="prompt.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="prompt.attlist">
-<define name="prompt.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="prompt.role.attrib"/>
-  <ref name="local.prompt.attrib"/>
-</define>
-</div> <!-- prompt.attlist -->
-</div> <!-- prompt.module -->
-
-<dtd:pe-decl name="property.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="property.module">
-<define name="local.property.attrib">
-  <notAllowed/>
-</define>
-<define name="property.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="property.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="property.element">
-<define name="property.element">
-  <element name="property">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of prompt.element-->
+  <define name="prompt.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="prompt.role.attrib"/>
+    <ref name="local.prompt.attrib"/>
+  </define>
+<!--end of prompt.attlist-->
+<!--end of prompt.module-->
+  <define name="local.property.attrib">
+    <empty/>
+  </define>
+  <define name="property.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="property">
+    <element name="property">
+      <ref name="property.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- property.element -->
-
-<dtd:pe-decl name="property.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="property.attlist">
-<define name="property.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="property.role.attrib"/>
-  <ref name="local.property.attrib"/>
-</define>
-</div> <!-- property.attlist -->
-</div> <!-- property.module -->
-
-<dtd:pe-decl name="replaceable.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="replaceable.module">
-<define name="local.replaceable.attrib">
-  <notAllowed/>
-</define>
-<define name="replaceable.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="replaceable.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="replaceable.element">
-<define name="replaceable.element">
-  <element name="replaceable">
-    <mixed>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of property.element-->
+  <define name="property.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="property.role.attrib"/>
+    <ref name="local.property.attrib"/>
+  </define>
+<!--end of property.attlist-->
+<!--end of property.module-->
+  <define name="local.replaceable.attrib">
+    <empty/>
+  </define>
+  <define name="replaceable.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="replaceable">
+    <element name="replaceable">
+      <ref name="replaceable.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="link.char.class"/>
-          <ref name="optional.element"/>
+          <ref name="optional"/>
           <ref name="base.char.class"/>
           <ref name="other.char.class"/>
-          <ref name="inlinegraphic.element"/>
-          <ref name="inlinemediaobject.element"/>
+          <ref name="inlinegraphic"/>
+          <ref name="inlinemediaobject"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- replaceable.element -->
-
-<dtd:comment> Class: Type of information the element represents; no
-		default </dtd:comment>
-
-
-<dtd:pe-decl name="replaceable.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="replaceable.attlist">
-<define name="replaceable.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>command</value>
-        <value>function</value>
-        <value>option</value>
-        <value>parameter</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="replaceable.role.attrib"/>
-  <ref name="local.replaceable.attrib"/>
-</define>
-</div> <!-- replaceable.attlist -->
-</div> <!-- replaceable.module -->
-
-<dtd:pe-decl name="returnvalue.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="returnvalue.module">
-<define name="local.returnvalue.attrib">
-  <notAllowed/>
-</define>
-<define name="returnvalue.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="returnvalue.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="returnvalue.element">
-<define name="returnvalue.element">
-  <element name="returnvalue">
-    <zeroOrMore>
-      <choice>
-        <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- returnvalue.element -->
-
-<dtd:pe-decl name="returnvalue.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="returnvalue.attlist">
-<define name="returnvalue.attlist">
-  <ref name="common.attrib"/>
-  <ref name="returnvalue.role.attrib"/>
-  <ref name="local.returnvalue.attrib"/>
-</define>
-</div> <!-- returnvalue.attlist -->
-</div> <!-- returnvalue.module -->
-
-<dtd:pe-decl name="sgmltag.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sgmltag.module">
-<define name="local.sgmltag.attrib">
-  <notAllowed/>
-</define>
-<define name="sgmltag.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="sgmltag.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sgmltag.element">
-<define name="sgmltag.element">
-  <element name="sgmltag">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of replaceable.element-->
+<!-- Class: Type of information the element represents; no
+		default -->
+  <define name="replaceable.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>command</value>
+          <value>function</value>
+          <value>option</value>
+          <value>parameter</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="replaceable.role.attrib"/>
+    <ref name="local.replaceable.attrib"/>
+  </define>
+<!--end of replaceable.attlist-->
+<!--end of replaceable.module-->
+  <define name="local.returnvalue.attrib">
+    <empty/>
+  </define>
+  <define name="returnvalue.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="returnvalue">
+    <element name="returnvalue">
+      <ref name="returnvalue.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- sgmltag.element -->
-
-<dtd:comment> Class: Type of SGML construct the element names; no default </dtd:comment>
-
-
-<dtd:pe-decl name="sgmltag.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="sgmltag.attlist">
-<define name="sgmltag.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>attribute</value>
-        <value>attvalue</value>
-        <value>element</value>
-        <value>endtag</value>
-        <value>emptytag</value>
-        <value>genentity</value>
-        <value>numcharref</value>
-        <value>paramentity</value>
-        <value>pi</value>
-        <value>xmlpi</value>
-        <value>starttag</value>
-        <value>sgmlcomment</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="sgmltag.role.attrib"/>
-  <ref name="local.sgmltag.attrib"/>
-</define>
-</div> <!-- sgmltag.attlist -->
-</div> <!-- sgmltag.module -->
-
-<dtd:pe-decl name="structfield.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="structfield.module">
-<define name="local.structfield.attrib">
-  <notAllowed/>
-</define>
-<define name="structfield.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="structfield.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="structfield.element">
-<define name="structfield.element">
-  <element name="structfield">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of returnvalue.element-->
+  <define name="returnvalue.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="returnvalue.role.attrib"/>
+    <ref name="local.returnvalue.attrib"/>
+  </define>
+<!--end of returnvalue.attlist-->
+<!--end of returnvalue.module-->
+  <define name="local.sgmltag.attrib">
+    <empty/>
+  </define>
+  <define name="sgmltag.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="sgmltag">
+    <element name="sgmltag">
+      <ref name="sgmltag.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- structfield.element -->
-
-<dtd:pe-decl name="structfield.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="structfield.attlist">
-<define name="structfield.attlist">
-  <ref name="common.attrib"/>
-  <ref name="structfield.role.attrib"/>
-  <ref name="local.structfield.attrib"/>
-</define>
-</div> <!-- structfield.attlist -->
-</div> <!-- structfield.module -->
-
-<dtd:pe-decl name="structname.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="structname.module">
-<define name="local.structname.attrib">
-  <notAllowed/>
-</define>
-<define name="structname.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="structname.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="structname.element">
-<define name="structname.element">
-  <element name="structname">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of sgmltag.element-->
+<!-- Class: Type of SGML construct the element names; no default -->
+  <define name="sgmltag.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>attribute</value>
+          <value>attvalue</value>
+          <value>element</value>
+          <value>endtag</value>
+          <value>emptytag</value>
+          <value>genentity</value>
+          <value>numcharref</value>
+          <value>paramentity</value>
+          <value>pi</value>
+          <value>xmlpi</value>
+          <value>starttag</value>
+          <value>sgmlcomment</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="sgmltag.role.attrib"/>
+    <ref name="local.sgmltag.attrib"/>
+  </define>
+<!--end of sgmltag.attlist-->
+<!--end of sgmltag.module-->
+  <define name="local.structfield.attrib">
+    <empty/>
+  </define>
+  <define name="structfield.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="structfield">
+    <element name="structfield">
+      <ref name="structfield.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- structname.element -->
-
-<dtd:pe-decl name="structname.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="structname.attlist">
-<define name="structname.attlist">
-  <ref name="common.attrib"/>
-  <ref name="structname.role.attrib"/>
-  <ref name="local.structname.attrib"/>
-</define>
-</div> <!-- structname.attlist -->
-</div> <!-- structname.module -->
-
-<dtd:pe-decl name="symbol.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="symbol.module">
-<define name="local.symbol.attrib">
-  <notAllowed/>
-</define>
-<define name="symbol.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="symbol.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="symbol.element">
-<define name="symbol.element">
-  <element name="symbol">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of structfield.element-->
+  <define name="structfield.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="structfield.role.attrib"/>
+    <ref name="local.structfield.attrib"/>
+  </define>
+<!--end of structfield.attlist-->
+<!--end of structfield.module-->
+  <define name="local.structname.attrib">
+    <empty/>
+  </define>
+  <define name="structname.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="structname">
+    <element name="structname">
+      <ref name="structname.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- symbol.element -->
-
-<dtd:comment> Class: Type of symbol; no default </dtd:comment>
-
-
-<dtd:pe-decl name="symbol.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="symbol.attlist">
-<define name="symbol.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>limit</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="symbol.role.attrib"/>
-  <ref name="local.symbol.attrib"/>
-</define>
-</div> <!-- symbol.attlist -->
-</div> <!-- symbol.module -->
-
-<dtd:pe-decl name="systemitem.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="systemitem.module">
-<define name="local.systemitem.attrib">
-  <notAllowed/>
-</define>
-<define name="systemitem.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="systemitem.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="systemitem.element">
-<define name="systemitem.element">
-  <element name="systemitem">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of structname.element-->
+  <define name="structname.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="structname.role.attrib"/>
+    <ref name="local.structname.attrib"/>
+  </define>
+<!--end of structname.attlist-->
+<!--end of structname.module-->
+  <define name="local.symbol.attrib">
+    <empty/>
+  </define>
+  <define name="symbol.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="symbol">
+    <element name="symbol">
+      <ref name="symbol.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-        <ref name="acronym.element"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- systemitem.element -->
-
-<dtd:comment> Class: Type of system item the element names; no default </dtd:comment>
-
-<dtd:pe-decl name="systemitem.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="systemitem.attlist">
-<define name="systemitem.attlist">
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>constant</value>
-        <value>groupname</value>
-        <value>library</value>
-        <value>macro</value>
-        <value>osname</value>
-        <value>resource</value>
-        <value>systemname</value>
-        <value>username</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="systemitem.role.attrib"/>
-  <ref name="local.systemitem.attrib"/>
-</define>
-</div> <!-- systemitem.attlist -->
-</div> <!-- systemitem.module -->
-
-
-<dtd:pe-decl name="token.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="token.module">
-<define name="local.token.attrib">
-  <notAllowed/>
-</define>
-<define name="token.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="token.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="token.element">
-<define name="token.element">
-  <element name="token">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of symbol.element-->
+<!-- Class: Type of symbol; no default -->
+  <define name="symbol.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>limit</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="symbol.role.attrib"/>
+    <ref name="local.symbol.attrib"/>
+  </define>
+<!--end of symbol.attlist-->
+<!--end of symbol.module-->
+  <define name="local.systemitem.attrib">
+    <empty/>
+  </define>
+  <define name="systemitem.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="systemitem">
+    <element name="systemitem">
+      <ref name="systemitem.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="smallcptr.char.mix"/>
+          <ref name="acronym"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of systemitem.element-->
+<!-- Class: Type of system item the element names; no default -->
+  <define name="systemitem.attlist" combine="interleave">
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>constant</value>
+          <value>groupname</value>
+          <value>library</value>
+          <value>macro</value>
+          <value>osname</value>
+          <value>resource</value>
+          <value>systemname</value>
+          <value>username</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="systemitem.role.attrib"/>
+    <ref name="local.systemitem.attrib"/>
+  </define>
+<!--end of systemitem.attlist-->
+<!--end of systemitem.module-->
+  <define name="local.token.attrib">
+    <empty/>
+  </define>
+  <define name="token.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="token">
+    <element name="token">
+      <ref name="token.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- token.element -->
-
-<dtd:pe-decl name="token.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="token.attlist">
-<define name="token.attlist">
-  <ref name="common.attrib"/>
-  <ref name="token.role.attrib"/>
-  <ref name="local.token.attrib"/>
-</define>
-</div> <!-- token.attlist -->
-</div> <!-- token.module -->
-
-<dtd:pe-decl name="type.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="type.module">
-<define name="local.type.attrib">
-  <notAllowed/>
-</define>
-<define name="type.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="type.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="type.element">
-<define name="type.element">
-  <element name="type">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of token.element-->
+  <define name="token.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="token.role.attrib"/>
+    <ref name="local.token.attrib"/>
+  </define>
+<!--end of token.attlist-->
+<!--end of token.module-->
+  <define name="local.type.attrib">
+    <empty/>
+  </define>
+  <define name="type.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="type">
+    <element name="type">
+      <ref name="type.attlist"/>
+      <zeroOrMore>
         <ref name="smallcptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- type.element -->
-
-<dtd:pe-decl name="type.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="type.attlist">
-<define name="type.attlist">
-  <ref name="common.attrib"/>
-  <ref name="type.role.attrib"/>
-  <ref name="local.type.attrib"/>
-</define>
-</div> <!-- type.attlist -->
-</div> <!-- type.module -->
-
-<dtd:pe-decl name="userinput.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="userinput.module">
-<define name="local.userinput.attrib">
-  <notAllowed/>
-</define>
-<define name="userinput.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="userinput.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="userinput.element">
-<define name="userinput.element">
-  <element name="userinput">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of type.element-->
+  <define name="type.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="type.role.attrib"/>
+    <ref name="local.type.attrib"/>
+  </define>
+<!--end of type.attlist-->
+<!--end of type.module-->
+  <define name="local.userinput.attrib">
+    <empty/>
+  </define>
+  <define name="userinput.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="userinput">
+    <element name="userinput">
+      <ref name="userinput.attlist"/>
+      <zeroOrMore>
         <ref name="cptr.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- userinput.element -->
-
-<dtd:pe-decl name="userinput.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="userinput.attlist">
-<define name="userinput.attlist">
-  <ref name="moreinfo.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="userinput.role.attrib"/>
-  <ref name="local.userinput.attrib"/>
-</define>
-</div> <!-- userinput.attlist -->
-</div> <!-- userinput.module -->
-
-<dtd:comment> General words and phrases ............................................ </dtd:comment>
-
-<dtd:pe-decl name="abbrev.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="abbrev.module">
-<define name="local.abbrev.attrib">
-  <notAllowed/>
-</define>
-<define name="abbrev.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="abbrev.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="abbrev.element">
-<define name="abbrev.element">
-  <element name="abbrev">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of userinput.element-->
+  <define name="userinput.attlist" combine="interleave">
+    <ref name="moreinfo.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="userinput.role.attrib"/>
+    <ref name="local.userinput.attrib"/>
+  </define>
+<!--end of userinput.attlist-->
+<!--end of userinput.module-->
+<!-- General words and phrases ............................................ -->
+  <define name="local.abbrev.attrib">
+    <empty/>
+  </define>
+  <define name="abbrev.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="abbrev">
+    <element name="abbrev">
+      <ref name="abbrev.attlist"/>
+      <zeroOrMore>
         <ref name="word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- abbrev.element -->
-
-<dtd:pe-decl name="abbrev.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="abbrev.attlist">
-<define name="abbrev.attlist">
-  <ref name="common.attrib"/>
-  <ref name="abbrev.role.attrib"/>
-  <ref name="local.abbrev.attrib"/>
-</define>
-</div> <!-- abbrev.attlist -->
-</div> <!-- abbrev.module -->
-
-<dtd:pe-decl name="acronym.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="acronym.module">
-<define name="local.acronym.attrib">
-  <notAllowed/>
-</define>
-<define name="acronym.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="acronym.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="acronym.element">
-<define name="acronym.element">
-  <element name="acronym">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of abbrev.element-->
+  <define name="abbrev.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="abbrev.role.attrib"/>
+    <ref name="local.abbrev.attrib"/>
+  </define>
+<!--end of abbrev.attlist-->
+<!--end of abbrev.module-->
+  <define name="local.acronym.attrib">
+    <empty/>
+  </define>
+  <define name="acronym.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="acronym">
+    <element name="acronym">
+      <ref name="acronym.attlist"/>
+      <zeroOrMore>
         <ref name="word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- acronym.element -->
-
-<dtd:pe-decl name="acronym.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="acronym.attlist">
-<define name="acronym.attlist">
-  <ref name="common.attrib"/>
-  <ref name="acronym.role.attrib"/>
-  <ref name="local.acronym.attrib"/>
-</define>
-</div> <!-- acronym.attlist -->
-</div> <!-- acronym.module -->
-
-<dtd:pe-decl name="citation.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citation.module">
-<define name="local.citation.attrib">
-  <notAllowed/>
-</define>
-<define name="citation.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="citation.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citation.element">
-<define name="citation.element">
-  <element name="citation">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of acronym.element-->
+  <define name="acronym.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="acronym.role.attrib"/>
+    <ref name="local.acronym.attrib"/>
+  </define>
+<!--end of acronym.attlist-->
+<!--end of acronym.module-->
+  <define name="local.citation.attrib">
+    <empty/>
+  </define>
+  <define name="citation.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="citation">
+    <element name="citation">
+      <ref name="citation.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- citation.element -->
-
-<dtd:pe-decl name="citation.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citation.attlist">
-<define name="citation.attlist">
-  <ref name="common.attrib"/>
-  <ref name="citation.role.attrib"/>
-  <ref name="local.citation.attrib"/>
-</define>
-</div> <!-- citation.attlist -->
-</div> <!-- citation.module -->
-
-<dtd:pe-decl name="citerefentry.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citerefentry.module">
-<define name="local.citerefentry.attrib">
-  <notAllowed/>
-</define>
-<define name="citerefentry.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="citerefentry.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citerefentry.element">
-<define name="citerefentry.element">
-  <element name="citerefentry">
-    <group>
-      <ref name="refentrytitle.element"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of citation.element-->
+  <define name="citation.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="citation.role.attrib"/>
+    <ref name="local.citation.attrib"/>
+  </define>
+<!--end of citation.attlist-->
+<!--end of citation.module-->
+  <define name="local.citerefentry.attrib">
+    <empty/>
+  </define>
+  <define name="citerefentry.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="citerefentry">
+    <element name="citerefentry">
+      <ref name="citerefentry.attlist"/>
+      <ref name="refentrytitle"/>
       <optional>
-        <ref name="manvolnum.element"/>
+        <ref name="manvolnum"/>
       </optional>
-    </group>
-  </element>
-</define>
-</div> <!-- citerefentry.element -->
-
-<dtd:pe-decl name="citerefentry.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citerefentry.attlist">
-<define name="citerefentry.attlist">
-  <ref name="common.attrib"/>
-  <ref name="citerefentry.role.attrib"/>
-  <ref name="local.citerefentry.attrib"/>
-</define>
-</div> <!-- citerefentry.attlist -->
-</div> <!-- citerefentry.module -->
-
-<dtd:pe-decl name="refentrytitle.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="refentrytitle.module">
-<define name="local.refentrytitle.attrib">
-  <notAllowed/>
-</define>
-<define name="refentrytitle.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="refentrytitle.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="refentrytitle.element">
-<define name="refentrytitle.element">
-  <element name="refentrytitle">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of citerefentry.element-->
+  <define name="citerefentry.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="citerefentry.role.attrib"/>
+    <ref name="local.citerefentry.attrib"/>
+  </define>
+<!--end of citerefentry.attlist-->
+<!--end of citerefentry.module-->
+  <define name="local.refentrytitle.attrib">
+    <empty/>
+  </define>
+  <define name="refentrytitle.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="refentrytitle">
+    <element name="refentrytitle">
+      <ref name="refentrytitle.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- refentrytitle.element -->
-
-<dtd:pe-decl name="refentrytitle.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="refentrytitle.attlist">
-<define name="refentrytitle.attlist">
-  <ref name="common.attrib"/>
-  <ref name="refentrytitle.role.attrib"/>
-  <ref name="local.refentrytitle.attrib"/>
-</define>
-</div> <!-- refentrytitle.attlist -->
-</div> <!-- refentrytitle.module -->
-
-<dtd:pe-decl name="manvolnum.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="manvolnum.module">
-<define name="local.manvolnum.attrib">
-  <notAllowed/>
-</define>
-<define name="namvolnum.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="manvolnum.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="manvolnum.element">
-<define name="manvolnum.element">
-  <element name="manvolnum">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of refentrytitle.element-->
+  <define name="refentrytitle.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="refentrytitle.role.attrib"/>
+    <ref name="local.refentrytitle.attrib"/>
+  </define>
+<!--end of refentrytitle.attlist-->
+<!--end of refentrytitle.module-->
+  <define name="local.manvolnum.attrib">
+    <empty/>
+  </define>
+  <define name="namvolnum.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="manvolnum">
+    <element name="manvolnum">
+      <ref name="manvolnum.attlist"/>
+      <zeroOrMore>
         <ref name="word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- manvolnum.element -->
-
-<dtd:pe-decl name="manvolnum.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="manvolnum.attlist">
-<define name="manvolnum.attlist">
-  <ref name="common.attrib"/>
-  <ref name="namvolnum.role.attrib"/>
-  <ref name="local.manvolnum.attrib"/>
-</define>
-</div> <!-- manvolnum.attlist -->
-</div> <!-- manvolnum.module -->
-
-<dtd:pe-decl name="citetitle.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citetitle.module">
-<define name="local.citetitle.attrib">
-  <notAllowed/>
-</define>
-<define name="citetitle.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="citetitle.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citetitle.element">
-<define name="citetitle.element">
-  <element name="citetitle">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of manvolnum.element-->
+  <define name="manvolnum.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="namvolnum.role.attrib"/>
+    <ref name="local.manvolnum.attrib"/>
+  </define>
+<!--end of manvolnum.attlist-->
+<!--end of manvolnum.module-->
+  <define name="local.citetitle.attrib">
+    <empty/>
+  </define>
+  <define name="citetitle.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="citetitle">
+    <element name="citetitle">
+      <ref name="citetitle.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- citetitle.element -->
-
-<dtd:comment> Pubwork: Genre of published work cited; no default </dtd:comment>
-
-
-<dtd:pe-decl name="citetitle.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="citetitle.attlist">
-<define name="citetitle.attlist">
-  <optional>
-    <attribute name="pubwork">
-      <choice>
-        <value>article</value>
-        <value>book</value>
-        <value>chapter</value>
-        <value>part</value>
-        <value>refentry</value>
-        <value>section</value>
-        <value>journal</value>
-        <value>series</value>
-        <value>set</value>
-        <value>manuscript</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="citetitle.role.attrib"/>
-  <ref name="local.citetitle.attrib"/>
-</define>
-</div> <!-- citetitle.attlist -->
-</div> <!-- citetitle.module -->
-
-<dtd:pe-decl name="emphasis.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="emphasis.module">
-<define name="local.emphasis.attrib">
-  <notAllowed/>
-</define>
-<define name="emphasis.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="emphasis.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="emphasis.element">
-<define name="emphasis.element">
-  <element name="emphasis">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of citetitle.element-->
+<!-- Pubwork: Genre of published work cited; no default -->
+  <define name="citetitle.attlist" combine="interleave">
+    <optional>
+      <attribute name="pubwork">
+        <choice>
+          <value>article</value>
+          <value>book</value>
+          <value>chapter</value>
+          <value>part</value>
+          <value>refentry</value>
+          <value>section</value>
+          <value>journal</value>
+          <value>series</value>
+          <value>set</value>
+          <value>manuscript</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="citetitle.role.attrib"/>
+    <ref name="local.citetitle.attrib"/>
+  </define>
+<!--end of citetitle.attlist-->
+<!--end of citetitle.module-->
+  <define name="local.emphasis.attrib">
+    <empty/>
+  </define>
+  <define name="emphasis.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="emphasis">
+    <element name="emphasis">
+      <ref name="emphasis.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- emphasis.element -->
-
-<dtd:pe-decl name="emphasis.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="emphasis.attlist">
-<define name="emphasis.attlist">
-  <ref name="common.attrib"/>
-  <ref name="emphasis.role.attrib"/>
-  <ref name="local.emphasis.attrib"/>
-</define>
-</div> <!-- emphasis.attlist -->
-</div> <!-- emphasis.module -->
-
-<dtd:pe-decl name="firstterm.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="firstterm.module">
-<define name="local.firstterm.attrib">
-  <notAllowed/>
-</define>
-<define name="firstterm.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="firstterm.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="firstterm.element">
-<define name="firstterm.element">
-  <element name="firstterm">
-    <zeroOrMore>
-      <choice>
-        <ref name="word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- firstterm.element -->
-
-<dtd:comment> to GlossEntry or other explanation </dtd:comment>
-
-
-<dtd:pe-decl name="firstterm.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="firstterm.attlist">
-<define name="firstterm.attlist">
-  <ref name="linkend.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="firstterm.role.attrib"/>
-  <ref name="local.firstterm.attrib"/>
-</define>
-</div> <!-- firstterm.attlist -->
-</div> <!-- firstterm.module -->
-
-<dtd:pe-decl name="foreignphrase.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="foreignphrase.module">
-<define name="local.foreignphrase.attrib">
-  <notAllowed/>
-</define>
-<define name="foreignphrase.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="foreignphrase.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="foreignphrase.element">
-<define name="foreignphrase.element">
-  <element name="foreignphrase">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of emphasis.element-->
+  <define name="emphasis.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="emphasis.role.attrib"/>
+    <ref name="local.emphasis.attrib"/>
+  </define>
+<!--end of emphasis.attlist-->
+<!--end of emphasis.module-->
+  <define name="local.firstterm.attrib">
+    <empty/>
+  </define>
+  <define name="firstterm.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="firstterm">
+    <element name="firstterm">
+      <ref name="firstterm.attlist"/>
+      <zeroOrMore>
+        <ref name="word.char.mix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of firstterm.element-->
+<!-- to GlossEntry or other explanation -->
+  <define name="firstterm.attlist" combine="interleave">
+    <ref name="linkend.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="firstterm.role.attrib"/>
+    <ref name="local.firstterm.attrib"/>
+  </define>
+<!--end of firstterm.attlist-->
+<!--end of firstterm.module-->
+  <define name="local.foreignphrase.attrib">
+    <empty/>
+  </define>
+  <define name="foreignphrase.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="foreignphrase">
+    <element name="foreignphrase">
+      <ref name="foreignphrase.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- foreignphrase.element -->
-
-<dtd:pe-decl name="foreignphrase.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="foreignphrase.attlist">
-<define name="foreignphrase.attlist">
-  <ref name="common.attrib"/>
-  <ref name="foreignphrase.role.attrib"/>
-  <ref name="local.foreignphrase.attrib"/>
-</define>
-</div> <!-- foreignphrase.attlist -->
-</div> <!-- foreignphrase.module -->
-
-<dtd:pe-decl name="glossterm.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossterm.module">
-<define name="local.glossterm.attrib">
-  <notAllowed/>
-</define>
-<define name="glossterm.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="glossterm.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossterm.element">
-<define name="glossterm.element">
-  <element name="glossterm">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of foreignphrase.element-->
+  <define name="foreignphrase.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="foreignphrase.role.attrib"/>
+    <ref name="local.foreignphrase.attrib"/>
+  </define>
+<!--end of foreignphrase.attlist-->
+<!--end of foreignphrase.module-->
+  <define name="local.glossterm.attrib">
+    <empty/>
+  </define>
+  <define name="glossterm.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="glossterm">
+    <element name="glossterm">
+      <ref name="glossterm.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- glossterm.element -->
-
-<dtd:comment> to GlossEntry if Glossterm used in text </dtd:comment>
-<dtd:comment> BaseForm: Provides the form of GlossTerm to be used
-		for indexing </dtd:comment>
-
-
-<dtd:pe-decl name="glossterm.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="glossterm.attlist">
-<define name="glossterm.attlist">
-  <ref name="linkend.attrib"/>
-  <optional>
-    <attribute name="baseform"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="glossterm.role.attrib"/>
-  <ref name="local.glossterm.attrib"/>
-</define>
-</div> <!-- glossterm.attlist -->
-</div> <!-- glossterm.module -->
-
-<dtd:pe-decl name="phrase.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="phrase.module">
-<define name="local.phrase.attrib">
-  <notAllowed/>
-</define>
-<define name="phrase.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="phrase.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="phrase.element">
-<define name="phrase.element">
-  <element name="phrase">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of glossterm.element-->
+<!-- to GlossEntry if Glossterm used in text -->
+<!-- BaseForm: Provides the form of GlossTerm to be used
+		for indexing -->
+  <define name="glossterm.attlist" combine="interleave">
+    <ref name="linkend.attrib"/>
+    <optional>
+      <attribute name="baseform"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="glossterm.role.attrib"/>
+    <ref name="local.glossterm.attrib"/>
+  </define>
+<!--end of glossterm.attlist-->
+<!--end of glossterm.module-->
+  <define name="local.phrase.attrib">
+    <empty/>
+  </define>
+  <define name="phrase.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="phrase">
+    <element name="phrase">
+      <ref name="phrase.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- phrase.element -->
-
-<dtd:pe-decl name="phrase.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="phrase.attlist">
-<define name="phrase.attlist">
-  <ref name="common.attrib"/>
-  <ref name="phrase.role.attrib"/>
-  <ref name="local.phrase.attrib"/>
-</define>
-</div> <!-- phrase.attlist -->
-</div> <!-- phrase.module -->
-
-<dtd:pe-decl name="quote.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="quote.module">
-<define name="local.quote.attrib">
-  <notAllowed/>
-</define>
-<define name="quote.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="quote.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="quote.element">
-<define name="quote.element">
-  <element name="quote">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of phrase.element-->
+  <define name="phrase.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="phrase.role.attrib"/>
+    <ref name="local.phrase.attrib"/>
+  </define>
+<!--end of phrase.attlist-->
+<!--end of phrase.module-->
+  <define name="local.quote.attrib">
+    <empty/>
+  </define>
+  <define name="quote.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="quote">
+    <element name="quote">
+      <ref name="quote.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- quote.element -->
-
-<dtd:pe-decl name="quote.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="quote.attlist">
-<define name="quote.attlist">
-  <ref name="common.attrib"/>
-  <ref name="quote.role.attrib"/>
-  <ref name="local.quote.attrib"/>
-</define>
-</div> <!-- quote.attlist -->
-</div> <!-- quote.module -->
-
-<dtd:pe-decl name="ssscript.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ssscript.module">
-<define name="local.ssscript.attrib">
-  <notAllowed/>
-</define>
-<define name="ssscript.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="subscript.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subscript.element">
-<define name="subscript.element">
-  <element name="subscript">
-    <mixed>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of quote.element-->
+  <define name="quote.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="quote.role.attrib"/>
+    <ref name="local.quote.attrib"/>
+  </define>
+<!--end of quote.attlist-->
+<!--end of quote.module-->
+  <define name="local.ssscript.attrib">
+    <empty/>
+  </define>
+  <define name="ssscript.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="subscript">
+    <element name="subscript">
+      <ref name="subscript.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="link.char.class"/>
-          <ref name="emphasis.element"/>
-          <ref name="replaceable.element"/>
-          <ref name="symbol.element"/>
-          <ref name="inlinegraphic.element"/>
-          <ref name="inlinemediaobject.element"/>
+          <ref name="emphasis"/>
+          <ref name="replaceable"/>
+          <ref name="symbol"/>
+          <ref name="inlinegraphic"/>
+          <ref name="inlinemediaobject"/>
           <ref name="base.char.class"/>
           <ref name="other.char.class"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- subscript.element -->
-
-<dtd:pe-decl name="subscript.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="subscript.attlist">
-<define name="subscript.attlist">
-  <ref name="common.attrib"/>
-  <ref name="ssscript.role.attrib"/>
-  <ref name="local.ssscript.attrib"/>
-</define>
-</div> <!-- subscript.attlist -->
-
-<dtd:pe-decl name="superscript.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="superscript.element">
-<define name="superscript.element">
-  <element name="superscript">
-    <mixed>
+    </element>
+  </define>
+<!--end of subscript.element-->
+  <define name="subscript.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="ssscript.role.attrib"/>
+    <ref name="local.ssscript.attrib"/>
+  </define>
+<!--end of subscript.attlist-->
+  <define name="superscript">
+    <element name="superscript">
+      <ref name="superscript.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="link.char.class"/>
-          <ref name="emphasis.element"/>
-          <ref name="replaceable.element"/>
-          <ref name="symbol.element"/>
-          <ref name="inlinegraphic.element"/>
-          <ref name="inlinemediaobject.element"/>
+          <ref name="emphasis"/>
+          <ref name="replaceable"/>
+          <ref name="symbol"/>
+          <ref name="inlinegraphic"/>
+          <ref name="inlinemediaobject"/>
           <ref name="base.char.class"/>
           <ref name="other.char.class"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- superscript.element -->
-
-<dtd:pe-decl name="superscript.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="superscript.attlist">
-<define name="superscript.attlist">
-  <ref name="common.attrib"/>
-  <ref name="ssscript.role.attrib"/>
-  <ref name="local.ssscript.attrib"/>
-</define>
-</div> <!-- superscript.attlist -->
-</div> <!-- ssscript.module -->
-
-<dtd:pe-decl name="trademark.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="trademark.module">
-<define name="local.trademark.attrib">
-  <notAllowed/>
-</define>
-<define name="trademark.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="trademark.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="trademark.element">
-<define name="trademark.element">
-  <element name="trademark">
-    <mixed>
+    </element>
+  </define>
+<!--end of superscript.element-->
+  <define name="superscript.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="ssscript.role.attrib"/>
+    <ref name="local.ssscript.attrib"/>
+  </define>
+<!--end of superscript.attlist-->
+<!--end of ssscript.module-->
+  <define name="local.trademark.attrib">
+    <empty/>
+  </define>
+  <define name="trademark.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="trademark">
+    <element name="trademark">
+      <ref name="trademark.attlist"/>
       <zeroOrMore>
         <choice>
+          <text/>
           <ref name="link.char.class"/>
           <ref name="tech.char.class"/>
           <ref name="base.char.class"/>
           <ref name="other.char.class"/>
-          <ref name="inlinegraphic.element"/>
-          <ref name="inlinemediaobject.element"/>
-          <ref name="emphasis.element"/>
+          <ref name="inlinegraphic"/>
+          <ref name="inlinemediaobject"/>
+          <ref name="emphasis"/>
         </choice>
       </zeroOrMore>
-    </mixed>
-  </element>
-</define>
-</div> <!-- trademark.element -->
-
-<dtd:comment> Class: More precisely identifies the item the element names </dtd:comment>
-
-
-<dtd:pe-decl name="trademark.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="trademark.attlist">
-<define name="trademark.attlist">
-  <optional>
-    <attribute name="class" dtd:default="trade">
-      <choice>
-	<value>service</value>
-	<value>trade</value>
-	<value>registered</value>
-	<value>copyright</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="trademark.role.attrib"/>
-  <ref name="local.trademark.attrib"/>
-</define>
-</div> <!-- trademark.attlist -->
-</div> <!-- trademark.module -->
-
-<dtd:pe-decl name="wordasword.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="wordasword.module">
-<define name="local.wordasword.attrib">
-  <notAllowed/>
-</define>
-<define name="wordasword.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="wordasword.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="wordasword.element">
-<define name="wordasword.element">
-  <element name="wordasword">
-    <zeroOrMore>
-      <choice>
+    </element>
+  </define>
+<!--end of trademark.element-->
+<!-- Class: More precisely identifies the item the element names -->
+  <define name="trademark.attlist" combine="interleave">
+    <optional>
+      <attribute name="class" a:defaultValue="trade">
+        <choice>
+          <value>service</value>
+          <value>trade</value>
+          <value>registered</value>
+          <value>copyright</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="trademark.role.attrib"/>
+    <ref name="local.trademark.attrib"/>
+  </define>
+<!--end of trademark.attlist-->
+<!--end of trademark.module-->
+  <define name="local.wordasword.attrib">
+    <empty/>
+  </define>
+  <define name="wordasword.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="wordasword">
+    <element name="wordasword">
+      <ref name="wordasword.attlist"/>
+      <zeroOrMore>
         <ref name="word.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- wordasword.element -->
-
-<dtd:pe-decl name="wordasword.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="wordasword.attlist">
-<define name="wordasword.attlist">
-  <ref name="common.attrib"/>
-  <ref name="wordasword.role.attrib"/>
-  <ref name="local.wordasword.attrib"/>
-</define>
-</div> <!-- wordasword.attlist -->
-</div> <!-- wordasword.module -->
-
-<dtd:comment> Links and cross-references ........................................... </dtd:comment>
-
-<dtd:pe-decl name="link.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="link.module">
-<define name="local.link.attrib">
-  <notAllowed/>
-</define>
-<define name="link.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="link.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="link.element">
-<define name="link.element">
-  <element name="link">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of wordasword.element-->
+  <define name="wordasword.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="wordasword.role.attrib"/>
+    <ref name="local.wordasword.attrib"/>
+  </define>
+<!--end of wordasword.attlist-->
+<!--end of wordasword.module-->
+<!-- Links and cross-references ........................................... -->
+  <define name="local.link.attrib">
+    <empty/>
+  </define>
+  <define name="link.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="link">
+    <element name="link">
+      <ref name="link.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- link.element -->
-
-<dtd:comment> Endterm: ID of element containing text that is to be
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of link.element-->
+<!-- Endterm: ID of element containing text that is to be
 		fetched from elsewhere in the document to appear as
-		the content of this element </dtd:comment>
-<dtd:comment> to linked-to object </dtd:comment>
-<dtd:comment> Type: Freely assignable parameter </dtd:comment>
-
-
-<dtd:pe-decl name="link.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="link.attlist">
-<define name="link.attlist">
-  <optional>
-    <attribute name="endterm" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <ref name="linkendreq.attrib"/>
-  <optional>
-    <attribute name="type"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="link.role.attrib"/>
-  <ref name="local.link.attrib"/>
-</define>
-</div> <!-- link.attlist -->
-</div> <!-- link.module -->
-
-<dtd:pe-decl name="olink.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="olink.module">
-<define name="local.olink.attrib">
-  <notAllowed/>
-</define>
-<define name="olink.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="olink.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="olink.element">
-<define name="olink.element">
-  <element name="olink">
-    <zeroOrMore>
-      <choice>
+		the content of this element -->
+<!-- to linked-to object -->
+<!-- Type: Freely assignable parameter -->
+  <define name="link.attlist" combine="interleave">
+    <optional>
+      <attribute name="endterm">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <ref name="linkendreq.attrib"/>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="link.role.attrib"/>
+    <ref name="local.link.attrib"/>
+  </define>
+<!--end of link.attlist-->
+<!--end of link.module-->
+  <define name="local.olink.attrib">
+    <empty/>
+  </define>
+  <define name="olink.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="olink">
+    <element name="olink">
+      <ref name="olink.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- olink.element -->
-
-<dtd:comment> TargetDocEnt: Name of an entity to be the target of the link </dtd:comment>
-<dtd:comment> LinkMode: ID of a ModeSpec containing instructions for
-		operating on the entity named by TargetDocEnt </dtd:comment>
-<dtd:comment> LocalInfo: Information that may be passed to ModeSpec </dtd:comment>
-<dtd:comment> Type: Freely assignable parameter </dtd:comment>
-
-
-<dtd:pe-decl name="olink.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="olink.attlist">
-<define name="olink.attlist">
-  <optional>
-    <attribute name="targetdocent">
-      <data type="ENTITY"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="linkmode" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="localinfo"/>
-  </optional>
-  <optional>
-    <attribute name="type"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="olink.role.attrib"/>
-  <ref name="local.olink.attrib"/>
-</define>
-</div> <!-- olink.attlist -->
-</div> <!-- olink.module -->
-
-<dtd:pe-decl name="ulink.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ulink.module">
-<define name="local.ulink.attrib">
-  <notAllowed/>
-</define>
-<define name="ulink.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="ulink.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ulink.element">
-<define name="ulink.element">
-  <element name="ulink">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of olink.element-->
+<!-- TargetDocEnt: Name of an entity to be the target of the link -->
+<!-- LinkMode: ID of a ModeSpec containing instructions for
+		operating on the entity named by TargetDocEnt -->
+<!-- LocalInfo: Information that may be passed to ModeSpec -->
+<!-- Type: Freely assignable parameter -->
+  <define name="olink.attlist" combine="interleave">
+    <optional>
+      <attribute name="targetdocent">
+        <data type="ENTITY"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="linkmode">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="localinfo"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="olink.role.attrib"/>
+    <ref name="local.olink.attrib"/>
+  </define>
+<!--end of olink.attlist-->
+<!--end of olink.module-->
+  <define name="local.ulink.attrib">
+    <empty/>
+  </define>
+  <define name="ulink.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="ulink">
+    <element name="ulink">
+      <ref name="ulink.attlist"/>
+      <zeroOrMore>
         <ref name="para.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- ulink.element -->
-
-<dtd:comment> URL: uniform resource locator; the target of the ULink </dtd:comment>
-<dtd:comment> Type: Freely assignable parameter </dtd:comment>
-
-
-<dtd:pe-decl name="ulink.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="ulink.attlist">
-<define name="ulink.attlist">
-  <attribute name="url"/>
-  <optional>
-    <attribute name="type"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="ulink.role.attrib"/>
-  <ref name="local.ulink.attrib"/>
-</define>
-</div> <!-- ulink.attlist -->
-</div> <!-- ulink.module -->
-
-<dtd:pe-decl name="footnoteref.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="footnoteref.module">
-<define name="local.footnoteref.attrib">
-  <notAllowed/>
-</define>
-<define name="footnoteref.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="footnoteref.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="footnoteref.element">
-<define name="footnoteref.element">
-  <element name="footnoteref">
-    <empty/>
-  </element>
-</define>
-</div> <!-- footnoteref.element -->
-
-<dtd:comment> to footnote content supplied elsewhere </dtd:comment>
-
-
-<dtd:pe-decl name="footnoteref.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="footnoteref.attlist">
-<define name="footnoteref.attlist">
-  <ref name="linkendreq.attrib"/>
-  <ref name="label.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="footnoteref.role.attrib"/>
-  <ref name="local.footnoteref.attrib"/>
-</define>
-</div> <!-- footnoteref.attlist -->
-</div> <!-- footnoteref.module -->
-
-<dtd:pe-decl name="xref.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="xref.module">
-<define name="local.xref.attrib">
-  <notAllowed/>
-</define>
-<define name="xref.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="xref.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="xref.element">
-<define name="xref.element">
-  <element name="xref">
-    <empty/>
-  </element>
-</define>
-</div> <!-- xref.element -->
-
-<dtd:comment> Endterm: ID of element containing text that is to be
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of ulink.element-->
+<!-- URL: uniform resource locator; the target of the ULink -->
+<!-- Type: Freely assignable parameter -->
+  <define name="ulink.attlist" combine="interleave">
+    <attribute name="url"/>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="ulink.role.attrib"/>
+    <ref name="local.ulink.attrib"/>
+  </define>
+<!--end of ulink.attlist-->
+<!--end of ulink.module-->
+  <define name="local.footnoteref.attrib">
+    <empty/>
+  </define>
+  <define name="footnoteref.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="footnoteref">
+    <element name="footnoteref">
+      <ref name="footnoteref.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of footnoteref.element-->
+<!-- to footnote content supplied elsewhere -->
+  <define name="footnoteref.attlist" combine="interleave">
+    <ref name="linkendreq.attrib"/>
+    <ref name="label.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="footnoteref.role.attrib"/>
+    <ref name="local.footnoteref.attrib"/>
+  </define>
+<!--end of footnoteref.attlist-->
+<!--end of footnoteref.module-->
+  <define name="local.xref.attrib">
+    <empty/>
+  </define>
+  <define name="xref.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="xref">
+    <element name="xref">
+      <ref name="xref.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of xref.element-->
+<!-- Endterm: ID of element containing text that is to be
 		fetched from elsewhere in the document to appear as
-		the content of this element </dtd:comment>
-<dtd:comment> to linked-to object </dtd:comment>
-
-
-<dtd:pe-decl name="xref.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="xref.attlist">
-<define name="xref.attlist">
-  <optional>
-    <attribute name="endterm" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <ref name="linkendreq.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="xref.role.attrib"/>
-  <ref name="local.xref.attrib"/>
-</define>
-</div> <!-- xref.attlist -->
-</div> <!-- xref.module -->
-
-<dtd:comment> Ubiquitous elements .................................................. </dtd:comment>
-
-<dtd:pe-decl name="anchor.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="anchor.module">
-<define name="local.anchor.attrib">
-  <notAllowed/>
-</define>
-<define name="anchor.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="anchor.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="anchor.element">
-<define name="anchor.element">
-  <element name="anchor">
-    <empty/>
-  </element>
-</define>
-</div> <!-- anchor.element -->
-
-<dtd:comment> required </dtd:comment>
-<dtd:comment> replaces Lang </dtd:comment>
-
-
-<dtd:pe-decl name="anchor.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="anchor.attlist">
-<define name="anchor.attlist">
-  <ref name="idreq.attrib"/>
-  <ref name="pagenum.attrib"/>
-  <ref name="remap.attrib"/>
-  <ref name="xreflabel.attrib"/>
-  <ref name="revisionflag.attrib"/>
-  <ref name="effectivity.attrib"/>
-  <ref name="anchor.role.attrib"/>
-  <ref name="local.anchor.attrib"/>
-</define>
-</div> <!-- anchor.attlist -->
-</div> <!-- anchor.module -->
-
-<dtd:pe-decl name="beginpage.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="beginpage.module">
-<define name="local.beginpage.attrib">
-  <notAllowed/>
-</define>
-<define name="beginpage.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="beginpage.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="beginpage.element">
-<define name="beginpage.element">
-  <element name="beginpage">
-    <empty/>
-  </element>
-</define>
-</div> <!-- beginpage.element -->
-
-<dtd:comment> PageNum: Number of page that begins at this point </dtd:comment>
-
-
-<dtd:pe-decl name="beginpage.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="beginpage.attlist">
-<define name="beginpage.attlist">
-  <ref name="pagenum.attrib"/>
-  <ref name="common.attrib"/>
-  <ref name="beginpage.role.attrib"/>
-  <ref name="local.beginpage.attrib"/>
-</define>
-</div> <!-- beginpage.attlist -->
-</div> <!-- beginpage.module -->
-
-<dtd:comment> IndexTerms appear in the text flow for generating or linking an
-     index. </dtd:comment>
-
-<dtd:pe-decl name="indexterm.content.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="indexterm.content.module">
-<dtd:pe-decl name="indexterm.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="indexterm.module">
-<define name="local.indexterm.attrib">
-  <notAllowed/>
-</define>
-<define name="indexterm.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="indexterm.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="indexterm.element">
-<define name="indexterm.element">
-  <element name="indexterm">
-    <group>
+		the content of this element -->
+<!-- to linked-to object -->
+  <define name="xref.attlist" combine="interleave">
+    <optional>
+      <attribute name="endterm">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <ref name="linkendreq.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="xref.role.attrib"/>
+    <ref name="local.xref.attrib"/>
+  </define>
+<!--end of xref.attlist-->
+<!--end of xref.module-->
+<!-- Ubiquitous elements .................................................. -->
+  <define name="local.anchor.attrib">
+    <empty/>
+  </define>
+  <define name="anchor.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="anchor">
+    <element name="anchor">
+      <ref name="anchor.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of anchor.element-->
+<!-- required -->
+<!-- replaces Lang -->
+  <define name="anchor.attlist" combine="interleave">
+    <ref name="idreq.attrib"/>
+    <ref name="pagenum.attrib"/>
+    <ref name="remap.attrib"/>
+    <ref name="xreflabel.attrib"/>
+    <ref name="revisionflag.attrib"/>
+    <ref name="effectivity.attrib"/>
+    <ref name="anchor.role.attrib"/>
+    <ref name="local.anchor.attrib"/>
+  </define>
+<!--end of anchor.attlist-->
+<!--end of anchor.module-->
+  <define name="local.beginpage.attrib">
+    <empty/>
+  </define>
+  <define name="beginpage.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="beginpage">
+    <element name="beginpage">
+      <ref name="beginpage.attlist"/>
+      <empty/>
+    </element>
+  </define>
+<!--end of beginpage.element-->
+<!-- PageNum: Number of page that begins at this point -->
+  <define name="beginpage.attlist" combine="interleave">
+    <ref name="pagenum.attrib"/>
+    <ref name="common.attrib"/>
+    <ref name="beginpage.role.attrib"/>
+    <ref name="local.beginpage.attrib"/>
+  </define>
+<!--end of beginpage.attlist-->
+<!--end of beginpage.module-->
+<!-- IndexTerms appear in the text flow for generating or linking an
+     index. -->
+  <define name="local.indexterm.attrib">
+    <empty/>
+  </define>
+  <define name="indexterm.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="indexterm">
+    <element name="indexterm">
+      <ref name="indexterm.attlist"/>
       <optional>
-        <ref name="primary.element"/>
+        <ref name="primary"/>
       </optional>
       <optional>
         <choice>
           <group>
-            <ref name="secondary.element"/>
+            <ref name="secondary"/>
             <optional>
               <choice>
                 <group>
-                  <ref name="tertiary.element"/>
+                  <ref name="tertiary"/>
                   <optional>
                     <choice>
-                      <ref name="see.element"/>
+                      <ref name="see"/>
                       <oneOrMore>
-                        <ref name="seealso.element"/>
+                        <ref name="seealso"/>
                       </oneOrMore>
                     </choice>
                   </optional>
                 </group>
-                <ref name="see.element"/>
+                <ref name="see"/>
                 <oneOrMore>
-                  <ref name="seealso.element"/>
+                  <ref name="seealso"/>
                 </oneOrMore>
               </choice>
             </optional>
           </group>
-          <ref name="see.element"/>
+          <ref name="see"/>
           <oneOrMore>
-            <ref name="seealso.element"/>
+            <ref name="seealso"/>
           </oneOrMore>
         </choice>
       </optional>
-    </group>
-  </element>
-</define>
-</div> <!-- indexterm.element -->
-
-<dtd:comment> Scope: Indicates which generated indices the IndexTerm
+    </element>
+  </define>
+<!--end of indexterm.element-->
+<!-- Scope: Indicates which generated indices the IndexTerm
 		should appear in: Global (whole document set), Local (this
-		document only), or All (both) </dtd:comment>
-<dtd:comment> Significance: Whether this IndexTerm is the most pertinent
-		of its series (Preferred) or not (Normal, the default) </dtd:comment>
-<dtd:comment> Class: Indicates type of IndexTerm; default is Singular, 
+		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 
-		must be supplied explicitly on starts of ranges </dtd:comment>
-<dtd:comment> StartRef: ID of the IndexTerm that starts the indexing 
-		range ended by this IndexTerm </dtd:comment>
-<dtd:comment> Zone: IDs of the elements to which the IndexTerm applies,
+		must be supplied explicitly on starts of ranges -->
+<!-- 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
 		elements rather than the point at which the IndexTerm
-		occurs </dtd:comment>
-
-
-<dtd:pe-decl name="indexterm.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="indexterm.attlist">
-<define name="indexterm.attlist">
-  <ref name="pagenum.attrib"/>
-  <optional>
-    <attribute name="scope">
-      <choice>
-        <value>all</value>
-        <value>global</value>
-        <value>local</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="significance" dtd:default="normal">
-      <choice>
-        <value>preferred</value>
-        <value>normal</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="class">
-      <choice>
-        <value>singular</value>
-        <value>startofrange</value>
-        <value>endofrange</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="startref" a:attributeType="IDREF">
-      <data type="token"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="zone" a:attributeType="IDREFS">
-      <list>
-        <oneOrMore>
-          <data type="token"/>
-        </oneOrMore>
-      </list>
-    </attribute>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="indexterm.role.attrib"/>
-  <ref name="local.indexterm.attrib"/>
-</define>
-</div> <!-- indexterm.attlist -->
-</div> <!-- indexterm.module -->
-
-<dtd:pe-decl name="primsecter.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="primsecter.module">
-<define name="local.primsecter.attrib">
-  <notAllowed/>
-</define>
-<define name="primsecter.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-
-<dtd:pe-decl name="primary.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="primary.element">
-<define name="primary.element">
-  <element name="primary">
-    <zeroOrMore>
-      <choice>
+		occurs -->
+  <define name="indexterm.attlist" combine="interleave">
+    <ref name="pagenum.attrib"/>
+    <optional>
+      <attribute name="scope">
+        <choice>
+          <value>all</value>
+          <value>global</value>
+          <value>local</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="significance" a:defaultValue="normal">
+        <choice>
+          <value>preferred</value>
+          <value>normal</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="class">
+        <choice>
+          <value>singular</value>
+          <value>startofrange</value>
+          <value>endofrange</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="startref">
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="zone">
+        <data type="IDREFS"/>
+      </attribute>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="indexterm.role.attrib"/>
+    <ref name="local.indexterm.attrib"/>
+  </define>
+<!--end of indexterm.attlist-->
+<!--end of indexterm.module-->
+  <define name="local.primsecter.attrib">
+    <empty/>
+  </define>
+  <define name="primsecter.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="primary">
+    <element name="primary">
+      <ref name="primary.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- primary.element -->
-<dtd:comment> SortAs: Alternate sort string for index sorting, e.g.,
-		"fourteen" for an element containing "14" </dtd:comment>
-
-<dtd:pe-decl name="primary.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="primary.attlist">
-<define name="primary.attlist">
-  <optional>
-    <attribute name="sortas"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="primsecter.role.attrib"/>
-  <ref name="local.primsecter.attrib"/>
-</define>
-</div> <!-- primary.attlist -->
-
-<dtd:pe-decl name="secondary.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="secondary.element">
-<define name="secondary.element">
-  <element name="secondary">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of primary.element-->
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+  <define name="primary.attlist" combine="interleave">
+    <optional>
+      <attribute name="sortas"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="primsecter.role.attrib"/>
+    <ref name="local.primsecter.attrib"/>
+  </define>
+<!--end of primary.attlist-->
+  <define name="secondary">
+    <element name="secondary">
+      <ref name="secondary.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- secondary.element -->
-<dtd:comment> SortAs: Alternate sort string for index sorting, e.g.,
-		"fourteen" for an element containing "14" </dtd:comment>
-
-<dtd:pe-decl name="secondary.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="secondary.attlist">
-<define name="secondary.attlist">
-  <optional>
-    <attribute name="sortas"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="primsecter.role.attrib"/>
-  <ref name="local.primsecter.attrib"/>
-</define>
-</div> <!-- secondary.attlist -->
-
-
-<dtd:pe-decl name="tertiary.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="tertiary.element">
-<define name="tertiary.element">
-  <element name="tertiary">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of secondary.element-->
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+  <define name="secondary.attlist" combine="interleave">
+    <optional>
+      <attribute name="sortas"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="primsecter.role.attrib"/>
+    <ref name="local.primsecter.attrib"/>
+  </define>
+<!--end of secondary.attlist-->
+  <define name="tertiary">
+    <element name="tertiary">
+      <ref name="tertiary.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- tertiary.element -->
-<dtd:comment> SortAs: Alternate sort string for index sorting, e.g.,
-		"fourteen" for an element containing "14" </dtd:comment>
-
-<dtd:pe-decl name="tertiary.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="tertiary.attlist">
-<define name="tertiary.attlist">
-  <optional>
-    <attribute name="sortas"/>
-  </optional>
-  <ref name="common.attrib"/>
-  <ref name="primsecter.role.attrib"/>
-  <ref name="local.primsecter.attrib"/>
-</define>
-</div> <!-- tertiary.attlist -->
-
-</div> <!-- primsecter.module -->
-
-<dtd:pe-decl name="seeseealso.module">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seeseealso.module">
-<define name="local.seeseealso.attrib">
-  <notAllowed/>
-</define>
-<define name="seeseealso.role.attrib">
-  <ref name="role.attrib"/>
-</define>
-
-<dtd:pe-decl name="see.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="see.element">
-<define name="see.element">
-  <element name="see">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of tertiary.element-->
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+  <define name="tertiary.attlist" combine="interleave">
+    <optional>
+      <attribute name="sortas"/>
+    </optional>
+    <ref name="common.attrib"/>
+    <ref name="primsecter.role.attrib"/>
+    <ref name="local.primsecter.attrib"/>
+  </define>
+<!--end of tertiary.attlist-->
+<!--end of primsecter.module-->
+  <define name="local.seeseealso.attrib">
+    <empty/>
+  </define>
+  <define name="seeseealso.role.attrib">
+    <ref name="role.attrib"/>
+  </define>
+  <define name="see">
+    <element name="see">
+      <ref name="see.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- see.element -->
-
-<dtd:pe-decl name="see.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="see.attlist">
-<define name="see.attlist">
-  <ref name="common.attrib"/>
-  <ref name="seeseealso.role.attrib"/>
-  <ref name="local.seeseealso.attrib"/>
-</define>
-</div> <!-- see.attlist -->
-
-<dtd:pe-decl name="seealso.element">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seealso.element">
-<define name="seealso.element">
-  <element name="seealso">
-    <zeroOrMore>
-      <choice>
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of see.element-->
+  <define name="see.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="seeseealso.role.attrib"/>
+    <ref name="local.seeseealso.attrib"/>
+  </define>
+<!--end of see.attlist-->
+  <define name="seealso">
+    <element name="seealso">
+      <ref name="seealso.attlist"/>
+      <zeroOrMore>
         <ref name="ndxterm.char.mix"/>
-      </choice>
-    </zeroOrMore>
-  </element>
-</define>
-</div> <!-- seealso.element -->
-
-<dtd:pe-decl name="seealso.attlist">INCLUDE</dtd:pe-decl>
-<div dtd:marked-section="seealso.attlist">
-<define name="seealso.attlist">
-  <ref name="common.attrib"/>
-  <ref name="seeseealso.role.attrib"/>
-  <ref name="local.seeseealso.attrib"/>
-</define>
-</div> <!-- seealso.attlist -->
-</div> <!-- seeseealso.module -->
-</div> <!-- indexterm.content.module -->
-
-<dtd:comment> End of DocBook XML information pool module V4.1.2 ...................... </dtd:comment>
-<dtd:comment> ...................................................................... </dtd:comment>
-
+      </zeroOrMore>
+    </element>
+  </define>
+<!--end of seealso.element-->
+  <define name="seealso.attlist" combine="interleave">
+    <ref name="common.attrib"/>
+    <ref name="seeseealso.role.attrib"/>
+    <ref name="local.seeseealso.attrib"/>
+  </define>
+<!--end of seealso.attlist-->
+<!--end of seeseealso.module-->
+<!--end of indexterm.content.module-->
+<!-- End of DocBook XML information pool module V4.1.2 ...................... -->
+<!-- ...................................................................... -->
 </grammar>
diff --git a/docbook/relaxng/dbtables.rng b/docbook/relaxng/dbtables.rng
deleted file mode 100644
index dcc614d62..000000000
--- a/docbook/relaxng/dbtables.rng
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
-
-   <define name="table.att.role">
-      <empty/>
-   </define>
-   <define name="tgroup.att.role">
-      <empty/>
-   </define>
-   <define name="colspec.att.role">
-      <empty/>
-   </define>
-   <define name="thead.att.role">
-      <empty/>
-   </define>
-   <define name="tbody.att.role">
-      <empty/>
-   </define>
-   <define name="row.att.role">
-      <empty/>
-   </define>
-   <define name="entry.att.role">
-      <empty/>
-   </define>
-   <define name="table.label">
-      <choice>
-         <element name="table">
-            <ref name="table.role"/>
-            <group>
-               <ref name="formalobject.title.content.label"/>
-               <optional>
-                  <ref name="ndxterm.class.label"/>
-               </optional>
-               <choice>
-                  <oneOrMore>
-                     <ref name="graphic.label"/>
-                  </oneOrMore>
-                  <oneOrMore>
-                     <ref name="mediaobject.label"/>
-                  </oneOrMore>
-                  <oneOrMore>
-                     <ref name="tgroup.label"/>
-                  </oneOrMore>
-               </choice>
-            </group>
-         </element>
-      </choice>
-   </define>
-   <define name="table.role">
-      <empty/>
-      <ref name="table.att.role"/>
-      <optional>
-         <attribute name="frame">
-            <choice>
-               <string>top</string>
-               <string>bottom</string>
-               <string>topbot</string>
-               <string>all</string>
-               <string>sides</string>
-               <string>none</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="colsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="rowsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-   <define name="informaltable.label">
-      <choice>
-         <element name="informaltable">
-            <ref name="informaltable.role"/>
-            <choice>
-               <oneOrMore>
-                  <ref name="graphic.label"/>
-               </oneOrMore>
-               <oneOrMore>
-                  <ref name="mediaobject.label"/>
-               </oneOrMore>
-               <oneOrMore>
-                  <ref name="tgroup.label"/>
-               </oneOrMore>
-            </choice>
-         </element>
-      </choice>
-   </define>
-   <define name="informaltable.role">
-      <empty/>
-      <ref name="table.att.role"/>
-      <optional>
-         <attribute name="frame">
-            <choice>
-               <string>top</string>
-               <string>bottom</string>
-               <string>topbot</string>
-               <string>all</string>
-               <string>sides</string>
-               <string>none</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="colsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="rowsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-   <define name="tgroup.label">
-      <choice>
-         <element name="tgroup">
-            <ref name="tgroup.role"/>
-            <group>
-               <zeroOrMore>
-                  <ref name="colspec.label"/>
-               </zeroOrMore>
-               <optional>
-                  <ref name="thead.label"/>
-               </optional>
-               <ref name="tbody.label"/>
-            </group>
-         </element>
-      </choice>
-   </define>
-   <define name="tgroup.role">
-      <empty/>
-      <ref name="tgroup.att.role"/>
-      <attribute name="cols">
-         <data type="xsd:integer"/>
-      </attribute>
-      <optional>
-         <attribute name="colsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="rowsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="align">
-            <choice>
-               <string>left</string>
-               <string>right</string>
-               <string>center</string>
-               <string>justify</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-   <define name="colspec.label">
-      <choice>
-         <element name="colspec">
-            <ref name="colspec.role"/>
-            <empty/>
-         </element>
-      </choice>
-   </define>
-   <define name="colspec.role">
-      <empty/>
-      <ref name="colspec.att.role"/>
-      <optional>
-         <attribute name="colnum">
-            <data type="xsd:integer"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="colname">
-            <data type="xsd:NMTOKEN"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="colwidth">
-            <anyString/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="colsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="rowsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="align">
-            <choice>
-               <string>left</string>
-               <string>right</string>
-               <string>center</string>
-               <string>justify</string>
-               <string>char</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="char">
-            <anyString/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="charoff">
-            <data type="xsd:NMTOKEN"/>
-         </attribute>
-      </optional>
-   </define>
-   <define name="thead.label">
-      <choice>
-         <element name="thead">
-            <ref name="thead.role"/>
-            <choice>
-               <oneOrMore>
-                  <ref name="row.label"/>
-               </oneOrMore>
-            </choice>
-         </element>
-      </choice>
-   </define>
-   <define name="thead.role">
-      <empty/>
-      <ref name="thead.att.role"/>
-      <optional>
-         <attribute name="valign">
-            <choice>
-               <string>top</string>
-               <string>middle</string>
-               <string>bottom</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-   <define name="tbody.label">
-      <choice>
-         <element name="tbody">
-            <ref name="tbody.role"/>
-            <choice>
-               <oneOrMore>
-                  <ref name="row.label"/>
-               </oneOrMore>
-            </choice>
-         </element>
-      </choice>
-   </define>
-   <define name="tbody.role">
-      <empty/>
-      <ref name="tbody.att.role"/>
-      <optional>
-         <attribute name="valign">
-            <choice>
-               <string>top</string>
-               <string>middle</string>
-               <string>bottom</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-   <define name="row.label">
-      <choice>
-         <element name="row">
-            <ref name="row.role"/>
-            <choice>
-               <oneOrMore>
-                  <ref name="entry.label"/>
-               </oneOrMore>
-            </choice>
-         </element>
-      </choice>
-   </define>
-   <define name="row.role">
-      <empty/>
-      <ref name="row.att.role"/>
-      <optional>
-         <attribute name="rowsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="valign">
-            <choice>
-               <string>top</string>
-               <string>middle</string>
-               <string>bottom</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-   <define name="entry.label">
-      <choice>
-         <element name="entry">
-            <ref name="entry.role"/>
-            <mixed>
-               <zeroOrMore>
-                 <ref name="para.char.mix.label"/>
-                 <ref name="tabentry.mix.label"/>
-               </zeroOrMore>
-            </mixed>
-         </element>
-      </choice>
-   </define>
-   <define name="entry.role">
-      <empty/>
-      <ref name="entry.att.role"/>
-      <optional>
-         <attribute name="colname">
-            <data type="xsd:NMTOKEN"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="namest">
-            <data type="xsd:NMTOKEN"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="nameend">
-            <data type="xsd:NMTOKEN"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="morerows">
-            <data type="xsd:integer"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="colsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="rowsep">
-            <choice>
-               <string>0</string>
-               <string>1</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="align">
-            <choice>
-               <string>left</string>
-               <string>right</string>
-               <string>center</string>
-               <string>justify</string>
-               <string>char</string>
-            </choice>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="char">
-            <anyString/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="charoff">
-            <data type="xsd:NMTOKEN"/>
-         </attribute>
-      </optional>
-      <optional>
-         <attribute name="valign">
-            <choice>
-               <string>top</string>
-               <string>middle</string>
-               <string>bottom</string>
-            </choice>
-         </attribute>
-      </optional>
-   </define>
-</grammar>
diff --git a/docbook/relaxng/docbook.rng b/docbook/relaxng/docbook.rng
index 2283ce32c..5f2f985fc 100644
--- a/docbook/relaxng/docbook.rng
+++ b/docbook/relaxng/docbook.rng
@@ -1,35 +1,37 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
+<?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">
 
   <start>
     <choice>
-      <ref name='set.element'/>
-      <ref name='book.element'/>
-      <ref name='chapter.element'/>
-      <ref name='appendix.element'/>
-      <ref name='part.element'/>
-      <ref name='reference.element'/>
-      <ref name='refentry.element'/>
-      <ref name='article.element'/>
-      <ref name='section.element'/>
-      <ref name='sect1.element'/>
-      <ref name='sect2.element'/>
-      <ref name='sect3.element'/>
-      <ref name='sect4.element'/>
-      <ref name='sect5.element'/>
-      <ref name="para.element"/>
+      <ref name="set"/>
+      <ref name="setindex"/>
+      <ref name="book"/>
+      <ref name="part"/>
+      <ref name="reference"/>
+      <ref name="preface"/>
+      <ref name="chapter"/>
+      <ref name="appendix"/>
+      <ref name="article"/>
+      <ref name="bibliography"/>
+      <ref name="glossary"/>
+      <ref name="index"/>
+      <ref name="refentry"/>
+      <ref name="sect1"/>
+      <ref name="sect2"/>
+      <ref name="sect3"/>
+      <ref name="sect4"/>
+      <ref name="sect5"/>
+      <ref name="section"/>
     </choice>
   </start>
 
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DocBook XML DTD V4.1.2 ................................................. </dtd:comment>
-<dtd:comment> File docbookx.dtd .................................................... </dtd:comment>
-
-<dtd:comment> Copyright 1992-2000 HaL Computer Systems, Inc.,
-     O'Reilly &#38; Associates, Inc., ArborText, Inc., Fujitsu Software
+<!-- ...................................................................... -->
+<!-- DocBook XML DTD V4.1.2 ................................................. -->
+<!-- File docbookx.dtd .................................................... -->
+<!-- Copyright 1992-2000 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).
 
@@ -51,11 +53,9 @@
      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/.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-
-<dtd:comment> This is the driver file for V4.1.2 of the DocBook DTD.
+-->
+<!-- ...................................................................... -->
+<!-- This is the driver file for V4.1.2 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
      "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -64,14 +64,14 @@
      you are using DocBook directly, use the FPI in the DOCTYPE
      declaration:
 
-     &#60;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                     "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
                     [...]>
 
      Or, if you have a higher-level driver file that customizes DocBook,
      use the FPI in the parameter entity declaration:
 
-     &#60;!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                 "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
      %DocBookDTD;
 
@@ -79,85 +79,28 @@
      entity and module scheme used in DocBook, customizing DocBook and
      planning for interchange, and changes made since the last release
      of DocBook.
-</dtd:comment>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Notation declarations ................................................ </dtd:comment>
-
-<dtd:pe-decl name="dbnotn.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dbnotn.module"/>
-<dtd:pe-decl name="dbnotn"
-             public="-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
-             system="dbnotnx.mod"/>
-<dtd:pe-ref name="dbnotn"/>
-<dtd:marked-section end="dbnotn.module"/>
-
-<include href="dbnotn.rng"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> ISO character entity sets ............................................ </dtd:comment>
-
-<dtd:pe-decl name="dbcent.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dbcent.module"/>
-<dtd:entity-decl name="euro">&amp;#x20AC;</dtd:entity-decl><dtd:comment> euro sign, U+20AC NEW </dtd:comment>
-<dtd:pe-decl name="dbcent"
-             public="-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
-             system="dbcentx.mod"/>
-<dtd:pe-ref name="dbcent"/>
-<dtd:marked-section end="dbcent.module"/>
-
-<include href="dbcent.rng"/>
-
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> DTD modules .......................................................... </dtd:comment>
-
-<dtd:comment> Information pool .............. </dtd:comment>
-
-<dtd:pe-decl name="dbpool.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dbpool.module"/>
-<dtd:pe-decl name="dbpool"
-             public="-//OASIS//ENTITIES DocBook XML Information Pool V4.1.2//EN"
-             system="dbpoolx.mod"/>
-<dtd:pe-ref name="dbpool"/>
-<dtd:marked-section end="dbpool.module"/>
-
-<include href="dbpool.rng"/>
-
-<dtd:comment> Redeclaration placeholder ..... </dtd:comment>
-
-<dtd:pe-decl name="intermod.redecl.module">IGNORE</dtd:pe-decl>
-<dtd:marked-section start="intermod.redecl.module"/>
-<dtd:comment> Defining rdbmods here makes some buggy XML parsers happy. </dtd:comment>
-<dtd:pe-decl name="rdbmods"/>
-<dtd:pe-ref name="rdbmods"/>
-<dtd:marked-section end="intermod.redecl.module"/>
-
-<dtd:comment> Document hierarchy ............ </dtd:comment>
-
-<dtd:pe-decl name="dbhier.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dbhier.module"/>
-<dtd:pe-decl name="dbhier"
-             public="-//OASIS//ENTITIES DocBook XML Hierarchy V4.1.2//EN"
-             system="dbhierx.mod"/>
-<dtd:pe-ref name="dbhier"/>
-<dtd:marked-section end="dbhier.module"/>
+-->
+<!-- ...................................................................... -->
 
-<include href="dbhier.rng"/>
+<!-- Notation declarations ................................................ -->
+  <include href="dbnotn.rng"/>
 
-<dtd:comment> ...................................................................... </dtd:comment>
-<dtd:comment> Other general entities ............................................... </dtd:comment>
+<!-- ...................................................................... -->
+<!-- ISO character entity sets ............................................ -->
+<!-- euro sign, U+20AC NEW -->
+  <include href="dbcent.rng"/>
 
-<dtd:pe-decl name="dbgenent.module">INCLUDE</dtd:pe-decl>
-<dtd:marked-section start="dbgenent.module"/>
-<dtd:pe-decl name="dbgenent"
-             public="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
-             system="dbgenent.mod"/>
-<dtd:pe-ref name="dbgenent"/>
-<dtd:marked-section end="dbgenent.module"/>
+<!-- DTD modules .......................................................... -->
+<!-- Information pool .............. -->
+  <include href="dbpool.rng"/>
 
-<include href="dbgenent.rng"/>
+<!-- Document hierarchy ............ -->
+  <include href="dbhier.rng"/>
 
-<dtd:comment> End of DocBook XML DTD V4.1.2 .......................................... </dtd:comment>
-<dtd:comment> ...................................................................... </dtd:comment>
+<!-- ...................................................................... -->
+<!-- Other general entities ............................................... -->
+  <include href="dbgenent.rng"/>
 
+<!-- End of DocBook XML DTD V4.1.2 .......................................... -->
+<!-- ...................................................................... -->
 </grammar>
diff --git a/docbook/relaxng/soextblx.rng b/docbook/relaxng/soextblx.rng
index d5a69324c..fc1c5db65 100644
--- a/docbook/relaxng/soextblx.rng
+++ b/docbook/relaxng/soextblx.rng
@@ -1,12 +1,7 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/0.9"
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	 xmlns:dtd="http://www.oasis-open.org/docbook/relaxng/dtdannotations"
-         ns="">
-
-<dtd:comment> XML EXCHANGE TABLE MODEL DECLARATION MODULE </dtd:comment>
-
-<dtd:comment> This set of declarations defines the XML version of the Exchange
+<?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">
+<!-- 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
      (FPI) for this entity.
 
@@ -14,25 +9,23 @@
      entity declaration and reference as shown in the following three
      lines:
 
-     &lt;!ENTITY % calstblx
-       PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"&gt;
+     <!ENTITY % calstblx
+       PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN">
        %calstblx;
 
      If various parameter entities used within this set of declarations
      are to be given non-default values, the appropriate declarations
      should be given before calling in this package (i.e., before the
      "%calstblx;" reference).
-</dtd:comment>
-
-<dtd:comment> The motivation for this XML version of the Exchange Table Model
+-->
+<!-- The motivation for this XML version of the Exchange Table Model
      is simply to create an XML version of the SGML Exchange Table
      Model. By design, no effort has been made to "improve" the model.
 
      This XML version incorporates the logical bare minimum changes
      necessary to make the Exchange Table Model a valid XML DTD.
-</dtd:comment>
-
-<dtd:comment> The XML version of the Exchange Table Model differs from
+-->
+<!-- The XML version of the Exchange Table Model differs from
      the SGML version in the following ways:
 
      The following parameter entities have been removed:
@@ -68,17 +61,15 @@
          parameter entry for the 'entry' element. This is necessary
          so that an entry can contain #PCDATA and be defined as an
          optional, repeatable OR group beginning with #PCDATA.
-</dtd:comment>
-
-<dtd:comment> This entity includes a set of element and attribute declarations
+-->
+<!-- This entity includes a set of element and attribute declarations
      that partially defines the Exchange table model.  However, the model
      is not well-defined without the accompanying natural language
      description of the semantics (meanings) of these various elements,
      attributes, and attribute values.  The semantic writeup, also available
      from SGML Open, should be used in conjunction with this entity.
-</dtd:comment>
-
-<dtd:comment> In order to use the Exchange table model, various parameter entity
+-->
+<!-- In order to use the Exchange table model, various parameter entity
      declarations are required.  A brief description is as follows:
 
      ENTITY NAME      WHERE USED              WHAT IT IS
@@ -87,7 +78,7 @@
                       almost all elements     for a "boolean" attribute
 
      %paracon         In content model of:    The "text" (logical content)
-                      &lt;entry>                 of the model group for &lt;entry>
+                      <entry>                 of the model group for <entry>
 
      %titles          In content model of:    The "title" part of the model
                       table element           group for the table element
@@ -114,63 +105,56 @@
                                               model)
 
      %tbl.tgroup.mdl  In content model of:    The model group for the content
-                      &lt;tgroup>                model for &lt;tgroup>
+                      <tgroup>                model for <tgroup>
 
      %tbl.tgroup.att  In ATTLIST of:          Additional attributes on the
-                      &lt;tgroup>                &lt;tgroup> element
+                      <tgroup>                <tgroup> element
 
      %tbl.thead.att   In ATTLIST of:          Additional attributes on the
-                      &lt;thead>                 &lt;thead> element
+                      <thead>                 <thead> element
 
      %tbl.tbody.att   In ATTLIST of:          Additional attributes on the
-                      &lt;tbody>                 &lt;tbody> element
+                      <tbody>                 <tbody> element
 
      %tbl.colspec.att In ATTLIST of:          Additional attributes on the
-                      &lt;colspec>               &lt;colspec> element
+                      <colspec>               <colspec> element
 
      %tbl.row.mdl     In content model of:    The model group for the content
-                      &lt;row>                   model for &lt;row>
+                      <row>                   model for <row>
 
      %tbl.row.att     In ATTLIST of:          Additional attributes on the
-                      &lt;row>                   &lt;row> element
+                      <row>                   <row> element
 
      %tbl.entry.mdl   In content model of:    The model group for the content
-                      &lt;entry>                 model for &lt;entry>
+                      <entry>                 model for <entry>
 
      %tbl.entry.att   In ATTLIST of:          Additional attributes on the
-                      &lt;entry>                 &lt;entry> element
+                      <entry>                 <entry> element
 
      This set of declarations will use the default definitions shown below
      for any of these parameter entities that are not declared before this
      set of declarations is referenced.
-</dtd:comment>
-
-<dtd:comment> These definitions are not directly related to the table model, but are
+-->
+<!-- These definitions are not directly related to the table model, but are
      used in the default CALS table model and may be defined elsewhere (and
-     prior to the inclusion of this table module) in the referencing DTD. </dtd:comment>
-
-<dtd:pe-decl name="yesorno">NMTOKEN</dtd:pe-decl>
-<dtd:comment> no if zero(s), yes if any other value </dtd:comment>
-
-<define name="titles">
-  <optional>
-    <ref name="title.element"/>
-  </optional>
-</define>
-
-<dtd:pe-decl name="pcd">#PCDATA</dtd:pe-decl>
-
-<define name="paracon">
-  <text/>
-</define>
-
+     prior to the inclusion of this table module) in the referencing DTD. -->
+  <define name="yesorno">
+    <data type="NMTOKEN"/>
+  </define>
+<!-- no if zero(s), yes if any other value -->
+  <define name="titles">
+    <optional>
+      <ref name="title"/>
+    </optional>
+  </define>
+  <define name="pcd">
+    <text/>
+  </define>
+  <define name="paracon">
+    <ref name="pcd"/>
+  </define>
+<!-- default for use in entry content -->
 <!--
-<dtd:pe-decl name="paracon"><dtd:pe-ref name="pcd"/></dtd:pe-decl>
--->
-
-<dtd:comment> default for use in entry content </dtd:comment>
-
-<dtd:comment>
 The parameter entities as defined below change and simplify the CALS table
 model as published (as part of the Example DTD) in MIL-HDBK-28001.  The
 resulting simplified DTD has support from the SGML Open vendors and is
@@ -185,83 +169,38 @@ current application.
 Note, however, that changes may have significant effect on the ability to
 interchange table information.  These changes may manifest themselves
 in useability, presentation, and possible structure information degradation.
-</dtd:comment>
-
-<dtd:pe-decl name="tbl.table.name">table</dtd:pe-decl>
-<dtd:pe-decl name="tbl.table-titles.mdl">%titles;,</dtd:pe-decl>
-<dtd:pe-decl name="tbl.table-main.mdl">tgroup+</dtd:pe-decl>
-<dtd:pe-decl name="tbl.table.mdl">%tbl.table-titles.mdl; %tbl.table-main.mdl;</dtd:pe-decl>
-
-<define name="tbl.table.mdl">
-  <group>
+-->
+  <define name="tbl.table-titles.mdl">
     <ref name="titles"/>
+  </define>
+  <define name="tbl.table-main.mdl">
+    <oneOrMore>
+      <ref name="tgroup"/>
+    </oneOrMore>
+  </define>
+  <define name="tbl.table.att">
+    <optional>
+      <attribute name="pgwide">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+  </define>
+  <define name="tbl.tgroup.mdl">
+    <zeroOrMore>
+      <ref name="colspec"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="thead"/>
+    </optional>
+    <ref name="tbody"/>
+  </define>
+  <define name="tbl.row.mdl">
     <oneOrMore>
-      <ref name="tgroup.element"/>
+      <ref name="entry"/>
     </oneOrMore>
-  </group>
-</define>
-
-<define name="tbl.table.att">
-  <optional>
-    <attribute name="pgwide" dtd:type="%yesorno;"/>
-  </optional>
-</define>
-
-<define name="bodyatt">
-  <notAllowed/>
-</define>
-
-<define name="tbl.tgroup.mdl">
-  <zeroOrMore>
-    <ref name="colspec.element"/>
-  </zeroOrMore>
-  <optional>
-    <ref name="thead.element"/>
-  </optional>
-  <ref name="tbody.element"/>
-</define>
-
-<define name="tbl.tgroup.att">
-  <notAllowed/>
-</define>
-
-<define name="tbl.thead.att">
-  <notAllowed/>
-</define>
-
-<define name="tbl.tbody.att">
-  <notAllowed/>
-</define>
-
-<define name="tbl.colspec.att">
-  <notAllowed/>
-</define>
-
-<define name="tbl.row.mdl">
-  <oneOrMore>
-    <ref name="entry.element"/>
-  </oneOrMore>
-</define>
-
-<define name="tbl.row.att">
-  <notAllowed/>
-</define>
-
-<define name="tbl.entry.mdl">
-  <zeroOrMore>
-    <group>
-      <ref name="paracon"/>
-    </group>
-  </zeroOrMore>
-</define>
-
-<define name="tbl.entry.att">
-  <notAllowed/>
-</define>
-
-<dtd:comment> =====  Element and attribute declarations follow. =====  </dtd:comment>
-
-<dtd:comment>
+  </define>
+<!-- =====  Element and attribute declarations follow. =====  -->
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % tbl.table.name       "table"
@@ -269,291 +208,285 @@ in useability, presentation, and possible structure information degradation.
      ENTITY % tbl.table.mdl        "%tbl.table-titles; tgroup+"
      ENTITY % tbl.table.att        "
                         pgwide          %yesorno;       #IMPLIED "
-</dtd:comment>
-
-<define name="table.element" dtd:name="%tbl.table.name;">
-  <element name="table">
-    <group>
+-->
+  <define name="table">
+    <element name="table">
+      <ref name="table.attlist"/>
       <ref name="tbl.table.mdl"/>
-    </group>
-  </element>
-</define>
-
-<define name="table.attlist" dtd:name="%tbl.table.name;">
-  <optional>
-    <attribute name="frame">
-      <choice>
-        <value>top</value>
-        <value>bottom</value>
-        <value>topbot</value>
-        <value>all</value>
-        <value>sides</value>
-        <value>none</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="colsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="rowsep" dtd:type="%yesorno;"/>
-  </optional>
-  <ref name="tbl.table.att"/>
-  <ref name="bodyatt"/>
-</define>
-
-<dtd:comment>
+    </element>
+  </define>
+  <define name="table.attlist" combine="interleave">
+    <optional>
+      <attribute name="frame">
+        <choice>
+          <value>top</value>
+          <value>bottom</value>
+          <value>topbot</value>
+          <value>all</value>
+          <value>sides</value>
+          <value>none</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <ref name="tbl.table.att"/>
+    <ref name="bodyatt"/>
+  </define>
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % tbl.tgroup.mdl    "colspec*,thead?,tbody"
      ENTITY % tbl.tgroup.att    ""
-</dtd:comment>
-
-<define name="tgroup.element">
-  <element name="tgroup">
-    <group>
+-->
+  <define name="tgroup">
+    <element name="tgroup">
+      <ref name="tgroup.attlist"/>
       <ref name="tbl.tgroup.mdl"/>
-    </group>
-  </element>
-</define>
-
-<define name="tgroup.attlist">
-  <attribute name="cols">
-    <data type="NMTOKEN"/>
-  </attribute>
-  <optional>
-    <attribute name="colsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="rowsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="align">
-      <choice>
-        <value>right</value>
-        <value>left</value>
-        <value>center</value>
-        <value>justify</value>
-        <value>char</value>
-      </choice>
+    </element>
+  </define>
+  <define name="tgroup.attlist" combine="interleave">
+    <attribute name="cols">
+      <data type="NMTOKEN"/>
     </attribute>
-  </optional>
-  <ref name="tbl.tgroup.att"/>
-</define>
-
-<dtd:comment>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="tbl.tgroup.att"/>
+  </define>
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % tbl.colspec.att   ""
-</dtd:comment>
-
-<define name="colspec.element">
-  <element name="colspec">
-    <notAllowed/>
-  </element>
-</define>
-
-<define name="colspec.attlist">
-  <optional>
-    <attribute name="colnum">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="colname">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="colwidth"/>
-  </optional>
-  <optional>
-    <attribute name="colsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="rowsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="align">
-      <choice>
-        <value>right</value>
-        <value>left</value>
-        <value>center</value>
-        <value>justify</value>
-        <value>char</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="char"/>
-  </optional>
-  <optional>
-    <attribute name="charoff">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <ref name="tbl.colspec.att"/>
-</define>
-
-<dtd:comment>
+-->
+  <define name="colspec">
+    <element name="colspec">
+      <ref name="colspec.attlist"/>
+      <empty/>
+    </element>
+  </define>
+  <define name="colspec.attlist" combine="interleave">
+    <optional>
+      <attribute name="colnum">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="colname">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="colwidth"/>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <ref name="tbl.colspec.att"/>
+  </define>
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % tbl.thead.att      ""
-</dtd:comment>
-
-<define name="thead.element">
-  <element name="thead">
-    <group>
+-->
+  <define name="thead">
+    <element name="thead">
+      <ref name="thead.attlist"/>
       <oneOrMore>
-        <ref name="row.element"/>
+        <ref name="row"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-
-<define name="thead.attlist">
-  <optional>
-    <attribute name="valign">
-      <choice>
-        <value>top</value>
-        <value>middle</value>
-        <value>bottom</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="tbl.thead.att"/>
-</define>
-
-<dtd:comment>
+    </element>
+  </define>
+  <define name="thead.attlist" combine="interleave">
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="tbl.thead.att"/>
+  </define>
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % tbl.tbody.att     ""
-</dtd:comment>
-
-<define name="tbody.element">
-  <element name="tbody">
-    <group>
+-->
+  <define name="tbody">
+    <element name="tbody">
+      <ref name="tbody.attlist"/>
       <oneOrMore>
-        <ref name="row.element"/>
+        <ref name="row"/>
       </oneOrMore>
-    </group>
-  </element>
-</define>
-
-<define name="tbody.attlist">
-  <optional>
-    <attribute name="valign">
-      <choice>
-        <value>top</value>
-        <value>middle</value>
-        <value>bottom</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="tbl.tbody.att"/>
-</define>
-
-<dtd:comment>
+    </element>
+  </define>
+  <define name="tbody.attlist" combine="interleave">
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="tbl.tbody.att"/>
+  </define>
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % tbl.row.mdl       "entry+"
      ENTITY % tbl.row.att       ""
-</dtd:comment>
-
-<define name="row.element">
-  <element name="row">
-    <group>
+-->
+  <define name="row">
+    <element name="row">
+      <ref name="row.attlist"/>
       <ref name="tbl.row.mdl"/>
-    </group>
-  </element>
-</define>
-
-<define name="row.attlist">
-  <optional>
-    <attribute name="rowsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="valign">
-      <choice>
-        <value>top</value>
-        <value>middle</value>
-        <value>bottom</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="tbl.row.att"/>
-</define>
-
-<dtd:comment>
+    </element>
+  </define>
+  <define name="row.attlist" combine="interleave">
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="tbl.row.att"/>
+  </define>
+<!--
      Default declarations previously defined in this entity and
      referenced below include:
      ENTITY % paracon           "#PCDATA"
      ENTITY % tbl.entry.mdl     "(%paracon;)*"
      ENTITY % tbl.entry.att     ""
-</dtd:comment>
-
-<define name="entry.element">
-  <element name="entry">
-    <ref name="tbl.entry.mdl"/>
-  </element>
-</define>
-
-<define name="entry.attlist">
-  <optional>
-    <attribute name="colname">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="namest">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="nameend">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="morerows">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="colsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="rowsep" dtd:type="%yesorno;"/>
-  </optional>
-  <optional>
-    <attribute name="align">
-      <choice>
-        <value>right</value>
-        <value>left</value>
-        <value>center</value>
-        <value>justify</value>
-        <value>char</value>
-      </choice>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="char"/>
-  </optional>
-  <optional>
-    <attribute name="charoff">
-      <data type="NMTOKEN"/>
-    </attribute>
-  </optional>
-  <optional>
-    <attribute name="valign">
-      <choice>
-        <value>top</value>
-        <value>middle</value>
-        <value>bottom</value>
-      </choice>
-    </attribute>
-  </optional>
-  <ref name="tbl.entry.att"/>
-</define>
-
+-->
+  <define name="entry">
+    <element name="entry">
+      <ref name="entry.attlist"/>
+      <ref name="tbl.entry.mdl"/>
+    </element>
+  </define>
+  <define name="entry.attlist" combine="interleave">
+    <optional>
+      <attribute name="colname">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="namest">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="nameend">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="morerows">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="colsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="rowsep">
+        <ref name="yesorno"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="align">
+        <choice>
+          <value>left</value>
+          <value>right</value>
+          <value>center</value>
+          <value>justify</value>
+          <value>char</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="char"/>
+    </optional>
+    <optional>
+      <attribute name="charoff">
+        <data type="NMTOKEN"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="valign">
+        <choice>
+          <value>top</value>
+          <value>middle</value>
+          <value>bottom</value>
+        </choice>
+      </attribute>
+    </optional>
+    <ref name="tbl.entry.att"/>
+  </define>
 </grammar>