From f4073b9f81f2ea5fa1e6d53aa0bd4e15a9bf1c75 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 26 May 2004 12:13:29 +0000
Subject: [PATCH] Pattern renaming and cleanup

---
 docbook/relaxng/src/bibliography.rnc |  195 +-
 docbook/relaxng/src/callouts.rnc     |  201 +-
 docbook/relaxng/src/calstbl.rnc      |  299 +-
 docbook/relaxng/src/docbook-dtd.rnc  |   49 +-
 docbook/relaxng/src/docbook.rnc      |    8 +-
 docbook/relaxng/src/ebnf.rnc         |  134 +-
 docbook/relaxng/src/glossary.rnc     |  191 +-
 docbook/relaxng/src/hier.rnc         |  395 +--
 docbook/relaxng/src/htmlform.rnc     |   99 +-
 docbook/relaxng/src/htmltbl.rnc      |  209 +-
 docbook/relaxng/src/index.rnc        |  392 +--
 docbook/relaxng/src/mathml.rnc       |   14 +-
 docbook/relaxng/src/msgset.rnc       |  231 +-
 docbook/relaxng/src/pool.rnc         | 4716 +++++++++++---------------
 docbook/relaxng/src/qandaset.rnc     |  114 +-
 docbook/relaxng/src/refentry.rnc     |  223 +-
 docbook/relaxng/src/sdocbook.rnc     |  158 +-
 docbook/relaxng/src/slides-ng.rnc    |   86 +-
 docbook/relaxng/src/svg.rnc          |   12 +-
 docbook/relaxng/src/tasks.rnc        |   84 +-
 docbook/relaxng/src/toc.rnc          |   63 +-
 docbook/relaxng/src/website-ng.rnc   |  109 +-
 docbook/relaxng/src/ws-rddl.rnc      |   15 +-
 23 files changed, 3401 insertions(+), 4596 deletions(-)

diff --git a/docbook/relaxng/src/bibliography.rnc b/docbook/relaxng/src/bibliography.rnc
index ff49e862c..f65ec3f84 100644
--- a/docbook/relaxng/src/bibliography.rnc
+++ b/docbook/relaxng/src/bibliography.rnc
@@ -16,15 +16,17 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-navigation.components |= db.bibliography
+db.navigation.components |= db.bibliography
 
-list.blocks |= db.bibliolist
+db.list.blocks |= db.bibliolist
 
-info.elements |= db.bibliomisc | db.bibliomset | db.bibliorelation | db.biblioset
+db.info.elements |= db.bibliomisc | db.bibliomset | db.bibliorelation | db.biblioset
 
-link.inlines |= db.biblioref
+db.link.inlines |= db.biblioref
 
-relation.attribute = attribute relation { text }
+# ======================================================================
+
+db.relation.attribute = attribute relation { text }
 
 # ======================================================================
 
@@ -34,20 +36,17 @@ relation.attribute = attribute relation { text }
 ]
 div {
 
-   local.biblioentry.attributes = empty
-
-   biblioentry.role.attribute = attribute role { text }
+   db.biblioentry.role.attribute = attribute role { text }
 
-   biblioentry.attlist =
-      biblioentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.biblioentry.attributes
+   db.biblioentry.attlist =
+      db.biblioentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.biblioentry =
       element biblioentry {
-         biblioentry.attlist,
-         bibliographic.elements+
+         db.biblioentry.attlist,
+         db.bibliographic.elements+
       }
 }
 
@@ -59,20 +58,17 @@ div {
 ]
 div {
 
-   local.bibliomixed.attributes = empty
+   db.bibliomixed.role.attribute = attribute role { text }
 
-   bibliomixed.role.attribute = attribute role { text }
-
-   bibliomixed.attlist =
-      bibliomixed.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.bibliomixed.attributes
+   db.bibliomixed.attlist =
+      db.bibliomixed.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.bibliomixed =
       element bibliomixed {
-         bibliomixed.attlist,
-         (text | bibliographic.elements)*
+         db.bibliomixed.attlist,
+         (text | db.bibliographic.elements)*
       }
 }
 
@@ -84,23 +80,20 @@ div {
 ]
 div {
 
-   local.biblioset.attributes = empty
-
-   biblioset.relation.attrib = relation.attribute
+   db.biblioset.relation.attrib = db.relation.attribute
 
-   biblioset.role.attribute = attribute role { text }
+   db.biblioset.role.attribute = attribute role { text }
 
-   biblioset.attlist =
-      biblioset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & biblioset.relation.attrib?
-    & local.biblioset.attributes
+   db.biblioset.attlist =
+      db.biblioset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.biblioset.relation.attrib?
 
    db.biblioset =
       element biblioset {
-         biblioset.attlist,
-         bibliographic.elements+
+         db.biblioset.attlist,
+         db.bibliographic.elements+
       }
 }
 
@@ -112,23 +105,20 @@ div {
 ]
 div {
 
-   local.bibliomset.attributes = empty
-
-   bibliomset.relation.attrib = relation.attribute
+   db.bibliomset.relation.attrib = db.relation.attribute
 
-   bibliomset.role.attribute = attribute role { text }
+   db.bibliomset.role.attribute = attribute role { text }
 
-   bibliomset.attlist =
-      bibliomset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & bibliomset.relation.attrib?
-    & local.bibliomset.attributes
+   db.bibliomset.attlist =
+      db.bibliomset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.bibliomset.relation.attrib?
 
    db.bibliomset =
       element bibliomset {
-         bibliomset.attlist,
-         (docbook.text | bibliographic.elements)*
+         db.bibliomset.attlist,
+         (db._text | db.bibliographic.elements)*
       }
 }
 
@@ -140,20 +130,17 @@ div {
 ]
 div {
 
-   local.bibliomisc.attributes = empty
+   db.bibliomisc.role.attribute = attribute role { text }
 
-   bibliomisc.role.attribute = attribute role { text }
-
-   bibliomisc.attlist =
-      bibliomisc.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.bibliomisc.attributes
+   db.bibliomisc.attlist =
+      db.bibliomisc.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.bibliomisc =
       element bibliomisc {
-         bibliomisc.attlist,
-         docbook.text
+         db.bibliomisc.attlist,
+         db._text
       }
 }
 
@@ -165,27 +152,24 @@ div {
 ]
 div {
 
-   local.bibliography.attributes = empty
-
-   bibliography.status.attrib = status.attribute
+   db.bibliography.status.attrib = db.status.attribute
 
-   bibliography.role.attribute = attribute role { text }
+   db.bibliography.role.attribute = attribute role { text }
 
-   bibliography.attlist =
-      bibliography.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & bibliography.status.attrib?
-    & local.bibliography.attributes
+   db.bibliography.attlist =
+      db.bibliography.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.bibliography.status.attrib?
 
-   bibliography.info = docbook.info
+   db.bibliography.info = db._info
 
    db.bibliography =
       element bibliography {
-         bibliography.attlist,
-         bibliography.info,
-         blocks*,
+         db.bibliography.attlist,
+         db.bibliography.info,
+         db.all.blocks*,
          (db.bibliodiv+ | (db.biblioentry | db.bibliomixed)+)
       }
 }
@@ -198,27 +182,24 @@ div {
 ]
 div {
 
-   local.bibliodiv.attributes = empty
-
-   bibliodiv.status.attrib = status.attribute
+   db.bibliodiv.status.attrib = db.status.attribute
 
-   bibliodiv.role.attribute = attribute role { text }
+   db.bibliodiv.role.attribute = attribute role { text }
 
-   bibliodiv.attlist =
-      bibliodiv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & bibliodiv.status.attrib?
-    & local.bibliodiv.attributes
+   db.bibliodiv.attlist =
+      db.bibliodiv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.bibliodiv.status.attrib?
 
-   bibliodiv.info = docbook.info.titlereq
+   db.bibliodiv.info = db._info.title.req
 
    db.bibliodiv =
       element bibliodiv {
-         bibliodiv.attlist,
-         bibliodiv.info,
-         blocks*,
+         db.bibliodiv.attlist,
+         db.bibliodiv.info,
+         db.all.blocks*,
          (db.biblioentry | db.bibliomixed)+
       }
 }
@@ -231,23 +212,20 @@ div {
 ]
 div {
 
-   local.bibliolist.attributes = empty
+   db.bibliolist.role.attribute = attribute role { text }
 
-   bibliolist.role.attribute = attribute role { text }
+   db.bibliolist.attlist =
+      db.bibliolist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   bibliolist.attlist =
-      bibliolist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.bibliolist.attributes
-
-   bibliolist.info = docbook.info.titleonly
+   db.bibliolist.info = db._info.title.only
 
    db.bibliolist =
       element bibliolist {
-         bibliolist.attlist,
-         bibliolist.info?,
-         blocks*,
+         db.bibliolist.attlist,
+         db.bibliolist.info?,
+         db.all.blocks*,
          (db.biblioentry | db.bibliomixed)+
       }
 }
@@ -260,24 +238,21 @@ div {
 ]
 div {
 
-   local.biblioref.attributes = empty
-
-   biblioref.role.attribute = attribute role { text }
+   db.biblioref.role.attribute = attribute role { text }
 
-   biblioref.attlist =
-      biblioref.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.biblioref.attlist =
+      db.biblioref.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute xrefstyle { text }?
     & attribute endterm { xsd:IDREF }?
     & attribute units { xsd:token }?
     & attribute begin {xsd:token }?
     & attribute end { xsd:token }?
-    & local.biblioref.attributes
 
    db.biblioref =
       element biblioref {
-         biblioref.attlist,
+         db.biblioref.attlist,
          empty
       }
 }
diff --git a/docbook/relaxng/src/callouts.rnc b/docbook/relaxng/src/callouts.rnc
index cec728013..ffcf4146b 100644
--- a/docbook/relaxng/src/callouts.rnc
+++ b/docbook/relaxng/src/callouts.rnc
@@ -17,19 +17,18 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-publishing.inlines |= db.coref
-list.blocks |= db.calloutlist
-verbatim.blocks |= db.programlistingco
-verbatim.blocks |= db.screenco
-computeroutput.inlines |= db.co
-verbatim.inlines |= db.co
-prompt.inlines |= db.co
-systemitem.inlines |= db.co
-computeroutput.inlines |= db.co
-userinput.inlines |= db.co
-replaceable.inlines |= db.co
-
-mediaobject.content |= db.imageobjectco
+db.publishing.inlines |= db.coref
+db.list.blocks |= db.calloutlist
+db.verbatim.blocks |= db.programlistingco | db.screenco
+db.computeroutput.inlines |= db.co
+db.verbatim.inlines |= db.co
+db.prompt.inlines |= db.co
+db.systemitem.inlines |= db.co
+db.computeroutput.inlines |= db.co
+db.userinput.inlines |= db.co
+db.replaceable.inlines |= db.co
+
+db.mediaobject.content |= db.imageobjectco
 
 # ======================================================================
 
@@ -37,7 +36,7 @@ ctrl:other-attribute [ name="area.units.attrib"
                        enum-name="area.units-enum.attribute"
                        other-name="area.units-other.attributes" ]
 
-area.units-enum.attribute =
+db.area.units-enum.attribute =
    attribute units {
       "calspair"
     | "linecolumn"
@@ -45,12 +44,12 @@ area.units-enum.attribute =
     | "linerange"
    }?
 
-area.units-other.attributes =
+db.area.units-other.attributes =
    attribute units { "other" }?,
    attribute otherunits { xsd:NMTOKEN }
 
-area.units.attrib =
-   (area.units-enum.attribute | area.units-other.attributes)
+db.area.units.attribute =
+   (db.area.units-enum.attribute | db.area.units-other.attributes)
 
 # ======================================================================
 
@@ -60,23 +59,20 @@ area.units.attrib =
 ]
 div {
 
-   local.calloutlist.attributes = empty
+   db.calloutlist.role.attribute = attribute role { text }
 
-   calloutlist.role.attribute = attribute role { text }
+   db.calloutlist.attlist =
+      db.calloutlist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   calloutlist.attlist =
-      calloutlist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.calloutlist.attributes
-
-   calloutlist.info = docbook.info.titleonly
+   db.calloutlist.info = db._info.title.only
 
    db.calloutlist =
       element calloutlist {
-         calloutlist.attlist,
-         calloutlist.info,
-         blocks*,
+         db.calloutlist.attlist,
+         db.calloutlist.info,
+         db.all.blocks*,
          db.callout+
       }
 }
@@ -89,20 +85,17 @@ div {
 ]
 div {
 
-   local.callout.attributes = empty
-
-   callout.role.attribute = attribute role { text }
+   db.callout.role.attribute = attribute role { text }
 
-   callout.attlist =
-      callout.role.attribute?
-    & common.attributes
+   db.callout.attlist =
+      db.callout.role.attribute?
+    & db.common.attributes
     & attribute arearefs { xsd:IDREFS }
-    & local.callout.attributes
 
    db.callout =
       element callout {
-         callout.attlist,
-         blocks+
+         db.callout.attlist,
+         db.all.blocks+
       }
 }
 
@@ -114,22 +107,19 @@ div {
 ]
 div {
 
-   local.programlistingco.attributes = empty
-
-   programlistingco.role.attribute = attribute role { text }
+   db.programlistingco.role.attribute = attribute role { text }
 
-   programlistingco.attlist =
-      programlistingco.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.programlistingco.attributes
+   db.programlistingco.attlist =
+      db.programlistingco.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   programlistingco.info = docbook.info.titleforbidden
+   db.programlistingco.info = db._info.title.forbidden
 
    db.programlistingco =
       element programlistingco {
-         programlistingco.attlist,
-         programlistingco.info,
+         db.programlistingco.attlist,
+         db.programlistingco.info,
          db.areaspec,
          db.programlisting,
          db.calloutlist*
@@ -144,20 +134,17 @@ div {
 ]
 div {
 
-   local.areaspec.attributes = empty
+   db.areaspec.role.attribute = attribute role { text }
 
-   areaspec.role.attribute = attribute role { text }
-
-   areaspec.attlist =
-      areaspec.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & area.units.attrib
-    & local.areaspec.attributes
+   db.areaspec.attlist =
+      db.areaspec.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.area.units.attribute
 
    db.areaspec =
       element areaspec {
-         areaspec.attlist,
+         db.areaspec.attlist,
          (db.area | db.areaset)+
       }
 }
@@ -170,22 +157,19 @@ div {
 ]
 div {
 
-   local.area.attributes = empty
-
-   area.role.attribute = attribute role { text }
+   db.area.role.attribute = attribute role { text }
 
-   area.attlist =
-      area.role.attribute?
-    & common.attributes.idreq
-    & area.units.attrib
+   db.area.attlist =
+      db.area.role.attribute?
+    & db.common.idreq.attributes
+    & db.area.units.attribute
     & attribute linkends { xsd:IDREFS }?
     & attribute label { text }?
     & attribute coords { text }
-    & local.area.attributes
 
    db.area =
       element area {
-         area.attlist,
+         db.area.attlist,
          empty
       }
 }
@@ -198,20 +182,17 @@ div {
 ]
 div {
 
-   local.areaset.attributes = empty
+   db.areaset.role.attribute = attribute role { text }
 
-   areaset.role.attribute = attribute role { text }
-
-   areaset.attlist =
-      areaset.role.attribute?
-    & common.attributes.idreq
-    & area.units.attrib
+   db.areaset.attlist =
+      db.areaset.role.attribute?
+    & db.common.idreq.attributes
+    & db.area.units.attribute
     & attribute label { text }?
-    & local.areaset.attributes
 
    db.areaset =
       element areaset {
-         areaset.attlist,
+         db.areaset.attlist,
          db.area+
       }
 }
@@ -224,22 +205,19 @@ div {
 ]
 div {
 
-   local.screenco.attributes = empty
-
-   screenco.role.attribute = attribute role { text }
+   db.screenco.role.attribute = attribute role { text }
 
-   screenco.attlist =
-      screenco.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.screenco.attributes
+   db.screenco.attlist =
+      db.screenco.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   screenco.info = docbook.info.titleforbidden
+   db.screenco.info = db._info.title.forbidden
 
    db.screenco =
       element screenco {
-         screenco.attlist,
-         screenco.info,
+         db.screenco.attlist,
+         db.screenco.info,
          db.areaspec,
          db.screen,
          db.calloutlist*
@@ -254,22 +232,19 @@ div {
 ]
 div {
 
-   local.imageobjectco.attributes = empty
-
-   imageobjectco.role.attribute = attribute role { text }
+   db.imageobjectco.role.attribute = attribute role { text }
 
-   imageobjectco.attlist =
-      imageobjectco.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.imageobjectco.attributes
+   db.imageobjectco.attlist =
+      db.imageobjectco.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   imageobjectco.info = docbook.info.titleforbidden
+   db.imageobjectco.info = db._info.title.forbidden
 
    db.imageobjectco =
       element imageobjectco {
-         imageobjectco.attlist,
-         imageobjectco.info,
+         db.imageobjectco.attlist,
+         db.imageobjectco.info,
          db.areaspec,
          db.imageobject,
          db.calloutlist*
@@ -284,20 +259,17 @@ div {
 ]
 div {
 
-   local.co.attributes = empty
+   db.co.role.attribute = attribute role { text }
 
-   co.role.attribute = attribute role { text }
-
-   co.attlist =
-      co.role.attribute?
-    & common.attributes.idreq
+   db.co.attlist =
+      db.co.role.attribute?
+    & db.common.idreq.attributes
     & attribute linkends { xsd:IDREFS }?
     & attribute label { text }?
-    & local.co.attributes
 
    db.co =
       element co {
-         co.attlist,
+         db.co.attlist,
          empty
       }
 }
@@ -310,20 +282,17 @@ div {
 ]
 div {
 
-   local.coref.attributes = empty
-
-   coref.role.attribute = attribute role { text }
+   db.coref.role.attribute = attribute role { text }
 
-   coref.attlist =
-      coref.role.attribute?
-    & common.attributes
-    & attribute linkend { xsd:IDREF }
+   db.coref.attlist =
+      db.coref.role.attribute?
+    & db.common.attributes
+    & db.linkend.attribute
     & attribute label { text }?
-    & local.coref.attributes
 
    db.coref =
       element coref {
-         coref.attlist,
+         db.coref.attlist,
          empty
       }
 }
diff --git a/docbook/relaxng/src/calstbl.rnc b/docbook/relaxng/src/calstbl.rnc
index 7308fd719..c417721f0 100644
--- a/docbook/relaxng/src/calstbl.rnc
+++ b/docbook/relaxng/src/calstbl.rnc
@@ -17,18 +17,18 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-table.choice |= cals.table
-informaltable.choice |= cals.informaltable
-
-char.attribute = attribute char { text }
-charoff.attribute = attribute charoff { text }
-colsep.attribute = attribute colsep { text }
-rowsep.attribute = attribute rowsep { text }
-align.attribute =
+db.table.choice |= db.cals.table
+db.informaltable.choice |= db.cals.informaltable
+
+db.char.attribute = attribute char { text }
+db.charoff.attribute = attribute charoff { text }
+db.colsep.attribute = attribute colsep { text }
+db.rowsep.attribute = attribute rowsep { text }
+db.align.attribute =
   attribute align { "center" | "char" | "justify" | "left" | "right" }
-valign.attribute = attribute valign { "bottom" | "middle" | "top" }
-spanname.attribute = attribute spanname { text }
-colname.attribute = attribute colname { text }
+db.valign.attribute = attribute valign { "bottom" | "middle" | "top" }
+db.spanname.attribute = attribute spanname { text }
+db.colname.attribute = attribute colname { text }
 
 # ======================================================================
 
@@ -38,31 +38,28 @@ colname.attribute = attribute colname { text }
 ]
 div {
 
-   local.tgroup.attributes = empty
+   db.tgroup.role.attribute = attribute role { text }
 
-   tgroup.role.attribute = attribute role { text }
-
-   tgroup.attlist =
-      tgroup.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & char.attribute?
-    & charoff.attribute?
+   db.tgroup.attlist =
+      db.tgroup.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.char.attribute?
+    & db.charoff.attribute?
     & attribute tgroupstyle { text }?
     & attribute cols { xsd:integer }
-    & colsep.attribute?
-    & rowsep.attribute?
-    & align.attribute?
-    & local.tgroup.attributes
+    & db.colsep.attribute?
+    & db.rowsep.attribute?
+    & db.align.attribute?
 
    db.tgroup =
       element tgroup {
-         tgroup.attlist,
+         db.tgroup.attlist,
          db.colspec*,
          db.spanspec*,
-         cals.thead?,
-         cals.tfoot?,
-         cals.tbody
+         db.cals.thead?,
+         db.cals.tfoot?,
+         db.cals.tbody
       }
 }
 
@@ -74,27 +71,24 @@ div {
 ]
 div {
 
-   local.colspec.attributes = empty
-
-   colspec.role.attribute = attribute role { text }
+   db.colspec.role.attribute = attribute role { text }
 
-   colspec.attlist =
-      colspec.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.colspec.attlist =
+      db.colspec.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute colnum { xsd:integer }?
-    & char.attribute?
-    & colsep.attribute?
+    & db.char.attribute?
+    & db.colsep.attribute?
     & attribute colwidth { text }?
-    & charoff.attribute?
-    & colname.attribute?
-    & rowsep.attribute?
-    & align.attribute?
-    & local.colspec.attributes
+    & db.charoff.attribute?
+    & db.colname.attribute?
+    & db.rowsep.attribute?
+    & db.align.attribute?
 
    db.colspec =
       element colspec {
-         colspec.attlist,
+         db.colspec.attlist,
          empty
       }
 }
@@ -107,27 +101,24 @@ div {
 ]
 div {
 
-   local.spanspec.attributes = empty
-
-   spanspec.role.attribute = attribute role { text }
+   db.spanspec.role.attribute = attribute role { text }
 
-   spanspec.attlist =
-      spanspec.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.spanspec.attlist =
+      db.spanspec.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute namest { text }
     & attribute nameend { text }
-    & spanname.attribute
-    & char.attribute?
-    & colsep.attribute?
-    & charoff.attribute?
-    & rowsep.attribute?
-    & align.attribute?
-    & local.spanspec.attributes
+    & db.spanname.attribute
+    & db.char.attribute?
+    & db.colsep.attribute?
+    & db.charoff.attribute?
+    & db.rowsep.attribute?
+    & db.align.attribute?
 
    db.spanspec =
       element spanspec {
-         spanspec.attlist,
+         db.spanspec.attlist,
          empty
       }
 }
@@ -140,20 +131,17 @@ div {
 ]
 div {
 
-   local.cals.thead.attributes = empty
+   db.cals.thead.role.attribute = attribute role { text }
 
-   cals.thead.role.attribute = attribute role { text }
+   db.cals.thead.attlist =
+      db.cals.thead.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.valign.attribute?
 
-   cals.thead.attlist =
-      cals.thead.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & valign.attribute?
-    & local.cals.thead.attributes
-
-   cals.thead =
+   db.cals.thead =
       element thead {
-         cals.thead.attlist,
+         db.cals.thead.attlist,
          db.colspec*,
          db.row+
       }
@@ -167,20 +155,17 @@ div {
 ]
 div {
 
-   local.cals.tfoot.attributes = empty
-
-   cals.tfoot.role.attribute = attribute role { text }
+   db.cals.tfoot.role.attribute = attribute role { text }
 
-   cals.tfoot.attlist =
-      cals.tfoot.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & valign.attribute?
-    & local.cals.tfoot.attributes
+   db.cals.tfoot.attlist =
+      db.cals.tfoot.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.valign.attribute?
 
-   cals.tfoot =
+   db.cals.tfoot =
       element tfoot {
-         cals.tfoot.attlist,
+         db.cals.tfoot.attlist,
          db.colspec*,
          db.row+
       }
@@ -194,20 +179,17 @@ div {
 ]
 div {
 
-   local.cals.tbody.attributes = empty
-
-   cals.tbody.role.attribute = attribute role { text }
+   db.cals.tbody.role.attribute = attribute role { text }
 
-   cals.tbody.attlist =
-      cals.tbody.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & valign.attribute?
-    & local.cals.tbody.attributes
+   db.cals.tbody.attlist =
+      db.cals.tbody.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.valign.attribute?
 
-   cals.tbody =
+   db.cals.tbody =
       element tbody {
-         cals.tbody.attlist,
+         db.cals.tbody.attlist,
          db.row+
       }
 }
@@ -220,20 +202,17 @@ div {
 ]
 div {
 
-   local.row.attributes = empty
+   db.row.role.attribute = attribute role { text }
 
-   row.role.attribute = attribute role { text }
-
-   row.attlist =
-      row.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & rowsep.attribute?
-    & valign.attribute?
-    & local.row.attributes
+   db.row.attlist =
+      db.row.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.rowsep.attribute?
+    & db.valign.attribute?
 
    db.row = element row {
-      row.attlist,
+      db.row.attlist,
       (db.entry | db.entrytbl)+
    }
 }
@@ -246,31 +225,28 @@ div {
 ]
 div {
 
-   local.entry.attributes = empty
-
-   entry.role.attribute = attribute role { text }
+   db.entry.role.attribute = attribute role { text }
 
-   entry.attlist =
-      entry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.entry.attlist =
+      db.entry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute nameend { text }?
-    & valign.attribute?
-    & char.attribute?
-    & colsep.attribute?
-    & charoff.attribute?
+    & db.valign.attribute?
+    & db.char.attribute?
+    & db.colsep.attribute?
+    & db.charoff.attribute?
     & attribute morerows { xsd:integer }?
     & attribute spanname { text }?
     & attribute namest { text }?
-    & colname.attribute?
-    & rowsep.attribute?
+    & db.colname.attribute?
+    & db.rowsep.attribute?
     & attribute rotate { text }?
-    & align.attribute?
-    & local.entry.attributes
+    & db.align.attribute?
 
    db.entry = element entry {
-      entry.attlist,
-      (inlines* | blocks*)
+      db.entry.attlist,
+      (db.all.inlines* | db.all.blocks*)
    }
 }
 
@@ -282,34 +258,31 @@ div {
 ]
 div {
 
-   local.entrytbl.attributes = empty
-
-   entrytbl.role.attribute = attribute role { text }
+   db.entrytbl.role.attribute = attribute role { text }
 
-   entrytbl.attlist =
-      entrytbl.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.entrytbl.attlist =
+      db.entrytbl.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute nameend { text }?
-    & char.attribute?
-    & charoff.attribute?
+    & db.char.attribute?
+    & db.charoff.attribute?
     & attribute spanname { text }?
     & attribute namest { text }?
     & attribute tgroupstyle { text }?
     & attribute cols { xsd:integer }?
-    & colsep.attribute?
-    & rowsep.attribute?
-    & colname.attribute?
-    & align.attribute?
-    & local.entrytbl.attributes
+    & db.colsep.attribute?
+    & db.rowsep.attribute?
+    & db.colname.attribute?
+    & db.align.attribute?
 
    db.entrytbl =
       element entrytbl {
-         entrytbl.attlist,
+         db.entrytbl.attlist,
          db.colspec*,
          db.spanspec*,
-         cals.thead?,
-         cals.tbody
+         db.cals.thead?,
+         db.cals.tbody
       }
 }
 
@@ -321,28 +294,25 @@ div {
 ]
 div {
 
-   local.cals.table.attributes = empty
+   db.cals.table.role.attribute = attribute role { text }
 
-   cals.table.role.attribute = attribute role { text }
-
-   cals.table.attlist =
-      cals.table.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.cals.table.attlist =
+      db.cals.table.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute tabstyle { text }?
     & attribute orient { "land" | "port" }?
-    & colsep.attribute?
-    & rowsep.attribute?
+    & db.colsep.attribute?
+    & db.rowsep.attribute?
     & attribute frame { "all" | "bottom" | "none" | "sides" | "top" | "topbot" }?
     & attribute pgwide { "0" | "1" }?
-    & local.cals.table.attributes
 
-   cals.table.info = docbook.info.titleonlyreq
+   db.cals.table.info = db._info.title.onlyreq
 
-   cals.table = element table {
-      cals.table.attlist,
-      cals.table.info,
-      indexing.inlines*,
+   db.cals.table = element table {
+      db.cals.table.attlist,
+      db.cals.table.info,
+      db.indexing.inlines*,
       db.textobject*,
       (db.mediaobject+|db.tgroup+)
    }
@@ -356,29 +326,26 @@ div {
 ]
 div {
 
-   local.cals.informaltable.attributes = empty
-
-   cals.informaltable.role.attribute = attribute role { text }
+   db.cals.informaltable.role.attribute = attribute role { text }
 
-   cals.informaltable.attlist =
-      cals.informaltable.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.cals.informaltable.attlist =
+      db.cals.informaltable.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute tabstyle { text }?
     & attribute orient { "land" | "port" }?
-    & colsep.attribute?
-    & rowsep.attribute?
+    & db.colsep.attribute?
+    & db.rowsep.attribute?
     & attribute frame { "all" | "bottom" | "none" | "sides" | "top" | "topbot" }?
     & attribute pgwide { "0" | "1" }?
-    & local.cals.informaltable.attributes
 
-   cals.informaltable.info = docbook.info.titleforbidden
+   db.cals.informaltable.info = db._info.title.forbidden
 
-   cals.informaltable =
+   db.cals.informaltable =
       element informaltable {
-         cals.informaltable.attlist,
-         cals.informaltable.info,
-         indexing.inlines*,
+         db.cals.informaltable.attlist,
+         db.cals.informaltable.info,
+         db.indexing.inlines*,
          db.textobject*,
          (db.mediaobject+|db.tgroup+)
       }
diff --git a/docbook/relaxng/src/docbook-dtd.rnc b/docbook/relaxng/src/docbook-dtd.rnc
index 593dd4551..dc9a0ccd8 100644
--- a/docbook/relaxng/src/docbook-dtd.rnc
+++ b/docbook/relaxng/src/docbook-dtd.rnc
@@ -11,6 +11,8 @@
 #
 # ======================================================================
 
+# What is this file for!?
+
 namespace ctrl = "http://nwalsh.com/xmlns/schema-control/"
 namespace rng  = "http://relaxng.org/ns/structure/1.0"
 namespace s = "http://www.ascc.net/xml/schematron"
@@ -19,19 +21,17 @@ default namespace = "http://docbook.org/docbook-ng"
 
 start = db.set
         | db.book
-	| divisions
-	| components
-	| navigation.components
+	| db.divisions
+	| db.components
+	| db.navigation.components
 	| db.section
 	| db.para
 
 include "hier.rnc"
 include "refentry.rnc"
 include "pool.rnc" {
-   table.info = docbook.info.titleonlyreq
-
    db.table = element table {
-      common.attributes,
+      db.common.attributes,
       attribute rowsep { text }?,
       attribute ondblclick { text }?,
       attribute onkeydown { text }?,
@@ -61,18 +61,20 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute border { text }?,
       attribute cellpadding { text }?,
       attribute tocentry { text }?,
-      ((table.info, db.indexterm*, db.textobject*,
+      ((db.table.info, db.indexterm*, db.textobject*,
          (db.mediaobject+|db.tgroup+))
        |(db.caption, (db.col*|db.colgroup*),
           db.thead?, db.tfoot?, (db.tbody+|db.tr+)))
    }
+}
+
+   db.table.info = db._info.title.onlyreq
 
    db.caption = element caption {
-      common.attributes,
+      db.common.attributes,
       attribute ondblclick { text }?,
       attribute onkeydown { text }?,
       attribute onkeyup { text }?,
@@ -82,17 +84,16 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute onkeypress { text }?,
       attribute onmousedown { text }?,
       attribute onclick { text }?,
       attribute title { text }?,
       attribute class { text }?,
-      (inlines* | blocks*)
+      (db.all.inlines* | db.all.blocks*)
    }
 
    db.tgroup = element tgroup {
-      common.attributes,
+      db.common.attributes,
       attribute rowsep { text }?,
       attribute ondblclick { text }?,
       attribute cols { text },
@@ -112,13 +113,12 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute style { text }?,
       attribute onmousemove { text }?,
-      attribute xml:lang { text }?,
       attribute char { text }?,
       (db.colspec*, db.spanspec*, db.thead?, db.tfoot?, db.tbody)
    }
 
    db.thead = element thead {
-      common.attributes,
+      db.common.attributes,
       attribute ondblclick { text }?,
       attribute onkeydown { text }?,
       attribute onkeyup { text }?,
@@ -128,7 +128,6 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute onkeypress { text }?,
       attribute onmousedown { text }?,
       attribute onclick { text }?,
@@ -138,7 +137,7 @@ include "pool.rnc" {
    }
 
    db.tfoot = element tfoot {
-      common.attributes,
+      db.common.attributes,
       attribute ondblclick { text }?,
       attribute onkeydown { text }?,
       attribute onkeyup { text }?,
@@ -148,7 +147,6 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute onkeypress { text }?,
       attribute onmousedown { text }?,
       attribute onclick { text }?,
@@ -158,7 +156,7 @@ include "pool.rnc" {
    }
 
    db.tbody = element tbody {
-      common.attributes,
+      db.common.attributes,
       attribute ondblclick { text }?,
       attribute onkeydown { text }?,
       attribute onkeyup { text }?,
@@ -168,7 +166,6 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute onkeypress { text }?,
       attribute onmousedown { text }?,
       attribute onclick { text }?,
@@ -305,7 +302,7 @@ include "pool.rnc" {
       attribute onclick { text }?,
       attribute title { text }?,
       attribute class { text }?,
-      (inlines* | blocks*)
+      (db.all.inlines* | db.all.blocks*)
    }
 
    db.td = element td {
@@ -338,11 +335,11 @@ include "pool.rnc" {
       attribute onclick { text }?,
       attribute title { text }?,
       attribute class { text }?,
-      (inlines* | blocks*)
+      (db.all.inlines* | db.all.blocks*)
    }
 
    db.row = element row {
-      common.attributes,
+      db.common.attributes,
       attribute rowsep { text }?,
       attribute ondblclick { text }?,
       attribute onkeydown { text }?,
@@ -353,7 +350,6 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute onkeypress { text }?,
       attribute onmousedown { text }?,
       attribute onclick { text }?,
@@ -363,7 +359,7 @@ include "pool.rnc" {
    }
 
    db.entry = element entry {
-      common.attributes,
+      db.common.attributes,
       attribute rowsep { text }?,
       attribute spanname { text }?,
       attribute ondblclick { text }?,
@@ -387,10 +383,9 @@ include "pool.rnc" {
       attribute onmouseout { text }?,
       attribute onmousemove { text }?,
       attribute style { text }?,
-      attribute xml:lang { text }?,
       attribute char { text }?,
       attribute morerows { text }?,
-      (inlines* | blocks*)
+      (db.all.inlines* | db.all.blocks*)
    }
 
    db.entrytbl = element entrytbl {
@@ -421,7 +416,7 @@ include "pool.rnc" {
       attribute char { text }?,
       (db.colspec*, db.spanspec*, db.thead?, db.tbody)
    }
-}
+
 include "glossary.rnc"
 include "bibliography.rnc"
 include "index.rnc"
diff --git a/docbook/relaxng/src/docbook.rnc b/docbook/relaxng/src/docbook.rnc
index 64c33ba50..404774802 100644
--- a/docbook/relaxng/src/docbook.rnc
+++ b/docbook/relaxng/src/docbook.rnc
@@ -19,9 +19,9 @@ default namespace = "http://docbook.org/docbook-ng"
 
 start = db.set
         | db.book
-	| divisions
-	| components
-	| navigation.components
+	| db.divisions
+	| db.components
+	| db.navigation.components
 	| db.section
 	| db.para
 
@@ -41,4 +41,4 @@ include "msgset.rnc"
 include "qandaset.rnc"
 include "mathml.rnc"
 include "svg.rnc"
-#include "htmlform.rnc"
+include "htmlform.rnc"
diff --git a/docbook/relaxng/src/ebnf.rnc b/docbook/relaxng/src/ebnf.rnc
index 2fca4b4ba..98a904f49 100644
--- a/docbook/relaxng/src/ebnf.rnc
+++ b/docbook/relaxng/src/ebnf.rnc
@@ -16,8 +16,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-technical.inlines |= db.nonterminal
-technical.blocks |= db.productionset | db.constraintdef
+db.technical.inlines |= db.nonterminal
+db.technical.blocks |= db.productionset | db.constraintdef
 
 # ======================================================================
 
@@ -27,22 +27,19 @@ technical.blocks |= db.productionset | db.constraintdef
 ]
 div {
 
-   local.productionset.attributes = empty
+   db.productionset.role.attribute = attribute role { text }
 
-   productionset.role.attribute = attribute role { text }
+   db.productionset.attlist =
+      db.productionset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   productionset.attlist =
-      productionset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.productionset.attributes
-
-   productionset.info = docbook.info.titleonly
+   db.productionset.info = db._info.title.only
 
    db.productionset =
       element productionset {
-         productionset.attlist,
-         productionset.info,
+         db.productionset.attlist,
+         db.productionset.info,
          (db.production|db.productionrecap)+
       }
 }
@@ -55,19 +52,16 @@ div {
 ]
 div {
 
-   local.production.attributes = empty
-
-   production.role.attribute = attribute role { text }
+   db.production.role.attribute = attribute role { text }
 
-   production.attlist =
-      production.role.attribute?
-    & common.attributes.idreq
-    & common.linking.attributes
-    & local.production.attributes
+   db.production.attlist =
+      db.production.role.attribute?
+    & db.common.idreq.attributes
+    & db.common.linking.attributes
 
    db.production =
       element production {
-         production.attlist,
+         db.production.attlist,
          db.lhs,
          db.rhs,
          db.constraint*
@@ -82,19 +76,16 @@ div {
 ]
 div {
 
-   local.lhs.attributes = empty
+   db.lhs.role.attribute = attribute role { text }
 
-   lhs.role.attribute = attribute role { text }
-
-   lhs.attlist =
-      lhs.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.lhs.attributes
+   db.lhs.attlist =
+      db.lhs.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.lhs =
       element lhs {
-         lhs.attlist,
+         db.lhs.attlist,
          text
       }
 }
@@ -107,19 +98,16 @@ div {
 ]
 div {
 
-   local.rhs.attributes = empty
-
-   rhs.role.attribute = attribute role { text }
+   db.rhs.role.attribute = attribute role { text }
 
-   rhs.attlist =
-      rhs.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.rhs.attributes
+   db.rhs.attlist =
+      db.rhs.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.rhs =
       element rhs {
-         rhs.attlist,
+         db.rhs.attlist,
          (text|db.nonterminal|db.lineannotation|db.sbr)*
       }
 }
@@ -132,20 +120,17 @@ div {
 ]
 div {
 
-   local.nonterminal.attributes = empty
+   db.nonterminal.role.attribute = attribute role { text }
 
-   nonterminal.role.attribute = attribute role { text }
-
-   nonterminal.attlist =
-      nonterminal.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.nonterminal.attlist =
+      db.nonterminal.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute def { text }
-    & local.nonterminal.attributes
 
    db.nonterminal =
       element nonterminal {
-         nonterminal.attlist,
+         db.nonterminal.attlist,
          text
       }
 }
@@ -158,19 +143,16 @@ div {
 ]
 div {
 
-   local.constraint.attributes = empty
-
-   constraint.role.attribute = attribute role { text }
+   db.constraint.role.attribute = attribute role { text }
 
-   constraint.attlist =
-      constraint.role.attribute?
-    & common.attributes
-    & common.linking.attributes.req
-    & local.constraint.attributes
+   db.constraint.attlist =
+      db.constraint.role.attribute?
+    & db.common.attributes
+    & db.common.req.linking.attributes
 
    db.constraint =
       element constraint {
-         constraint.attlist,
+         db.constraint.attlist,
          empty
       }
 }
@@ -183,19 +165,16 @@ div {
 ]
 div {
 
-   local.productionrecap.attributes = empty
+   db.productionrecap.role.attribute = attribute role { text }
 
-   productionrecap.role.attribute = attribute role { text }
-
-   productionrecap.attlist =
-      productionrecap.role.attribute?
-    & common.attributes
-    & common.linking.attributes.req
-    & local.productionrecap.attributes
+   db.productionrecap.attlist =
+      db.productionrecap.role.attribute?
+    & db.common.attributes
+    & db.common.req.linking.attributes
 
    db.productionrecap =
       element productionrecap {
-         productionrecap.attlist,
+         db.productionrecap.attlist,
          empty
       }
 }
@@ -208,23 +187,20 @@ div {
 ]
 div {
 
-   local.constraintdef.attributes = empty
-
-   constraintdef.role.attribute = attribute role { text }
+   db.constraintdef.role.attribute = attribute role { text }
 
-   constraintdef.attlist =
-      constraintdef.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.constraintdef.attributes
+   db.constraintdef.attlist =
+      db.constraintdef.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   constraintdef.info = docbook.info.titleonly
+   db.constraintdef.info = db._info.title.only
 
    db.constraintdef =
       element constraintdef {
-         constraintdef.attlist,
-         constraintdef.info,
-         blocks+
+         db.constraintdef.attlist,
+         db.constraintdef.info,
+         db.all.blocks+
       }
 }
 
diff --git a/docbook/relaxng/src/glossary.rnc b/docbook/relaxng/src/glossary.rnc
index 776bc543d..e3232115e 100644
--- a/docbook/relaxng/src/glossary.rnc
+++ b/docbook/relaxng/src/glossary.rnc
@@ -15,15 +15,17 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-general.inlines |= glossary.inlines
-list.blocks |= db.glosslist
-navigation.components |= db.glossary
+db.general.inlines |= db.glossary.inlines
+db.list.blocks |= db.glosslist
+db.navigation.components |= db.glossary
 
-glossary.inlines =
+db.glossary.inlines =
    db.firstterm
  | db.glossterm
 
-baseform.attribute = attribute baseform { text }?
+# ======================================================================
+
+db.baseform.attribute = attribute baseform { text }?
 
 # ======================================================================
 
@@ -33,23 +35,20 @@ baseform.attribute = attribute baseform { text }?
 ]
 div {
 
-   local.glosslist.attributes = empty
-
-   glosslist.role.attribute = attribute role { text }
+   db.glosslist.role.attribute = attribute role { text }
 
-   glosslist.attlist =
-      glosslist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.glosslist.attributes
+   db.glosslist.attlist =
+      db.glosslist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   glosslist.info = docbook.info.titleonly
+   db.glosslist.info = db._info.title.only
 
    db.glosslist =
       element glosslist {
-         glosslist.attlist,
-         glosslist.info?,
-         blocks*,
+         db.glosslist.attlist,
+         db.glosslist.info?,
+         db.all.blocks*,
          db.glossentry+
       }
 }
@@ -62,20 +61,17 @@ div {
 ]
 div {
 
-   local.glossentry.attributes = empty
+   db.glossentry.role.attribute = attribute role { text }
 
-   glossentry.role.attribute = attribute role { text }
-
-   glossentry.attlist =
-      glossentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.glossentry.attlist =
+      db.glossentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute sortas { text }?
-    & local.glossentry.attributes
 
    db.glossentry =
       element glossentry {
-         glossentry.attlist,
+         db.glossentry.attlist,
          db.glossterm,
          db.acronym?,
          db.abbrev?,
@@ -92,21 +88,18 @@ div {
 ]
 div {
 
-   local.glossdef.attributes = empty
-
-   glossdef.role.attribute = attribute role { text }
+   db.glossdef.role.attribute = attribute role { text }
 
-   glossdef.attlist =
-      glossdef.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.glossdef.attlist =
+      db.glossdef.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute subject { text }?
-    & local.glossdef.attributes
 
    db.glossdef =
       element glossdef {
-         glossdef.attlist,
-         blocks+,
+         db.glossdef.attlist,
+         db.all.blocks+,
          db.glossseealso*
       }
 }
@@ -119,16 +112,13 @@ div {
 ]
 div {
 
-   local.glosssee.attributes = empty
-
-   glosssee.role.attribute = attribute role { text }
+   db.glosssee.role.attribute = attribute role { text }
 
-   glosssee.attlist =
-      glosssee.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.glosssee.attlist =
+      db.glosssee.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute otherterm { xsd:IDREF }?
-    & local.glosssee.attributes
 
    db.glosssee =
       [
@@ -141,8 +131,8 @@ div {
          ]
       ]
       element glosssee {
-         glosssee.attlist,
-         inlines*
+         db.glosssee.attlist,
+         db.all.inlines*
       }
 }
 
@@ -154,16 +144,13 @@ div {
 ]
 div {
 
-   local.glossseealso.attributes = empty
+   db.glossseealso.role.attribute = attribute role { text }
 
-   glossseealso.role.attribute = attribute role { text }
-
-   glossseealso.attlist =
-      glossseealso.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.glossseealso.attlist =
+      db.glossseealso.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute otherterm { xsd:IDREF }?
-    & local.glossseealso.attributes
 
    db.glossseealso =
       [
@@ -176,8 +163,8 @@ div {
          ]
       ]
       element glossseealso {
-         glossseealso.attlist,
-         inlines*
+         db.glossseealso.attlist,
+         db.all.inlines*
       }
 }
 
@@ -189,16 +176,13 @@ div {
 ]
 div {
 
-   local.firstterm.attributes = empty
-
-   firstterm.role.attribute = attribute role { text }
+   db.firstterm.role.attribute = attribute role { text }
 
-   firstterm.attlist =
-      firstterm.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & baseform.attribute
-    & local.firstterm.attributes
+   db.firstterm.attlist =
+      db.firstterm.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.baseform.attribute
 
    db.firstterm =
       [
@@ -211,8 +195,8 @@ div {
          ]
       ]
       element firstterm {
-         firstterm.attlist,
-         inlines*
+         db.firstterm.attlist,
+         db.all.inlines*
       }
 }
 
@@ -224,16 +208,13 @@ div {
 ]
 div {
 
-   local.glossterm.attributes = empty
-
-   glossterm.role.attribute = attribute role { text }
+   db.glossterm.role.attribute = attribute role { text }
 
-   glossterm.attlist =
-      glossterm.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & baseform.attribute
-    & local.glossterm.attributes
+   db.glossterm.attlist =
+      db.glossterm.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.baseform.attribute
 
    db.glossterm =
       [
@@ -246,8 +227,8 @@ div {
          ]
       ]
       element glossterm {
-         glossterm.attlist,
-         inlines*
+         db.glossterm.attlist,
+         db.all.inlines*
       }
 }
 
@@ -259,27 +240,24 @@ div {
 ]
 div {
 
-   local.glossary.attributes = empty
+   db.glossary.status.attribute = db.status.attribute
 
-   glossary.status.attribute = status.attribute
+   db.glossary.role.attribute = attribute role { text }
 
-   glossary.role.attribute = attribute role { text }
+   db.glossary.attlist =
+      db.glossary.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.glossary.status.attribute?
 
-   glossary.attlist =
-      glossary.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & glossary.status.attribute?
-    & local.glossary.attributes
-
-   glossary.info = docbook.info
+   db.glossary.info = db._info
 
    db.glossary =
       element glossary {
-         glossary.attlist,
-         glossary.info,
-         blocks*,
+         db.glossary.attlist,
+         db.glossary.info,
+         db.all.blocks*,
          (db.glossdiv+ | db.glossentry+),
          db.bibliography?
       }
@@ -293,27 +271,24 @@ div {
 ]
 div {
 
-   local.glossdiv.attributes = empty
-
-   glossdiv.status.attribute = status.attribute
+   db.glossdiv.status.attribute = db.status.attribute
 
-   glossdiv.role.attribute = attribute role { text }
+   db.glossdiv.role.attribute = attribute role { text }
 
-   glossdiv.attlist =
-      glossdiv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & glossdiv.status.attribute?
-    & local.glossdiv.attributes
+   db.glossdiv.attlist =
+      db.glossdiv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.glossdiv.status.attribute?
 
-   glossdiv.info = docbook.info.titlereq
+   db.glossdiv.info = db._info.title.req
 
    db.glossdiv =
       element glossdiv {
-         glossdiv.attlist,
-         glossdiv.info,
-         blocks*,
+         db.glossdiv.attlist,
+         db.glossdiv.info,
+         db.all.blocks*,
          db.glossentry+
       }
 }
diff --git a/docbook/relaxng/src/hier.rnc b/docbook/relaxng/src/hier.rnc
index 9c2c870c3..a89d95f17 100644
--- a/docbook/relaxng/src/hier.rnc
+++ b/docbook/relaxng/src/hier.rnc
@@ -16,14 +16,23 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-status.attribute = attribute status { text }
-label.attribute = attribute label { text }
+db.status.attribute = attribute status { text }
+db.label.attribute = attribute label { text }
 
 # ======================================================================
 
-divisions = db.part
+db.optional.sections = db.section* | db.simplesect*
 
-components =
+db.required.sections = db.section+ | db.simplesect+
+
+db.blocks.or.sections =
+  (db.all.blocks+, db.optional.sections) | db.required.sections
+
+# ======================================================================
+
+db.divisions = db.part
+
+db.components =
    db.dedication
  | db.preface
  | db.chapter
@@ -31,15 +40,15 @@ components =
  | db.article
  | db.colophon
 
-navigation.components = notAllowed
+db.navigation.components = notAllowed
 
-component.contentmodel =
-  navigation.components*, blocks.or.sections, navigation.components*
+db.component.contentmodel =
+  db.navigation.components*, db.blocks.or.sections, db.navigation.components*
 
 # ======================================================================
 
-setindex.components = notAllowed
-toc.components = notAllowed
+db.setindex.components = notAllowed
+db.toc.components = notAllowed
 
 # ======================================================================
 
@@ -49,29 +58,26 @@ toc.components = notAllowed
 ]
 div {
 
-   local.set.attributes = empty
-
-   set.status.attribute = status.attribute
+   db.set.status.attribute = db.status.attribute
 
-   set.role.attribute = attribute role { text }
+   db.set.role.attribute = attribute role { text }
 
-   set.attlist =
-      set.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & set.status.attribute?
-    & local.set.attributes
+   db.set.attlist =
+      db.set.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.set.status.attribute?
 
-   set.info = docbook.info.titlereq
+   db.set.info = db._info.title.req
 
    db.set =
       element set {
-         set.attlist,
-         set.info,
-         toc.components?,
+         db.set.attlist,
+         db.set.info,
+         db.toc.components?,
          (db.set|db.book)+,
-         setindex.components?
+         db.setindex.components?
       }
 }
 
@@ -83,27 +89,24 @@ div {
 ]
 div {
 
-   local.book.attributes = empty
+   db.book.status.attribute = db.status.attribute
 
-   book.status.attribute = status.attribute
+   db.book.role.attribute = attribute role { text }
 
-   book.role.attribute = attribute role { text }
+   db.book.attlist =
+      db.book.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.book.status.attribute?
 
-   book.attlist =
-      book.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & book.status.attribute?
-    & local.book.attributes
-
-   book.info = docbook.info.titlereq
+   db.book.info = db._info.title.req
 
    db.book =
       element book {
-         book.attlist,
-         book.info,
-         (navigation.components | components | divisions)+
+         db.book.attlist,
+         db.book.info,
+         (db.navigation.components | db.components | db.divisions)+
       }
 }
 
@@ -115,27 +118,24 @@ div {
 ]
 div {
 
-   local.dedication.attributes = empty
-
-   dedication.status.attribute = status.attribute
+   db.dedication.status.attribute = db.status.attribute
 
-   dedication.role.attribute = attribute role { text }
+   db.dedication.role.attribute = attribute role { text }
 
-   dedication.attlist =
-      dedication.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & dedication.status.attribute?
-    & local.dedication.attributes
+   db.dedication.attlist =
+      db.dedication.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.dedication.status.attribute?
 
-   dedication.info = docbook.info
+   db.dedication.info = db._info
 
    db.dedication =
       element dedication {
-         dedication.attlist,
-         dedication.info,
-         blocks+
+         db.dedication.attlist,
+         db.dedication.info,
+         db.all.blocks+
       }
 }
 
@@ -147,27 +147,24 @@ div {
 ]
 div {
 
-   local.colophon.attributes = empty
-
-   colophon.status.attribute = status.attribute
+   db.colophon.status.attribute = db.status.attribute
 
-   colophon.role.attribute = attribute role { text }
+   db.colophon.role.attribute = attribute role { text }
 
-   colophon.attlist =
-      colophon.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & colophon.status.attribute?
-    & local.colophon.attributes
+   db.colophon.attlist =
+      db.colophon.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.colophon.status.attribute?
 
-   colophon.info = docbook.info
+   db.colophon.info = db._info
 
    db.colophon =
       element colophon {
-         colophon.attlist,
-         colophon.info,
-         blocks+
+         db.colophon.attlist,
+         db.colophon.info,
+         db.all.blocks+
       }
 }
 
@@ -179,27 +176,24 @@ div {
 ]
 div {
 
-   local.appendix.attributes = empty
+   db.appendix.status.attribute = db.status.attribute
 
-   appendix.status.attribute = status.attribute
+   db.appendix.role.attribute = attribute role { text }
 
-   appendix.role.attribute = attribute role { text }
+   db.appendix.attlist =
+      db.appendix.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.appendix.status.attribute?
 
-   appendix.attlist =
-      appendix.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & appendix.status.attribute?
-    & local.appendix.attributes
-
-   appendix.info = docbook.info.titlereq
+   db.appendix.info = db._info.title.req
 
    db.appendix =
       element appendix {
-         appendix.attlist,
-         appendix.info,
-         component.contentmodel
+         db.appendix.attlist,
+         db.appendix.info,
+         db.component.contentmodel
       }
 }
 
@@ -211,33 +205,30 @@ div {
 ]
 div {
 
-   local.chapter.attributes = empty
-
-   chapter.status.attribute = status.attribute
+   db.chapter.status.attribute = db.status.attribute
 
-   chapter.role.attribute = attribute role { text }
+   db.chapter.role.attribute = attribute role { text }
 
-   chapter.attlist =
-      chapter.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & chapter.status.attribute?
-    & local.chapter.attributes
+   db.chapter.attlist =
+      db.chapter.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.chapter.status.attribute?
 
-   chapter.info = docbook.info.titlereq
+   db.chapter.info = db._info.title.req
 
    db.chapter =
       element chapter {
-         chapter.attlist,
-         chapter.info,
-         component.contentmodel
+         db.chapter.attlist,
+         db.chapter.info,
+         db.component.contentmodel
       }
 }
 
 # ======================================================================
 
-part.components = navigation.components | components
+db.part.components = db.navigation.components | db.components
 
 # ======================================================================
 
@@ -247,28 +238,25 @@ part.components = navigation.components | components
 ]
 div {
 
-   local.part.attributes = empty
-
-   part.status.attribute = status.attribute
+   db.part.status.attribute = db.status.attribute
 
-   part.role.attribute = attribute role { text }
+   db.part.role.attribute = attribute role { text }
 
-   part.attlist =
-      part.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & part.status.attribute?
-    & local.part.attributes
+   db.part.attlist =
+      db.part.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.part.status.attribute?
 
-   part.info = docbook.info.titlereq
+   db.part.info = db._info.title.req
 
    db.part =
       element part {
-         part.attlist,
-         part.info,
+         db.part.attlist,
+         db.part.info,
          db.partintro?,
-         part.components+
+         db.part.components+
       }
 }
 
@@ -280,27 +268,24 @@ div {
 ]
 div {
 
-   local.preface.attributes = empty
+   db.preface.status.attribute = db.status.attribute
 
-   preface.status.attribute = status.attribute
+   db.preface.role.attribute = attribute role { text }
 
-   preface.role.attribute = attribute role { text }
+   db.preface.attlist =
+      db.preface.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.preface.status.attribute?
 
-   preface.attlist =
-      preface.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & preface.status.attribute?
-    & local.preface.attributes
-
-   preface.info = docbook.info
+   db.preface.info = db._info
 
    db.preface =
       element preface {
-         preface.attlist,
-         preface.info,
-         component.contentmodel
+         db.preface.attlist,
+         db.preface.info,
+         db.component.contentmodel
       }
 }
 
@@ -312,68 +297,53 @@ div {
 ]
 div {
 
-   local.partintro.attributes = empty
-
-   partintro.status.attribute = status.attribute
+   db.partintro.status.attribute = db.status.attribute
 
-   partintro.role.attribute = attribute role { text }
+   db.partintro.role.attribute = attribute role { text }
 
-   partintro.attlist =
-      partintro.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & partintro.status.attribute?
-    & local.partintro.attributes
+   db.partintro.attlist =
+      db.partintro.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.partintro.status.attribute?
 
-   partintro.info = docbook.info
+   db.partintro.info = db._info
 
    db.partintro =
       element partintro {
-         partintro.attlist,
-         partintro.info,
-         blocks.or.sections
+         db.partintro.attlist,
+         db.partintro.info,
+         db.blocks.or.sections
       }
 }
 
 # ======================================================================
 
-sections.optional = db.section* | db.simplesect*
-
-sections.required = db.section+ | db.simplesect+
-
-blocks.or.sections =
-  (blocks+, sections.optional) | sections.required
-
-# ======================================================================
-
 [
    db:refname [ "section" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.section.attributes = empty
-
-   section.status.attribute = status.attribute
+   db.section.status.attribute = db.status.attribute
 
-   section.role.attribute = attribute role { text }
+   db.section.role.attribute = attribute role { text }
 
-   section.attlist =
-      section.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & section.status.attribute?
-    & local.section.attributes
+   db.section.attlist =
+      db.section.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.section.status.attribute?
 
-   section.info = docbook.info.titlereq
+   db.section.info = db._info.title.req
 
    db.section =
       element section {
-         section.attlist,
-         section.info,
-         blocks.or.sections
+         db.section.attlist,
+         db.section.info,
+         db.blocks.or.sections
       }
 }
 
@@ -385,27 +355,24 @@ div {
 ]
 div {
 
-   local.simplesect.attributes = empty
-
-   simplesect.status.attribute = status.attribute
+   db.simplesect.status.attribute = db.status.attribute
 
-   simplesect.role.attribute = attribute role { text }
+   db.simplesect.role.attribute = attribute role { text }
 
-   simplesect.attlist =
-      simplesect.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & simplesect.status.attribute?
-    & local.simplesect.attributes
+   db.simplesect.attlist =
+      db.simplesect.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.simplesect.status.attribute?
 
-   simplesect.info = docbook.info.titlereq
+   db.simplesect.info = db._info.title.req
 
    db.simplesect =
       element simplesect {
-         simplesect.attlist,
-         simplesect.info,
-         blocks+
+         db.simplesect.attlist,
+         db.simplesect.info,
+         db.all.blocks+
       }
 }
 
@@ -417,27 +384,24 @@ div {
 ]
 div {
 
-   local.ackno.attributes = empty
+   db.ackno.role.attribute = attribute role { text }
 
-   ackno.role.attribute = attribute role { text }
-
-   ackno.attlist =
-      ackno.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.ackno.attributes
+   db.ackno.attlist =
+      db.ackno.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.ackno =
       element ackno {
-         ackno.attlist,
-         para.blocks+
+         db.ackno.attlist,
+         db.para.blocks+
       }
 }
 
 # ======================================================================
 
-article.components.optional = db.section* | db.simplesect*
-article.components.required = db.section+ | db.simplesect+
+db.article.optional.components = db.section* | db.simplesect*
+db.article.required.components = db.section+ | db.simplesect+
 
 # ======================================================================
 
@@ -447,11 +411,9 @@ article.components.required = db.section+ | db.simplesect+
 ]
 div {
 
-   local.article.attributes = empty
-
-   article.status.attribute = status.attribute
+   db.article.status.attribute = db.status.attribute
 
-   article.class.attribute =
+   db.article.class.attribute =
       attribute class {
          "faq"
        | "journalarticle"
@@ -461,26 +423,27 @@ div {
        | "whitepaper"
       }
 
-   article.role.attribute = attribute role { text }
+   db.article.role.attribute = attribute role { text }
 
-   article.attlist =
-      article.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & article.status.attribute?
-    & article.class.attribute?
-    & local.article.attributes
+   db.article.attlist =
+      db.article.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.article.status.attribute?
+    & db.article.class.attribute?
 
-   article.info = docbook.info.titlereq
+   db.article.info = db._info.title.req
 
    db.article =
       element article {
-         article.attlist,
-         article.info,
-         navigation.components*,
-         ((blocks+, article.components.optional) | article.components.required),
-         (db.appendix | navigation.components | db.ackno)*
+         db.article.attlist,
+         db.article.info,
+         db.navigation.components*,
+         ((db.all.blocks+,
+            db.article.optional.components)
+          | db.article.required.components),
+         (db.appendix | db.navigation.components | db.ackno)*
       }
 }
 
diff --git a/docbook/relaxng/src/htmlform.rnc b/docbook/relaxng/src/htmlform.rnc
index b02fa2727..9489df706 100644
--- a/docbook/relaxng/src/htmlform.rnc
+++ b/docbook/relaxng/src/htmlform.rnc
@@ -17,8 +17,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-extension.blocks |= html.form
-extension.inlines |= html.input | html.button | html.label | html.select | html.textarea
+db.extension.blocks |= db.html.form
+db.extension.inlines |= db.html.input | db.html.button | db.html.label | db.html.select | db.html.textarea
 
 # ======================================================================
 
@@ -28,25 +28,22 @@ extension.inlines |= html.input | html.button | html.label | html.select | html.
 ]
 div {
 
-   local.html.form.attributes = empty
-
-   html.form.attlist =
-      html.attrs
+   db.html.form.attlist =
+      db.html.attrs
     & attribute action { text }
     & attribute method { "GET" | "POST" }?
     & attribute onsubmit { text }?
     & attribute onreset { text }?
-    & local.html.form.attributes
 
-   html.form =
+   db.html.form =
       element html:form {
-         html.form.attlist,
-         ( blocks
-          | html.input
-          | html.button
-          | html.label
-          | html.select
-          | html.textarea )+
+         db.html.form.attlist,
+         ( db.all.blocks
+          | db.html.input
+          | db.html.button
+          | db.html.label
+          | db.html.select
+          | db.html.textarea )+
       }
 }
 
@@ -58,10 +55,8 @@ div {
 ]
 div {
 
-   local.html.input.attributes = empty
-
-   html.input.attlist =
-      html.attrs
+   db.html.input.attlist =
+      db.html.attrs
     & attribute type {
        "text"
      | "password"
@@ -89,11 +84,10 @@ div {
     & attribute onblur { text }?
     & attribute onselect { text }?
     & attribute onchange { text }?
-    & local.html.input.attributes
 
-   html.input =
+   db.html.input =
       element html:input {
-         html.input.attlist,
+         db.html.input.attlist,
          empty
       }
 }
@@ -106,10 +100,8 @@ div {
 ]
 div {
 
-   local.html.button.attributes = empty
-
-   html.button.attlist =
-      html.attrs
+   db.html.button.attlist =
+      db.html.attrs
     & attribute name { text }?
     & attribute value { text }?
     & attribute type { "button" | "submit" | "reset" }?
@@ -118,12 +110,11 @@ div {
     & attribute accesskey { text }?
     & attribute onfocus { text }?
     & attribute onblur { text }?
-    & local.html.button.attributes
 
-   html.button =
+   db.html.button =
       element html:button {
-         html.button.attlist,
-         inlines*
+         db.html.button.attlist,
+         db.all.inlines*
       }
 }
 
@@ -135,19 +126,16 @@ div {
 ]
 div {
 
-   local.html.label.attributes = empty
-
-   html.label.attlist =
-      html.attrs
+   db.html.label.attlist =
+      db.html.attrs
     & attribute accesskey { text }?
     & attribute onfocus { text }?
     & attribute onblur { text }?
-    & local.html.label.attributes
 
-   html.label =
+   db.html.label =
       element html:label {
-         html.label.attlist,
-         inlines*
+         db.html.label.attlist,
+         db.all.inlines*
       }
 }
 
@@ -159,10 +147,8 @@ div {
 ]
 div {
 
-   local.html.select.attributes = empty
-
-   html.select.attlist =
-      html.attrs
+   db.html.select.attlist =
+      db.html.attrs
     & attribute name { text }?
     & attribute size { text }?
     & attribute multiple { "multiple" }?
@@ -171,12 +157,11 @@ div {
     & attribute onfocus { text }?
     & attribute onblur { text }?
     & attribute onchange { text }?
-    & local.html.select.attributes
 
-   html.select =
+   db.html.select =
       element html:select {
-         html.select.attlist,
-         html.option+
+         db.html.select.attlist,
+         db.html.option+
       }
 }
 
@@ -188,18 +173,15 @@ div {
 ]
 div {
 
-   local.html.option.attributes = empty
-
-   html.option.attlist =
-      html.attrs
+   db.html.option.attlist =
+      db.html.attrs
     & attribute selected { "selected" }?
     & attribute disabled { "disabled" }?
     & attribute value { text }?
-    & local.html.option.attributes
 
-   html.option =
+   db.html.option =
       element html:option {
-         html.option.attlist,
+         db.html.option.attlist,
          text
       }
 }
@@ -212,10 +194,8 @@ div {
 ]
 div {
 
-   local.html.textarea.attributes = empty
-
-   html.textarea.attlist =
-      html.attrs
+   db.html.textarea.attlist =
+      db.html.attrs
     & attribute name { text }?
     & attribute rows { text }
     & attribute cols { text }
@@ -227,11 +207,10 @@ div {
     & attribute onblur { text }?
     & attribute onselect { text }?
     & attribute onchange { text }?
-    & local.html.textarea.attributes
 
-   html.textarea =
+   db.html.textarea =
       element html:textarea {
-         html.textarea.attlist,
+         db.html.textarea.attlist,
          text
       }
 }
diff --git a/docbook/relaxng/src/htmltbl.rnc b/docbook/relaxng/src/htmltbl.rnc
index dcc10cbe2..ca815292d 100644
--- a/docbook/relaxng/src/htmltbl.rnc
+++ b/docbook/relaxng/src/htmltbl.rnc
@@ -16,19 +16,19 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-table.choice |= html.table
-informaltable.choice |= html.informaltable
+db.table.choice |= db.html.table
+db.informaltable.choice |= db.html.informaltable
 
-html.coreattrs &=
+db.html.coreattrs &=
   attribute class { text }?,
   attribute style { text }?,
   attribute title { text }?
 
-html.i18n &=
+db.html.i18n &=
   attribute lang { text }?,
   attribute dir { "ltr" | "rtl" }?
 
-html.events &=
+db.html.events &=
   attribute onclick { text }?,
   attribute ondblclick { text }?,
   attribute onmousedown { text }?,
@@ -40,28 +40,28 @@ html.events &=
   attribute onkeydown { text }?,
   attribute onkeyup { text }?
 
-html.attrs &= html.coreattrs, html.i18n, html.events
+db.html.attrs &= db.html.coreattrs, db.html.i18n, db.html.events
 
-html.cellhalign &=
+db.html.cellhalign &=
   attribute align { "left" | "center" | "right" | "justify" | "char" }?,
   attribute char { text }?,
   attribute charoff { text }?
 
-html.cellvalign &=
+db.html.cellvalign &=
   attribute valign { "top" | "middle" | "bottom" | "baseline" }?
 
-html.table.model =
-   html.caption,
-   (html.col* | html.colgroup*),
-   html.thead?,
-   html.tfoot?,
-   (html.tbody+ | html.tr+)
+db.html.table.model =
+   db.html.caption,
+   (db.html.col* | db.html.colgroup*),
+   db.html.thead?,
+   db.html.tfoot?,
+   (db.html.tbody+ | db.html.tr+)
 
-html.informaltable.model =
-   (html.col* | html.colgroup*),
-   html.thead?,
-   html.tfoot?,
-   (html.tbody+ | html.tr+)
+db.html.informaltable.model =
+   (db.html.col* | db.html.colgroup*),
+   db.html.thead?,
+   db.html.tfoot?,
+   (db.html.tbody+ | db.html.tr+)
 
 # ======================================================================
 
@@ -71,10 +71,8 @@ html.informaltable.model =
 ]
 div {
 
-   local.html.table.attributes = empty
-
-   html.table.attlist =
-      html.attrs
+   db.html.table.attlist =
+      db.html.attrs
     & attribute summary { text }?
     & attribute width { text }?
     & attribute border { text }?
@@ -92,12 +90,11 @@ div {
     & attribute rules { "none" | "groups" | "rows" | "cols" | "all" }?
     & attribute cellspacing { text }?
     & attribute cellpadding { text }?
-    & local.html.table.attributes
 
-   html.table =
+   db.html.table =
       element table {
-         html.table.attlist,
-         html.table.model
+         db.html.table.attlist,
+         db.html.table.model
       }
 }
 
@@ -109,10 +106,8 @@ div {
 ]
 div {
 
-   local.html.informaltable.attributes = empty
-
-   html.informaltable.attlist =
-      html.attrs
+   db.html.informaltable.attlist =
+      db.html.attrs
     & attribute summary { text }?
     & attribute width { text }?
     & attribute border { text }?
@@ -130,12 +125,11 @@ div {
     & attribute rules { "none" | "groups" | "rows" | "cols" | "all" }?
     & attribute cellspacing { text }?
     & attribute cellpadding { text }?
-    & local.html.informaltable.attributes
 
-   html.informaltable =
+   db.html.informaltable =
       element informaltable {
-         html.informaltable.attlist,
-         html.informaltable.model
+         db.html.informaltable.attlist,
+         db.html.informaltable.model
       }
 }
 
@@ -147,15 +141,12 @@ div {
 ]
 div {
 
-   local.caption.attributes = empty
-
-   html.caption.attlist =
-      html.attrs
-    & local.caption.attributes
+   db.html.caption.attlist =
+      db.html.attrs
 
-   html.caption =
+   db.html.caption =
       element caption {
-         html.caption.attlist,
+         db.html.caption.attlist,
          text
       }
 }
@@ -168,19 +159,16 @@ div {
 ]
 div {
 
-   local.col.attributes = empty
-
-   html.col.attlist =
-      html.attrs
+   db.html.col.attlist =
+      db.html.attrs
     & attribute span { text }?
     & attribute width { text }?
-    & html.cellhalign
-    & html.cellvalign
-    & local.col.attributes
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.col =
+   db.html.col =
       element col {
-         html.col.attlist,
+         db.html.col.attlist,
          empty
       }
 }
@@ -193,20 +181,17 @@ div {
 ]
 div {
 
-   local.colgroup.attributes = empty
-
-   html.colgroup.attlist =
-      html.attrs
+   db.html.colgroup.attlist =
+      db.html.attrs
     & attribute span { text }?
     & attribute width { text }?
-    & html.cellhalign
-    & html.cellvalign
-    & local.colgroup.attributes
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.colgroup =
+   db.html.colgroup =
       element colgroup {
-         html.colgroup.attlist,
-         html.col*
+         db.html.colgroup.attlist,
+         db.html.col*
       }
 }
 
@@ -218,18 +203,15 @@ div {
 ]
 div {
 
-   local.html.thead.attributes = empty
-
-   html.thead.attlist =
-      html.attrs
-    & html.cellhalign
-    & html.cellvalign
-    & local.html.thead.attributes
+   db.html.thead.attlist =
+      db.html.attrs
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.thead =
+   db.html.thead =
       element thead {
-         html.thead.attlist,
-         html.tr+
+         db.html.thead.attlist,
+         db.html.tr+
       }
 }
 
@@ -241,18 +223,15 @@ div {
 ]
 div {
 
-   local.html.tfoot.attributes = empty
+   db.html.tfoot.attlist =
+      db.html.attrs
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.tfoot.attlist =
-      html.attrs
-    & html.cellhalign
-    & html.cellvalign
-    & local.html.tfoot.attributes
-
-   html.tfoot =
+   db.html.tfoot =
       element tfoot {
-         html.tfoot.attlist,
-         html.tr+
+         db.html.tfoot.attlist,
+         db.html.tr+
       }
 }
 
@@ -264,18 +243,15 @@ div {
 ]
 div {
 
-   local.html.tbody.attributes = empty
-
-   html.tbody.attlist =
-      html.attrs
-    & html.cellhalign
-    & html.cellvalign
-    & local.html.tbody.attributes
+   db.html.tbody.attlist =
+      db.html.attrs
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.tbody =
+   db.html.tbody =
       element tbody {
-         html.tbody.attlist,
-         html.tr+
+         db.html.tbody.attlist,
+         db.html.tr+
       }
 }
 
@@ -287,18 +263,15 @@ div {
 ]
 div {
 
-   local.tr.attributes = empty
-
-   html.tr.attlist =
-      html.attrs
-    & html.cellhalign
-    & html.cellvalign
-    & local.tr.attributes
+   db.html.tr.attlist =
+      db.html.attrs
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.tr =
+   db.html.tr =
       element tr {
-         html.tr.attlist,
-         (html.th | html.td)+
+         db.html.tr.attlist,
+         (db.html.th | db.html.td)+
       }
 }
 
@@ -310,24 +283,21 @@ div {
 ]
 div {
 
-   local.th.attributes = empty
-
-   html.th.attlist =
-      html.attrs
+   db.html.th.attlist =
+      db.html.attrs
     & attribute abbr { text }?
     & attribute axis { text }?
     & attribute headers { text }?
     & attribute scope { text }?
     & attribute rowspan { text }?
     & attribute colspan { text }?
-    & html.cellhalign
-    & html.cellvalign
-    & local.th.attributes
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.th =
+   db.html.th =
       element th {
-         html.th.attlist,
-         (inlines* | blocks*)
+         db.html.th.attlist,
+         (db.all.inlines* | db.all.blocks*)
       }
 }
 
@@ -339,24 +309,21 @@ div {
 ]
 div {
 
-   local.td.attributes = empty
-
-   html.td.attlist =
-      html.attrs
+   db.html.td.attlist =
+      db.html.attrs
     & attribute abbr { text }?
     & attribute axis { text }?
     & attribute headers { text }?
     & attribute scope { text }?
     & attribute rowspan { text }?
     & attribute colspan { text }?
-    & html.cellhalign
-    & html.cellvalign
-    & local.td.attributes
+    & db.html.cellhalign
+    & db.html.cellvalign
 
-   html.td =
+   db.html.td =
       element td {
-         html.td.attlist,
-         (inlines* | blocks*)
+         db.html.td.attlist,
+         (db.all.inlines* | db.all.blocks*)
       }
 }
 
diff --git a/docbook/relaxng/src/index.rnc b/docbook/relaxng/src/index.rnc
index fb3bf7a0c..8c2f2ba42 100644
--- a/docbook/relaxng/src/index.rnc
+++ b/docbook/relaxng/src/index.rnc
@@ -17,20 +17,21 @@ default namespace = "http://docbook.org/docbook-ng"
 
 start |= db.setindex
 
-ubiq.inlines |= db.indexterm
-indexing.inlines |= db.indexterm
-blocks.nopara |= db.indexterm
-navigation.components |= db.index
-setindex.components |= db.setindex
+db.ubiq.inlines |= db.indexterm
+db.indexing.inlines |= db.indexterm
+db.nopara.blocks |= db.indexterm
+db.navigation.components |= db.index
+db.setindex.components |= db.setindex
 
-info.elements |= db.itermset
+db.info.elements |= db.itermset
 
-significance.attribute = attribute significance { "normal" | "preferred" }
-zone.attribute = attribute zone { xsd:IDREFS }
-pagenum.attribute = attribute pagenum { text }
-scope.attribute = attribute scope { "all" | "global" | "local" }
+# ======================================================================
 
-sortas.attribute = attribute sortas { text }
+db.significance.attribute = attribute significance { "normal" | "preferred" }
+db.zone.attribute         = attribute zone { xsd:IDREFS }
+db.pagenum.attribute      = attribute pagenum { text }
+db.scope.attribute        = attribute scope { "all" | "global" | "local" }
+db.sortas.attribute       = attribute sortas { text }
 
 # ======================================================================
 
@@ -40,26 +41,23 @@ sortas.attribute = attribute sortas { text }
 ]
 div {
 
-   local.itermset.attributes = empty
-
-   itermset.role.attribute = attribute role { text }
+   db.itermset.role.attribute = attribute role { text }
 
-   itermset.attlist =
-      itermset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.itermset.attributes
+   db.itermset.attlist =
+      db.itermset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.itermset =
       element itermset {
-         itermset.attlist,
-         indexterm.singular+
+         db.itermset.attlist,
+         db.indexterm.singular+
       }
 }
 
 # ======================================================================
 
-indexterm.contentmodel =
+db.indexterm.contentmodel =
    db.primary?,
    ((db.secondary,
       ((db.tertiary, (db.see | db.seealso+)?)
@@ -76,25 +74,22 @@ indexterm.contentmodel =
 ]
 div {
 
-   local.indexterm.singular.attributes = empty
-
-   indexterm.singular.role.attribute = attribute role { text }
+   db.indexterm.singular.role.attribute = attribute role { text }
 
-   indexterm.singular.attlist =
-      indexterm.singular.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & significance.attribute?
-    & zone.attribute?
-    & pagenum.attribute?
-    & scope.attribute?
+   db.indexterm.singular.attlist =
+      db.indexterm.singular.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.significance.attribute?
+    & db.zone.attribute?
+    & db.pagenum.attribute?
+    & db.scope.attribute?
     & attribute class { "singular" }?
-    & local.indexterm.singular.attributes
 
-   indexterm.singular =
+   db.indexterm.singular =
       element indexterm {
-         indexterm.singular.attlist,
-         indexterm.contentmodel
+         db.indexterm.singular.attlist,
+         db.indexterm.contentmodel
       }
 }
 
@@ -106,25 +101,22 @@ div {
 ]
 div {
 
-   local.indexterm.startofrange.attributes = empty
+   db.indexterm.startofrange.role.attribute = attribute role { text }
 
-   indexterm.startofrange.role.attribute = attribute role { text }
-
-   indexterm.startofrange.attlist =
-      indexterm.startofrange.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & significance.attribute?
-    & zone.attribute?
-    & pagenum.attribute?
-    & scope.attribute?
+   db.indexterm.startofrange.attlist =
+      db.indexterm.startofrange.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.significance.attribute?
+    & db.zone.attribute?
+    & db.pagenum.attribute?
+    & db.scope.attribute?
     & attribute class { "startofrange" }
-    & local.indexterm.startofrange.attributes
 
-   indexterm.startofrange =
+   db.indexterm.startofrange =
       element indexterm {
-         indexterm.startofrange.attlist,
-         indexterm.contentmodel
+         db.indexterm.startofrange.attlist,
+         db.indexterm.contentmodel
       }
 }
 
@@ -136,21 +128,18 @@ div {
 ]
 div {
 
-   local.indexterm.endofrange.attributes = empty
-
-   indexterm.endofrange.role.attribute = attribute role { text }
+   db.indexterm.endofrange.role.attribute = attribute role { text }
 
-   indexterm.endofrange.attlist =
-      indexterm.endofrange.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.indexterm.endofrange.attlist =
+      db.indexterm.endofrange.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute class { "endofrange" }
     & attribute startref { xsd:IDREF }
-    & local.indexterm.endofrange.attributes
 
-   indexterm.endofrange =
+   db.indexterm.endofrange =
       element indexterm {
-         indexterm.endofrange.attlist,
+         db.indexterm.endofrange.attlist,
          empty
       }
 }
@@ -162,9 +151,10 @@ div {
    db:refpurpose [ "" ]
 ]
 div {
-
-   db.indexterm = (indexterm.singular|indexterm.startofrange|indexterm.endofrange)
-
+   db.indexterm =
+      db.indexterm.singular
+    |db.indexterm.startofrange
+    |db.indexterm.endofrange
 }
 
 # ======================================================================
@@ -175,21 +165,18 @@ div {
 ]
 div {
 
-   local.primary.attributes = empty
-
-   primary.role.attribute = attribute role { text }
+   db.primary.role.attribute = attribute role { text }
 
-   primary.attlist =
-      primary.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & sortas.attribute?
-    & local.primary.attributes
+   db.primary.attlist =
+      db.primary.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.sortas.attribute?
 
    db.primary =
       element primary {
-         primary.attlist,
-         inlines*
+         db.primary.attlist,
+         db.all.inlines*
       }
 }
 
@@ -201,21 +188,18 @@ div {
 ]
 div {
 
-   local.secondary.attributes = empty
-
-   secondary.role.attribute = attribute role { text }
+   db.secondary.role.attribute = attribute role { text }
 
-   secondary.attlist =
-      secondary.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & sortas.attribute?
-    & local.secondary.attributes
+   db.secondary.attlist =
+      db.secondary.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.sortas.attribute?
 
    db.secondary =
       element secondary {
-         secondary.attlist,
-         inlines*
+         db.secondary.attlist,
+         db.all.inlines*
       }
 }
 
@@ -227,21 +211,18 @@ div {
 ]
 div {
 
-   local.tertiary.attributes = empty
+   db.tertiary.role.attribute = attribute role { text }
 
-   tertiary.role.attribute = attribute role { text }
-
-   tertiary.attlist =
-      tertiary.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & sortas.attribute?
-    & local.tertiary.attributes
+   db.tertiary.attlist =
+      db.tertiary.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.sortas.attribute?
 
    db.tertiary =
       element tertiary {
-         tertiary.attlist,
-         inlines*
+         db.tertiary.attlist,
+         db.all.inlines*
       }
 }
 
@@ -253,20 +234,17 @@ div {
 ]
 div {
 
-   local.see.attributes = empty
-
-   see.role.attribute = attribute role { text }
+   db.see.role.attribute = attribute role { text }
 
-   see.attlist =
-      see.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.see.attributes
+   db.see.attlist =
+      db.see.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.see =
       element see {
-         see.attlist,
-         inlines*
+         db.see.attlist,
+         db.all.inlines*
       }
 }
 
@@ -278,20 +256,17 @@ div {
 ]
 div {
 
-   local.seealso.attributes = empty
+   db.seealso.role.attribute = attribute role { text }
 
-   seealso.role.attribute = attribute role { text }
-
-   seealso.attlist =
-      seealso.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.seealso.attributes
+   db.seealso.attlist =
+      db.seealso.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.seealso =
       element seealso {
-         seealso.attlist,
-         inlines*
+         db.seealso.attlist,
+         db.all.inlines*
       }
 }
 
@@ -303,27 +278,24 @@ div {
 ]
 div {
 
-   local.index.attributes = empty
-
-   index.status.attribute = status.attribute
+   db.index.status.attribute = db.status.attribute
 
-   index.role.attribute = attribute role { text }
+   db.index.role.attribute = attribute role { text }
 
-   index.attlist =
-      index.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & index.status.attribute?
-    & local.index.attributes
+   db.index.attlist =
+      db.index.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.index.status.attribute?
 
-   index.info = docbook.info
+   db.index.info = db._info
 
    db.index =
       element index {
-         index.attlist,
-         index.info,
-         blocks*,
+         db.index.attlist,
+         db.index.info,
+         db.all.blocks*,
          (db.indexdiv* | db.indexentry* | db.segmentedlist)
       }
 }
@@ -336,27 +308,24 @@ div {
 ]
 div {
 
-   local.setindex.attributes = empty
-
-   setindex.status.attribute = status.attribute
+   db.setindex.status.attribute = db.status.attribute
 
-   setindex.role.attribute = attribute role { text }
+   db.setindex.role.attribute = attribute role { text }
 
-   setindex.attlist =
-      setindex.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & setindex.status.attribute?
-    & local.setindex.attributes
+   db.setindex.attlist =
+      db.setindex.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.setindex.status.attribute?
 
-   setindex.info = docbook.info
+   db.setindex.info = db._info
 
    db.setindex =
       element setindex {
-         setindex.attlist,
-         setindex.info,
-         blocks*,
+         db.setindex.attlist,
+         db.setindex.info,
+         db.all.blocks*,
          (db.indexdiv* | db.indexentry*)
       }
 }
@@ -369,27 +338,24 @@ div {
 ]
 div {
 
-   local.indexdiv.attributes = empty
+   db.indexdiv.status.attribute = db.status.attribute
 
-   indexdiv.status.attribute = status.attribute
+   db.indexdiv.role.attribute = attribute role { text }
 
-   indexdiv.role.attribute = attribute role { text }
+   db.indexdiv.attlist =
+      db.indexdiv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.label.attribute?
+    & db.indexdiv.status.attribute?
 
-   indexdiv.attlist =
-      indexdiv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & label.attribute?
-    & indexdiv.status.attribute?
-    & local.indexdiv.attributes
-
-   indexdiv.info = docbook.info.titlereq
+   db.indexdiv.info = db._info.title.req
 
    db.indexdiv =
       element indexdiv {
-         indexdiv.attlist,
-         indexdiv.info,
-         blocks*,
+         db.indexdiv.attlist,
+         db.indexdiv.info,
+         db.all.blocks*,
          (db.indexentry+|db.segmentedlist)
       }
 }
@@ -402,19 +368,16 @@ div {
 ]
 div {
 
-   local.indexentry.attributes = empty
-
-   indexentry.role.attribute = attribute role { text }
+   db.indexentry.role.attribute = attribute role { text }
 
-   indexentry.attlist =
-      indexentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.indexentry.attributes
+   db.indexentry.attlist =
+      db.indexentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.indexentry =
       element indexentry {
-         indexentry.attlist,
+         db.indexentry.attlist,
          db.primaryie,
          (db.seeie | db.seealsoie)*,
          (db.secondaryie, (db.seeie | db.seealsoie | db.tertiaryie)*)*
@@ -429,20 +392,17 @@ div {
 ]
 div {
 
-   local.primaryie.attributes = empty
+   db.primaryie.role.attribute = attribute role { text }
 
-   primaryie.role.attribute = attribute role { text }
-
-   primaryie.attlist =
-      primaryie.role.attribute?
-    & common.attributes
-    & linkends.attribute?
-    & local.primaryie.attributes
+   db.primaryie.attlist =
+      db.primaryie.role.attribute?
+    & db.common.attributes
+    & db.linkends.attribute?
 
    db.primaryie =
       element primaryie {
-         primaryie.attlist,
-         inlines*
+         db.primaryie.attlist,
+         db.all.inlines*
       }
 }
 
@@ -454,20 +414,17 @@ div {
 ]
 div {
 
-   local.secondaryie.attributes = empty
-
-   secondaryie.role.attribute = attribute role { text }
+   db.secondaryie.role.attribute = attribute role { text }
 
-   secondaryie.attlist =
-      secondaryie.role.attribute?
-    & common.attributes
-    & linkends.attribute?
-    & local.secondaryie.attributes
+   db.secondaryie.attlist =
+      db.secondaryie.role.attribute?
+    & db.common.attributes
+    & db.linkends.attribute?
 
    db.secondaryie =
       element secondaryie {
-         secondaryie.attlist,
-         inlines*
+         db.secondaryie.attlist,
+         db.all.inlines*
       }
 }
 
@@ -479,20 +436,17 @@ div {
 ]
 div {
 
-   local.tertiaryie.attributes = empty
-
-   tertiaryie.role.attribute = attribute role { text }
+   db.tertiaryie.role.attribute = attribute role { text }
 
-   tertiaryie.attlist =
-      tertiaryie.role.attribute?
-    & common.attributes
-    & linkends.attribute?
-    & local.tertiaryie.attributes
+   db.tertiaryie.attlist =
+      db.tertiaryie.role.attribute?
+    & db.common.attributes
+    & db.linkends.attribute?
 
    db.tertiaryie =
       element tertiaryie {
-         tertiaryie.attlist,
-         inlines*
+         db.tertiaryie.attlist,
+         db.all.inlines*
       }
 }
 
@@ -504,20 +458,17 @@ div {
 ]
 div {
 
-   local.seeie.attributes = empty
+   db.seeie.role.attribute = attribute role { text }
 
-   seeie.role.attribute = attribute role { text }
-
-   seeie.attlist =
-      seeie.role.attribute?
-    & common.attributes
-    & linkend.attribute?
-    & local.seeie.attributes
+   db.seeie.attlist =
+      db.seeie.role.attribute?
+    & db.common.attributes
+    & db.linkend.attribute?
 
    db.seeie =
       element seeie {
-         seeie.attlist,
-         inlines*
+         db.seeie.attlist,
+         db.all.inlines*
       }
 }
 
@@ -529,19 +480,16 @@ div {
 ]
 div {
 
-   local.seealsoie.attributes = empty
-
-   seealsoie.role.attribute = attribute role { text }
+   db.seealsoie.role.attribute = attribute role { text }
 
-   seealsoie.attlist =
-      seealsoie.role.attribute?
-    & common.attributes
-    & linkends.attribute?
-    & local.seealsoie.attributes
+   db.seealsoie.attlist =
+      db.seealsoie.role.attribute?
+    & db.common.attributes
+    & db.linkends.attribute?
 
    db.seealsoie =
       element seealsoie {
-         seealsoie.attlist,
-         inlines*
+         db.seealsoie.attlist,
+         db.all.inlines*
       }
 }
diff --git a/docbook/relaxng/src/mathml.rnc b/docbook/relaxng/src/mathml.rnc
index 3af3d1103..22cc71116 100644
--- a/docbook/relaxng/src/mathml.rnc
+++ b/docbook/relaxng/src/mathml.rnc
@@ -17,11 +17,11 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-equation.content |= any.mml
-inlineequation.content |= any.mml
+db.equation.content |= db._any.mml
+db.inlineequation.content |= db._any.mml
 
-any.mml =
-   element mml:* {
-      anyAttribute*,
-      (text | any.mml)*
-   }
+db._any.mml =
+  element mml:* {
+    db._any.attribute*,
+    (text | db._any)*
+  }
diff --git a/docbook/relaxng/src/msgset.rnc b/docbook/relaxng/src/msgset.rnc
index bc51cf77b..f13819cc1 100644
--- a/docbook/relaxng/src/msgset.rnc
+++ b/docbook/relaxng/src/msgset.rnc
@@ -16,7 +16,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-technical.blocks |= db.msgset
+db.technical.blocks |= db.msgset
 
 # ======================================================================
 
@@ -26,22 +26,19 @@ technical.blocks |= db.msgset
 ]
 div {
 
-   local.msgset.attributes = empty
+   db.msgset.role.attribute = attribute role { text }
 
-   msgset.role.attribute = attribute role { text }
+   db.msgset.attlist =
+      db.msgset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   msgset.attlist =
-      msgset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgset.attributes
-
-   msgset.info = docbook.info.titleonly
+   db.msgset.info = db._info.title.only
 
    db.msgset =
       element msgset {
-         msgset.attlist,
-         msgset.info,
+         db.msgset.attlist,
+         db.msgset.info,
          (db.msgentry+|db.simplemsgentry+)
       }
 }
@@ -54,19 +51,16 @@ div {
 ]
 div {
 
-   local.msgentry.attributes = empty
-
-   msgentry.role.attribute = attribute role { text }
+   db.msgentry.role.attribute = attribute role { text }
 
-   msgentry.attlist =
-      msgentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgentry.attributes
+   db.msgentry.attlist =
+      db.msgentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.msgentry =
       element msgentry {
-         msgentry.attlist,
+         db.msgentry.attlist,
          db.msg+,
          db.msginfo?,
          db.msgexplan*
@@ -81,22 +75,19 @@ div {
 ]
 div {
 
-   local.simplemsgentry.attributes = empty
+   db.simplemsgentry.role.attribute = attribute role { text }
 
-   simplemsgentry.role.attribute = attribute role { text }
-
-   simplemsgentry.attlist =
-      simplemsgentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.simplemsgentry.attlist =
+      db.simplemsgentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute audience { text }
     & attribute origin { text }
     & attribute level { text }
-    & local.simplemsgentry.attributes
 
    db.simplemsgentry =
       element simplemsgentry {
-         simplemsgentry.attlist,
+         db.simplemsgentry.attlist,
          db.msgtext,
          db.msgexplan+
       }
@@ -110,22 +101,19 @@ div {
 ]
 div {
 
-   local.msg.attributes = empty
-
-   msg.role.attribute = attribute role { text }
+   db.msg.role.attribute = attribute role { text }
 
-   msg.attlist =
-      msg.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msg.attributes
+   db.msg.attlist =
+      db.msg.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   msg.info = docbook.info.titleonly
+   db.msg.info = db._info.title.only
 
    db.msg =
       element msg {
-         msg.attlist,
-         msg.info,
+         db.msg.attlist,
+         db.msg.info,
          db.msgmain,
          (db.msgsub|db.msgrel)*
       }
@@ -139,22 +127,19 @@ div {
 ]
 div {
 
-   local.msgmain.attributes = empty
+   db.msgmain.role.attribute = attribute role { text }
 
-   msgmain.role.attribute = attribute role { text }
+   db.msgmain.attlist =
+      db.msgmain.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   msgmain.attlist =
-      msgmain.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgmain.attributes
-
-   msgmain.info = docbook.info.titleonly
+   db.msgmain.info = db._info.title.only
 
    db.msgmain =
       element msgmain {
-         msgmain.attlist,
-         msgmain.info,
+         db.msgmain.attlist,
+         db.msgmain.info,
          db.msgtext
       }
 }
@@ -167,22 +152,19 @@ div {
 ]
 div {
 
-   local.msgsub.attributes = empty
-
-   msgsub.role.attribute = attribute role { text }
+   db.msgsub.role.attribute = attribute role { text }
 
-   msgsub.attlist =
-      msgsub.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgsub.attributes
+   db.msgsub.attlist =
+      db.msgsub.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   msgsub.info = docbook.info.titleonly
+   db.msgsub.info = db._info.title.only
 
    db.msgsub =
       element msgsub {
-         msgsub.attlist,
-         msgsub.info,
+         db.msgsub.attlist,
+         db.msgsub.info,
          db.msgtext
       }
 }
@@ -195,22 +177,19 @@ div {
 ]
 div {
 
-   local.msgrel.attributes = empty
-
-   msgrel.role.attribute = attribute role { text }
+   db.msgrel.role.attribute = attribute role { text }
 
-   msgrel.attlist =
-      msgrel.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgrel.attributes
+   db.msgrel.attlist =
+      db.msgrel.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   msgrel.info = docbook.info.titleonly
+   db.msgrel.info = db._info.title.only
 
    db.msgrel =
       element msgrel {
-         msgrel.attlist,
-         msgrel.info,
+         db.msgrel.attlist,
+         db.msgrel.info,
          db.msgtext
       }
 }
@@ -223,20 +202,17 @@ div {
 ]
 div {
 
-   local.msgtext.attributes = empty
+   db.msgtext.role.attribute = attribute role { text }
 
-   msgtext.role.attribute = attribute role { text }
-
-   msgtext.attlist =
-      msgtext.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgtext.attributes
+   db.msgtext.attlist =
+      db.msgtext.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.msgtext =
       element msgtext {
-         msgtext.attlist,
-         blocks+
+         db.msgtext.attlist,
+         db.all.blocks+
       }
 }
 
@@ -248,19 +224,16 @@ div {
 ]
 div {
 
-   local.msginfo.attributes = empty
-
-   msginfo.role.attribute = attribute role { text }
+   db.msginfo.role.attribute = attribute role { text }
 
-   msginfo.attlist =
-      msginfo.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msginfo.attributes
+   db.msginfo.attlist =
+      db.msginfo.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.msginfo =
       element msginfo {
-         msginfo.attlist,
+         db.msginfo.attlist,
          (db.msglevel|db.msgorig|db.msgaud)*
       }
 }
@@ -273,20 +246,17 @@ div {
 ]
 div {
 
-   local.msglevel.attributes = empty
-
-   msglevel.role.attribute = attribute role { text }
+   db.msglevel.role.attribute = attribute role { text }
 
-   msglevel.attlist =
-      msglevel.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msglevel.attributes
+   db.msglevel.attlist =
+      db.msglevel.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.msglevel =
       element msglevel {
-         msglevel.attlist,
-         docbook.text
+         db.msglevel.attlist,
+         db._text
       }
 }
 
@@ -298,20 +268,17 @@ div {
 ]
 div {
 
-   local.msgorig.attributes = empty
+   db.msgorig.role.attribute = attribute role { text }
 
-   msgorig.role.attribute = attribute role { text }
-
-   msgorig.attlist =
-      msgorig.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgorig.attributes
+   db.msgorig.attlist =
+      db.msgorig.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.msgorig =
       element msgorig {
-         msgorig.attlist,
-         docbook.text
+         db.msgorig.attlist,
+         db._text
       }
 }
 
@@ -323,20 +290,17 @@ div {
 ]
 div {
 
-   local.msgaud.attributes = empty
-
-   msgaud.role.attribute = attribute role { text }
+   db.msgaud.role.attribute = attribute role { text }
 
-   msgaud.attlist =
-      msgaud.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgaud.attributes
+   db.msgaud.attlist =
+      db.msgaud.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.msgaud =
       element msgaud {
-         msgaud.attlist,
-         docbook.text
+         db.msgaud.attlist,
+         db._text
       }
 }
 
@@ -348,23 +312,20 @@ div {
 ]
 div {
 
-   local.msgexplan.attributes = empty
-
-   msgexplan.role.attribute = attribute role { text }
+   db.msgexplan.role.attribute = attribute role { text }
 
-   msgexplan.attlist =
-      msgexplan.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.msgexplan.attributes
+   db.msgexplan.attlist =
+      db.msgexplan.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   msgexplan.info = docbook.info.titleonly
+   db.msgexplan.info = db._info.title.only
 
    db.msgexplan =
       element msgexplan {
-         msgexplan.attlist,
-         msgexplan.info,
-         blocks+
+         db.msgexplan.attlist,
+         db.msgexplan.info,
+         db.all.blocks+
       }
 }
 
diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc
index 31d085999..ceefb255a 100644
--- a/docbook/relaxng/src/pool.rnc
+++ b/docbook/relaxng/src/pool.rnc
@@ -55,7 +55,6 @@
 # stageDirection = camera, caption, move, sound, tech, view
 # tpParts = title page parts (as in a written work)
 
-
 namespace ctrl = "http://nwalsh.com/xmlns/schema-control/"
 namespace rng  = "http://relaxng.org/ns/structure/1.0"
 namespace s = "http://www.ascc.net/xml/schematron"
@@ -64,107 +63,85 @@ default namespace = "http://docbook.org/docbook-ng"
 
 # ======================================================================
 
-anyAttribute = attribute * { text }
-
-id.attribute        = attribute id { xsd:ID }
-
-xml.lang.attribute  = attribute xml:lang { text }
-
-xml.base.attribute  = attribute xml:base { text }
-
-remap.attribute     = attribute remap { text }
-
-xreflabel.attribute = attribute xreflabel { text }
+db._any           = element * { db._any.attribute*, (text | db._any)* }
+db._any.attribute = attribute * { text }
 
-revisionflag.attribute =
-  attribute revisionflag { "changed" | "added" | "deleted" | "off" }
-
-effectivity.attributes =
-  arch.attribute?,
-  condition.attribute?,
-  conformance.attribute?,
-  os.attribute?,
-  revision.attribute?,
-  security.attribute?,
-  userlevel.attribute?,
-  vendor.attribute?
+# ======================================================================
 
-arch.attribute        = attribute arch        { text }
-condition.attribute   = attribute condition   { text }
-conformance.attribute = attribute conformance { text }
-os.attribute          = attribute os          { text }
-revision.attribute    = attribute revision    { text }
-security.attribute    = attribute security    { text }
-userlevel.attribute   = attribute userlevel   { text }
-vendor.attribute      = attribute vendor      { text }
-version.attribute     = attribute version     { text }
+db.effectivity.attributes =
+  attribute arch        { text }?,
+  attribute condition   { text }?,
+  attribute conformance { text }?,
+  attribute os          { text }?,
+  attribute revision    { text }?,
+  attribute security    { text }?,
+  attribute userlevel   { text }?,
+  attribute vendor      { text }?
 
 # ======================================================================
 
-linkend.attribute  = attribute linkend { xsd:IDREF }
+db.linkend.attribute  = attribute linkend { xsd:IDREF }
 
-linkends.attribute = attribute linkends { xsd:IDREFS }
+db.linkends.attribute = attribute linkends { xsd:IDREFS }
 
-href.attribute = attribute href { text }
+db.href.attribute = attribute href { text }
 
 # ======================================================================
 
-common.attributes =
-  id.attribute?,
-  xml.lang.attribute?,
-  xml.base.attribute?,
-  remap.attribute?,
-  xreflabel.attribute?,
-  revisionflag.attribute?,
-  version.attribute?,
-  effectivity.attributes
+db.common.attributes =
+  attribute id { xsd:ID }?,
+  attribute version { text }?,
+  attribute xml:lang { text }?,
+  attribute xml:base { text }?,
+  attribute remap { text }?,
+  attribute xreflabel { text }?,
+  attribute revisionflag { "changed" | "added" | "deleted" | "off" }?,
+  db.effectivity.attributes
 
-common.attributes.idreq =
-  id.attribute,
-  xml.lang.attribute?,
-  xml.base.attribute?,
-  remap.attribute?,
-  xreflabel.attribute?,
-  revisionflag.attribute?,
-  version.attribute?,
-  effectivity.attributes
+db.common.idreq.attributes =
+  attribute id { xsd:ID },
+  attribute version { text }?,
+  attribute xml:lang { text }?,
+  attribute xml:base { text }?,
+  attribute remap { text }?,
+  attribute xreflabel { text }?,
+  attribute revisionflag { "changed" | "added" | "deleted" | "off" }?,
+  db.effectivity.attributes
 
-common.linking.attributes.req =
-   linkend.attribute | href.attribute
+db.common.linking.attributes =
+   (db.linkend.attribute | db.href.attribute)?
 
-common.linking.attributes =
-   (linkend.attribute | href.attribute)?
+db.common.req.linking.attributes =
+   db.linkend.attribute | db.href.attribute
 
-# ======================================================================
+db.common.data.attributes =
+  attribute format { text }?,
+  (attribute fileref { text } | attribute entityref { xsd:ENTITY })
 
-linenumbering.attribute      = attribute linenumbering { "numbered" | "unnumbered" }
-startinglinenumber.attribute = attribute startinglinenumber { xsd:integer }
-verb-language.attribute      = attribute language { text }
-continuation.attribute       = attribute continuation { "continues" | "restarts" }
+# ======================================================================
 
-verbatim.attributes &=
-   continuation.attribute?,
-   linenumbering.attribute?,
-   startinglinenumber.attribute?,
-   verb-language.attribute?
+db.verbatim.attributes =
+  attribute continuation { "continues" | "restarts" }?,
+  attribute linenumbering { "numbered" | "unnumbered" }?,
+  attribute startinglinenumber { xsd:integer }?,
+  attribute language { text }?
 
-float.attribute = attribute float { text }
-pgwide.attribute = attribute pgwide { "0" | "1" }
+# ======================================================================
 
-data.format.attribute = attribute format { text }
-data.fileref.attribute = attribute fileref { text }
-data.entityref.attribute = attribute entityref { xsd:ENTITY }
-data.common.attrib &=
-   data.format.attribute?,
-   (data.fileref.attribute | data.entityref.attribute)
+db.spacing.attribute  = attribute spacing { "compact" | "normal" }
+db.float.attribute    = attribute float { text }
+db.pgwide.attribute   = attribute pgwide { "0" | "1" }
+db.language.attribute = attribute language { text }?
+db.performance.attribute = attribute performance { "optional" | "required" }
+db.floatstyle.attribute = attribute floatstyle { text }
 
-oo-language.attribute = attribute language { text }?
+# ======================================================================
 
-ctrl:other-attribute [ name="biblio.class.attrib"
-                       enum-name="biblio.class-enum.attribute"
-                       other-name="biblio.class-other.attributes" ]
+ctrl:other-attribute [ name="db.biblio.class.attribute"
+                       enum-name="db.biblio.class-enum.attribute"
+                       other-name="db.biblio.class-other.attributes" ]
 
-biblio.class-enum.attribute =
+db.biblio.class-enum.attribute =
    attribute class {
       "doi"
     | "isbn"
@@ -173,53 +150,92 @@ biblio.class-enum.attribute =
     | "pubnumber"
     | "uri" }?
 
-biblio.class-other.attributes =
+db.biblio.class-other.attributes =
    attribute class { "other" }?,
    attribute otherclass { xsd:NMTOKEN }
 
-biblio.class.attrib = (biblio.class-enum.attribute | biblio.class-other.attributes)
+db.biblio.class.attribute =
+  (db.biblio.class-enum.attribute | db.biblio.class-other.attributes)
 
 # ======================================================================
 
-ubiq.inlines     = db.inlinemediaobject | db.anchor | db.remark
+db.ubiq.inlines  = db.inlinemediaobject | db.anchor | db.remark
 
-text.phrase      = element phrase { docbook.text }
+db._text         = (text | db.ubiq.inlines | db._phrase | db.replaceable)*
 
-docbook.text     = (text | ubiq.inlines | text.phrase | db.replaceable)*
-
-# ======================================================================
-
-inlines = text | ubiq.inlines | general.inlines | domain.inlines | extension.inlines
-
-general.inlines =
-   publishing.inlines
- | product.inlines
- | bibliography.inlines
- | graphic.inlines
- | indexing.inlines
- | link.inlines
-
-domain.inlines =
-   technical.inlines
- | error.inlines
- | os.inlines
- | programming.inlines
- | markup.inlines
- | math.inlines
- | gui.inlines
- | keyboard.inlines
-
-technical.inlines =
-  db.replaceable | db.systemitem | db.option | db.optional | db.package
-
-error.inlines =
-  db.errorcode | db.errortext | db.errorname | db.errortype
+db._phrase =
+   element phrase {
+      db.phrase.attlist,
+      db._text
+   }
 
-oo.inlines = db.ooclass | db.ooexception | db.oointerface
+db._title         = db.title? & db.titleabbrev? & db.subtitle?
+db._title.req     = db.title  & db.titleabbrev? & db.subtitle?
+db._title.only    = db.title? & db.titleabbrev?
+db._title.onlyreq = db.title  & db.titleabbrev?
+
+db._info =
+   (db._title.req?, db.titleforbidden.info?) | db.info?
+
+db._info.title.req =
+   (db._title.req, db.titleforbidden.info?) | db.titlereq.info
+
+db._info.title.only =
+   (db._title.only, db.titleforbidden.info?) | db.titleonly.info
+
+db._info.title.onlyreq =
+   (db._title.onlyreq, db.titleforbidden.info?) | db.titleonlyreq.info
+
+db._info.title.forbidden = db.titleforbidden.info?
+
+# ======================================================================
+
+db.all.inlines =
+   text
+ | db.ubiq.inlines
+ | db.general.inlines
+ | db.domain.inlines
+ | db.extension.inlines
+
+db.general.inlines =
+   db.publishing.inlines
+ | db.product.inlines
+ | db.bibliography.inlines
+ | db.graphic.inlines
+ | db.indexing.inlines
+ | db.link.inlines
+
+db.domain.inlines =
+   db.technical.inlines
+ | db.error.inlines
+ | db.os.inlines
+ | db.programming.inlines
+ | db.markup.inlines
+ | db.math.inlines
+ | db.gui.inlines
+ | db.keyboard.inlines
+
+db.technical.inlines =
+   db.replaceable
+ | db.systemitem
+ | db.option
+ | db.optional
+ | db.package
+
+db.error.inlines =
+   db.errorcode
+ | db.errortext
+ | db.errorname
+ | db.errortype
+
+db.oo.inlines =
+   db.ooclass
+ | db.ooexception
+ | db.oointerface
 
 # TEI: code, programlisting (x.data)
 
-programming.inlines =
+db.programming.inlines =
    db.function
  | db.parameter
  | db.varname
@@ -231,11 +247,11 @@ programming.inlines =
  | db.methodname
  | db.modifier
  | db.initializer
- | oo.inlines
+ | db.oo.inlines
 
 # TEI: names
 
-product.inlines =
+db.product.inlines =
    db.productnumber
  | db.productname
  | db.database
@@ -245,7 +261,7 @@ product.inlines =
 
 # TEI: x.data
 
-os.inlines =
+db.os.inlines =
    db.prompt
  | db.envar
  | db.filename
@@ -255,7 +271,7 @@ os.inlines =
 
 # TEI: sgmlKeywords, ident
 
-markup.inlines =
+db.markup.inlines =
    db.tag
  | db.markup
  | db.token
@@ -267,7 +283,7 @@ markup.inlines =
 
 # TEI: no class
 
-bibliography.inlines =
+db.bibliography.inlines =
    db.citation
  | db.citerefentry
  | db.citetitle
@@ -279,7 +295,7 @@ bibliography.inlines =
 
 # TEI: hqPhrase
 
-publishing.inlines =
+db.publishing.inlines =
    db.abbrev
  | db.acronym
  | db.emphasis
@@ -294,19 +310,19 @@ publishing.inlines =
 
 # TEI: formula
 
-math.inlines = db.inlineequation
+db.math.inlines = db.inlineequation
 
 # TEI: figure
 
-graphic.inlines = db.inlinemediaobject
+db.graphic.inlines = db.inlinemediaobject
 
 # TEI: metadata
 
-indexing.inlines = notAllowed
+db.indexing.inlines = notAllowed
 
-# TEI: 
+# TEI:
 
-gui.inlines =
+db.gui.inlines =
    db.guiicon
  | db.guibutton
  | db.guimenuitem
@@ -316,7 +332,7 @@ gui.inlines =
  | db.menuchoice
  | db.mousebutton
 
-keyboard.inlines =
+db.keyboard.inlines =
    db.keycombo
  | db.keycap
  | db.keycode
@@ -324,65 +340,73 @@ keyboard.inlines =
  | db.shortcut
  | db.accel
 
-link.inlines =
+db.link.inlines =
    db.xref
  | db.uri
  | db.anchor
 
-extension.inlines = notAllowed
+db.extension.inlines = notAllowed
 
 # ======================================================================
 
-blocks.nopara =
-   list.blocks
- | admonition.blocks
- | formal.blocks
- | informal.blocks
- | publishing.blocks
- | graphic.blocks
- | technical.blocks
- | verbatim.blocks
- | synopsis.blocks
+db.nopara.blocks =
+   db.list.blocks
+ | db.admonition.blocks
+ | db.formal.blocks
+ | db.informal.blocks
+ | db.publishing.blocks
+ | db.graphic.blocks
+ | db.technical.blocks
+ | db.verbatim.blocks
+ | db.synopsis.blocks
  | db.bridgehead
  | db.remark
  | db.revhistory
  | db.highlights
 
-blocks =
-   blocks.nopara
- | para.blocks
- | extension.blocks
+db.para.blocks =
+   db.anchor
+ | db.para
+ | db.formalpara
+ | db.simpara
+
+db.all.blocks =
+   db.nopara.blocks
+ | db.para.blocks
+ | db.extension.blocks
 
-formal.blocks =
+db.formal.blocks =
    db.equation
  | db.example
  | db.figure
  | db.table
 
-informal.blocks =
+db.informal.blocks =
    db.informalequation
  | db.informalexample
  | db.informalfigure
  | db.informaltable
 
-publishing.blocks =
+db.publishing.blocks =
    db.sidebar
  | db.blockquote
  | db.address
  | db.epigraph
 
-graphic.blocks = db.mediaobject | db.screenshot
+db.graphic.blocks =
+   db.mediaobject
+ | db.screenshot
 
-technical.blocks = db.procedure
+db.technical.blocks = db.procedure
 
-admonition.blocks =
+db.admonition.blocks =
    db.caution
  | db.important
  | db.note
  | db.tip
  | db.warning
 
-list.blocks =
+db.list.blocks =
    db.itemizedlist
  | db.orderedlist
  | db.procedure
@@ -390,13 +414,13 @@ list.blocks =
  | db.variablelist
  | db.segmentedlist
 
-verbatim.blocks =
+db.verbatim.blocks =
    db.programlisting
  | db.screen
  | db.literallayout
  | db.synopsis
 
-synopsis.blocks =
+db.synopsis.blocks =
    db.cmdsynopsis
  | db.funcsynopsis
  | db.classsynopsis
@@ -405,91 +429,11 @@ synopsis.blocks =
  | db.destructorsynopsis
  | db.fieldsynopsis
 
-extension.blocks = notAllowed
-
-# ======================================================================
-
-[
-   db:refname [ "title" ]
-   db:refpurpose [ "" ]
-]
-div {
-
-   local.title.attributes = empty
-
-   title.role.attribute = attribute role { text }
-
-   title.attlist =
-      title.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.title.attributes
-
-   db.title =
-      element title {
-         title.attlist,
-         inlines*
-      }
-}
-
-# ======================================================================
-
-[
-   db:refname [ "titleabbrev" ]
-   db:refpurpose [ "" ]
-]
-div {
-
-   local.titleabbrev.attributes = empty
-
-   titleabbrev.role.attribute = attribute role { text }
-
-   titleabbrev.attlist =
-      titleabbrev.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.titleabbrev.attributes
-
-   db.titleabbrev =
-      element titleabbrev {
-         titleabbrev.attlist,
-         inlines*
-      }
-}
-
-# ======================================================================
-
-[
-   db:refname [ "subtitle" ]
-   db:refpurpose [ "" ]
-]
-div {
-
-   local.subtitle.attributes = empty
-
-   subtitle.role.attribute = attribute role { text }
-
-   subtitle.attlist =
-      subtitle.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.subtitle.attributes
-
-   db.subtitle =
-      element subtitle {
-         subtitle.attlist,
-         inlines*
-      }
-}
+db.extension.blocks = notAllowed
 
 # ======================================================================
 
-docbook.title = db.title? & db.titleabbrev? & db.subtitle?
-docbook.titlereq = db.title & db.titleabbrev? & db.subtitle?
-docbook.titleonly = db.title? & db.titleabbrev?
-docbook.titleonlyreq = db.title & db.titleabbrev?
-
-info.elements =
+db.info.elements =
    db.biblioid
  | db.bibliosource
  | db.artpagenums
@@ -517,8 +461,8 @@ info.elements =
  | db.revhistory
  | db.printhistory
 
-bibliographic.elements =
-   info.elements
+db.bibliographic.elements =
+   db.info.elements
  | db.abbrev
  | db.title
  | db.titleabbrev
@@ -534,70 +478,71 @@ bibliographic.elements =
  | db.productnumber
  | db.publishername
 
-docbook.info = (docbook.titlereq?, db.info.titleforbidden?) | db.info?
-docbook.info.titlereq = (docbook.titlereq, db.info.titleforbidden?) | db.info.titlereq
-docbook.info.titleonly = (docbook.titleonly, db.info.titleforbidden?) | db.info.titleonly
-docbook.info.titleonlyreq = (docbook.titleonlyreq, db.info.titleforbidden?) | db.info.titleonlyreq
-docbook.info.titleforbidden = db.info.titleforbidden?
-
-ctrl:alternate-define [
-   name="docbook.title"
-   rng:optional [
-      rng:ref [ name = "db.title" ]
-   ]
-   rng:optional [
-      rng:ref [ name = "db.titleabbrev" ]
-   ]
-   rng:optional [
-      rng:ref [ name = "db.subtitle" ]
-   ]
-]
-
-ctrl:alternate-define [
-   name="docbook.titlereq"
-   rng:ref [ name="db.title" ]
-   rng:optional [
-      rng:ref [ name = "db.titleabbrev" ]
-   ]
-   rng:optional [
-      rng:ref [ name = "db.subtitle" ]
-   ]
-]
-
-ctrl:alternate-define [
-   name="db.info"
-   rng:element [
-      name="info"
-      rng:zeroOrMore [
-         rng:choice [
-            rng:ref [ name = "docbook.title" ]
-            rng:ref [ name = "info.elements" ]
-         ]
-      ]
-   ]
-]
+# ======================================================================
 
-ctrl:alternate-define [
-   name = "docbook.info"
-   rng:optional [
-      rng:ref [ name = "db.info" ]
-   ]
+[
+   db:refname [ "title" ]
+   db:refpurpose [ "" ]
 ]
+div {
+
+   db.title.role.attribute = attribute role { text }
 
-ctrl:alternate-define [
-   name = "docbook.info.titlereq"
-   rng:ref [ name = "docbook.titlereq" ]
-   rng:optional [
-      rng:ref [ name = "db.info" ]
-   ]
+   db.title.attlist =
+      db.title.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+
+   db.title =
+      element title {
+         db.title.attlist,
+         db.all.inlines*
+      }
+}
+
+# ======================================================================
+
+[
+   db:refname [ "titleabbrev" ]
+   db:refpurpose [ "" ]
 ]
+div {
 
-ctrl:alternate-define [
-   name = "docbook.info.titleforbidden"
-   rng:optional [
-      rng:ref [ name = "db.info" ]
-   ]
+   db.titleabbrev.role.attribute = attribute role { text }
+
+   db.titleabbrev.attlist =
+      db.titleabbrev.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+
+   db.titleabbrev =
+      element titleabbrev {
+         db.titleabbrev.attlist,
+         db.all.inlines*
+      }
+}
+
+# ======================================================================
+
+[
+   db:refname [ "subtitle" ]
+   db:refpurpose [ "" ]
 ]
+div {
+
+   db.subtitle.role.attribute = attribute role { text }
+
+   db.subtitle.attlist =
+      db.subtitle.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+
+   db.subtitle =
+      element subtitle {
+         db.subtitle.attlist,
+         db.all.inlines*
+      }
+}
 
 # ======================================================================
 
@@ -607,20 +552,17 @@ ctrl:alternate-define [
 ]
 div {
 
-   local.info.attributes = empty
-
-   info.role.attribute = attribute role { text }
+   db.info.role.attribute = attribute role { text }
 
-   info.attlist =
-      info.role.attribute?
-    & common.attributes
-    & local.info.attributes
+   db.info.attlist =
+      db.info.role.attribute?
+    & db.common.attributes
 
    db.info =
       element info {
-         info.attlist,
-         docbook.title,
-         info.elements*
+         db.info.attlist,
+         db._title,
+         db.info.elements*
       }
 }
 
@@ -632,20 +574,17 @@ div {
 ]
 div {
 
-   local.info.titlereq.attributes = empty
+   db.titlereq.info.role.attribute = attribute role { text }
 
-   info.titlereq.role.attribute = attribute role { text }
+   db.titlereq.info.attlist =
+      db.titlereq.info.role.attribute?
+    & db.common.attributes
 
-   info.titlereq.attlist =
-      info.titlereq.role.attribute?
-    & common.attributes
-    & local.info.titlereq.attributes
-
-   db.info.titlereq =
+   db.titlereq.info =
       element info {
-         info.titlereq.attlist,
-         docbook.titlereq,
-         info.elements*
+         db.titlereq.info.attlist,
+         db._title.req,
+         db.info.elements*
       }
 }
 
@@ -657,20 +596,17 @@ div {
 ]
 div {
 
-   local.info.titleonly.attributes = empty
-
-   info.titleonly.role.attribute = attribute role { text }
+   db.titleonly.info.role.attribute = attribute role { text }
 
-   info.titleonly.attlist =
-      info.titleonly.role.attribute?
-    & common.attributes
-    & local.info.titleonly.attributes
+   db.titleonly.info.attlist =
+      db.titleonly.info.role.attribute?
+    & db.common.attributes
 
-   db.info.titleonly =
+   db.titleonly.info =
       element info {
-         info.titleonly.attlist,
-         docbook.titleonly,
-         info.elements*
+         db.titleonly.info.attlist,
+         db._title.only,
+         db.info.elements*
       }
 }
 
@@ -682,20 +618,17 @@ div {
 ]
 div {
 
-   local.info.titleonlyreq.attributes = empty
-
-   info.titleonlyreq.role.attribute = attribute role { text }
+   db.titleonlyreq.info.role.attribute = attribute role { text }
 
-   info.titleonlyreq.attlist =
-      info.titleonlyreq.role.attribute?
-    & common.attributes
-    & local.info.titleonlyreq.attributes
+   db.titleonlyreq.info.attlist =
+      db.titleonlyreq.info.role.attribute?
+    & db.common.attributes
 
-   db.info.titleonlyreq =
+   db.titleonlyreq.info =
       element info {
-         info.titleonlyreq.attlist,
-         docbook.titleonlyreq,
-         info.elements*
+         db.titleonlyreq.info.attlist,
+         db._title.onlyreq,
+         db.info.elements*
       }
 }
 
@@ -707,19 +640,16 @@ div {
 ]
 div {
 
-   local.info.titleforbidden.attributes = empty
+   db.titleforbidden.info.role.attribute = attribute role { text }
 
-   info.titleforbidden.role.attribute = attribute role { text }
+   db.titleforbidden.info.attlist =
+      db.titleforbidden.info.role.attribute?
+    & db.common.attributes
 
-   info.titleforbidden.attlist =
-      info.titleforbidden.role.attribute?
-    & common.attributes
-    & local.info.titleforbidden.attributes
-
-   db.info.titleforbidden =
+   db.titleforbidden.info =
       element info {
-         info.titleforbidden.attlist,
-         info.elements*
+         db.titleforbidden.info.attlist,
+         db.info.elements*
       }
 }
 
@@ -731,20 +661,17 @@ div {
 ]
 div {
 
-   local.subjectset.attributes = empty
-
-   subjectset.role.attribute = attribute role { text }
+   db.subjectset.role.attribute = attribute role { text }
 
-   subjectset.attlist =
-      subjectset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.subjectset.attlist =
+      db.subjectset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute scheme { xsd:NMTOKEN }?
-    & local.subjectset.attributes
 
    db.subjectset =
       element subjectset {
-         subjectset.attlist,
+         db.subjectset.attlist,
          db.subject+
       }
 }
@@ -757,20 +684,17 @@ div {
 ]
 div {
 
-   local.subject.attributes = empty
-
-   subject.role.attribute = attribute role { text }
+   db.subject.role.attribute = attribute role { text }
 
-   subject.attlist =
-      subject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.subject.attlist =
+      db.subject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute weight { text }?
-    & local.subject.attributes
 
    db.subject =
       element subject {
-         subject.attlist,
+         db.subject.attlist,
          db.subjectterm+
       }
 }
@@ -783,19 +707,16 @@ div {
 ]
 div {
 
-   local.subjectterm.attributes = empty
+   db.subjectterm.role.attribute = attribute role { text }
 
-   subjectterm.role.attribute = attribute role { text }
-
-   subjectterm.attlist =
-      subjectterm.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.subjectterm.attributes
+   db.subjectterm.attlist =
+      db.subjectterm.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.subjectterm =
       element subjectterm {
-         subjectterm.attlist,
+         db.subjectterm.attlist,
          text
       }
 }
@@ -808,18 +729,15 @@ div {
 ]
 div {
 
-   local.keywordset.attributes = empty
-
-   keywordset.role.attribute = attribute role { text }
+   db.keywordset.role.attribute = attribute role { text }
 
-   keywordset.attlist =
-      keywordset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.keywordset.attributes
+   db.keywordset.attlist =
+      db.keywordset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.keywordset = element keywordset {
-      keywordset.attlist,
+      db.keywordset.attlist,
       db.keyword+
    }
 }
@@ -832,29 +750,26 @@ div {
 ]
 div {
 
-   local.keyword.attributes = empty
-
-   keyword.role.attribute = attribute role { text }
+   db.keyword.role.attribute = attribute role { text }
 
-   keyword.attlist =
-      keyword.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.keyword.attributes
+   db.keyword.attlist =
+      db.keyword.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.keyword = element keyword {
-      keyword.attlist,
+      db.keyword.attlist,
       text
    }
 }
 
 # ======================================================================
 
-table.choice = notAllowed
-informaltable.choice = notAllowed
+db.table.choice = notAllowed
+db.informaltable.choice = notAllowed
 
-db.table = table.choice
-db.informaltable = informaltable.choice
+db.table = db.table.choice
+db.informaltable = db.informaltable.choice
 
 # ======================================================================
 
@@ -864,58 +779,48 @@ db.informaltable = informaltable.choice
 ]
 div {
 
-   local.procedure.attributes = empty
+   db.procedure.role.attribute = attribute role { text }
 
-   procedure.role.attribute = attribute role { text }
+   db.procedure.attlist =
+      db.procedure.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   procedure.attlist =
-      procedure.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.procedure.attributes
-
-   procedure.info = docbook.info.titleonly
+   db.procedure.info = db._info.title.only
 
    db.procedure =
       element procedure {
-         procedure.attlist,
-         procedure.info,
-         blocks*,
+         db.procedure.attlist,
+         db.procedure.info,
+         db.all.blocks*,
          db.step+
       }
 }
 
 # ======================================================================
 
-performance.attribute = attribute performance { "optional" | "required" }
-
-# ======================================================================
-
 [
    db:refname [ "step" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.step.attributes = empty
-
-   step.role.attribute = attribute role { text }
+   db.step.role.attribute = attribute role { text }
 
-   step.attlist =
-      step.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & performance.attribute?
-    & local.step.attributes
+   db.step.attlist =
+      db.step.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.performance.attribute?
 
-   step.info = docbook.info.titleonly
+   db.step.info = db._info.title.only
 
    db.step = element step {
-      step.attlist,
-      step.info,
-      blocks*,
+      db.step.attlist,
+      db.step.info,
+      db.all.blocks*,
       (db.substeps|db.stepalternatives)?,
-      blocks*
+      db.all.blocks*
    }
 }
 
@@ -927,23 +832,20 @@ div {
 ]
 div {
 
-   local.stepalternatives.attributes = empty
-
-   stepalternatives.role.attribute = attribute role { text }
+   db.stepalternatives.role.attribute = attribute role { text }
 
-   stepalternatives.attlist =
-      stepalternatives.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & performance.attribute?
-    & local.stepalternatives.attributes
+   db.stepalternatives.attlist =
+      db.stepalternatives.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.performance.attribute?
 
-   stepalternatives.info = docbook.info.titleforbidden
+   db.stepalternatives.info = db._info.title.forbidden
 
    db.stepalternatives =
       element stepalternatives {
-         stepalternatives.attlist,
-         stepalternatives.info,
+         db.stepalternatives.attlist,
+         db.stepalternatives.info,
          db.step+
       }
 }
@@ -956,20 +858,17 @@ div {
 ]
 div {
 
-   local.substeps.attributes = empty
+   db.substeps.role.attribute = attribute role { text }
 
-   substeps.role.attribute = attribute role { text }
-
-   substeps.attlist =
-      substeps.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & performance.attribute?
-    & local.substeps.attributes
+   db.substeps.attlist =
+      db.substeps.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.performance.attribute?
 
    db.substeps =
       element substeps {
-         substeps.attlist,
+         db.substeps.attlist,
          db.step+
       }
 }
@@ -982,25 +881,22 @@ div {
 ]
 div {
 
-   local.sidebar.attributes = empty
-
    ctrl:exclude [ from="db.sidebar" exclude="db.sidebar" ]
 
-   sidebar.role.attribute = attribute role { text }
+   db.sidebar.role.attribute = attribute role { text }
 
-   sidebar.attlist =
-      sidebar.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.sidebar.attributes
+   db.sidebar.attlist =
+      db.sidebar.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   sidebar.info = docbook.info.titleonly
+   db.sidebar.info = db._info.title.only
 
    db.sidebar =
       element sidebar {
-         sidebar.attlist,
-         sidebar.info,
-         blocks+
+         db.sidebar.attlist,
+         db.sidebar.info,
+         db.all.blocks+
       }
 }
 
@@ -1012,22 +908,19 @@ div {
 ]
 div {
 
-   local.abstract.attributes = empty
-
-   abstract.role.attribute = attribute role { text }
+   db.abstract.role.attribute = attribute role { text }
 
-   abstract.attlist =
-      abstract.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.abstract.attributes
+   db.abstract.attlist =
+      db.abstract.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   abstract.info = docbook.info.titleonly
+   db.abstract.info = db._info.title.only
 
    db.abstract = element abstract {
-      abstract.attlist,
-      abstract.info,
-      para.blocks+
+      db.abstract.attlist,
+      db.abstract.info,
+      db.para.blocks+
    }
 }
 
@@ -1039,23 +932,20 @@ div {
 ]
 div {
 
-   local.personblurb.attributes = empty
+   db.personblurb.role.attribute = attribute role { text }
 
-   personblurb.role.attribute = attribute role { text }
+   db.personblurb.attlist =
+      db.personblurb.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   personblurb.attlist =
-      personblurb.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.personblurb.attributes
-
-   personblurb.info = docbook.info.titleonly
+   db.personblurb.info = db._info.title.only
 
    db.personblurb =
       element personblurb {
-         personblurb.attlist,
-         personblurb.info,
-         para.blocks+
+         db.personblurb.attlist,
+         db.personblurb.info,
+         db.para.blocks+
       }
 }
 
@@ -1067,24 +957,21 @@ div {
 ]
 div {
 
-   local.blockquote.attributes = empty
-
-   blockquote.role.attribute = attribute role { text }
+   db.blockquote.role.attribute = attribute role { text }
 
-   blockquote.attlist =
-      blockquote.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.blockquote.attributes
+   db.blockquote.attlist =
+      db.blockquote.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   blockquote.info = docbook.info.titleonly
+   db.blockquote.info = db._info.title.only
 
    db.blockquote =
       element blockquote {
-         blockquote.attlist,
-         blockquote.info,
+         db.blockquote.attlist,
+         db.blockquote.info,
          db.attribution?,
-         blocks+
+         db.all.blocks+
       }
 }
 
@@ -1096,57 +983,40 @@ div {
 ]
 div {
 
-   local.attribution.attributes = empty
-
-   attribution.role.attribute = attribute role { text }
+   db.attribution.role.attribute = attribute role { text }
 
-   attribution.attlist =
-      attribution.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.attribution.attributes
+   db.attribution.attlist =
+      db.attribution.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.attribution =
       element attribution {
-         attribution.attlist,
-         (docbook.text | db.personname)
+         db.attribution.attlist,
+         (db._text | db.personname)
       }
 }
 
 # ======================================================================
 
-renderas.attribute =
-   attribute renderas {
-      "other"
-    | "sect1"
-    | "sect2"
-    | "sect3"
-    | "sect4"
-    | "sect5" }
-
-# ======================================================================
-
 [
    db:refname [ "bridgehead" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.bridgehead.attributes = empty
+   db.bridgehead.role.attribute = attribute role { text }
 
-   bridgehead.role.attribute = attribute role { text }
-
-   bridgehead.attlist =
-      bridgehead.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & renderas.attribute?
-    & local.bridgehead.attributes
+   db.bridgehead.attlist =
+      db.bridgehead.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & attribute renderas { "other" | "sect1" | "sect2" | "sect3" | "sect4" | "sect5"  }
 
    db.bridgehead =
       element bridgehead {
-         bridgehead.attlist,
-         inlines*
+         db.bridgehead.attlist,
+         db.all.inlines*
       }
 }
 
@@ -1158,19 +1028,16 @@ div {
 ]
 div {
 
-   local.remark.attributes = empty
-
-   remark.role.attribute = attribute role { text }
+   db.remark.role.attribute = attribute role { text }
 
-   remark.attlist =
-      remark.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.remark.attributes
+   db.remark.attlist =
+      db.remark.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.remark = element remark {
-      remark.attlist,
-      docbook.text
+      db.remark.attlist,
+      db._text
    }
 }
 
@@ -1182,24 +1049,21 @@ div {
 ]
 div {
 
-   local.epigraph.attributes = empty
-
-   epigraph.role.attribute = attribute role { text }
+   db.epigraph.role.attribute = attribute role { text }
 
-   epigraph.attlist =
-      epigraph.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.epigraph.attributes
+   db.epigraph.attlist =
+      db.epigraph.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   epigraph.info = docbook.info.titleforbidden
+   db.epigraph.info = db._info.title.forbidden
 
    db.epigraph =
       element epigraph {
-         epigraph.attlist,
-         epigraph.info,
+         db.epigraph.attlist,
+         db.epigraph.info,
          db.attribution?,
-         (para.blocks | db.literallayout)+
+         (db.para.blocks | db.literallayout)+
       }
 }
 
@@ -1211,23 +1075,20 @@ div {
 ]
 div {
 
-   local.footnote.attributes = empty
-
    ctrl:exclude [ from="db.footnote" exclude="db.footnote" ]
 
-   footnote.role.attribute = attribute role { text }
+   db.footnote.role.attribute = attribute role { text }
 
-   footnote.attlist =
-      footnote.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.footnote.attlist =
+      db.footnote.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute label { text }?
-    & local.footnote.attributes
 
    db.footnote =
       element footnote {
-         footnote.attlist,
-         blocks+
+         db.footnote.attlist,
+         db.all.blocks+
       }
 }
 
@@ -1239,56 +1100,42 @@ div {
 ]
 div {
 
-   local.highlights.attributes = empty
-
-   highlights.role.attribute = attribute role { text }
+   db.highlights.role.attribute = attribute role { text }
 
-   highlights.attlist =
-      highlights.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.highlights.attributes
+   db.highlights.attlist =
+      db.highlights.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.highlights =
       element highlights {
-         highlights.attlist,
-         (list.blocks | admonition.blocks | para.blocks | indexing.inlines)+
+         db.highlights.attlist,
+         (db.list.blocks | db.admonition.blocks | db.para.blocks | db.indexing.inlines)+
       }
 }
 
 # ======================================================================
 
-para.blocks =
-   db.anchor
- | db.para
- | db.formalpara
- | db.simpara
-
-# ======================================================================
-
 [
    db:refname [ "formalpara" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.formalpara.attributes = empty
+   db.formalpara.role.attribute = attribute role { text }
 
-   formalpara.role.attribute = attribute role { text }
+   db.formalpara.attlist =
+      db.formalpara.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   formalpara.attlist =
-      formalpara.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.formalpara.attributes
-
-   formalpara.info = docbook.info.titleonlyreq
+   db.formalpara.info = db._info.title.onlyreq
 
    db.formalpara =
       element formalpara {
-         formalpara.attlist,
-         formalpara.info,
-         indexing.inlines*,
+         db.formalpara.attlist,
+         db.formalpara.info,
+         db.indexing.inlines*,
          db.para
       }
 }
@@ -1301,23 +1148,20 @@ div {
 ]
 div {
 
-   local.para.attributes = empty
-
-   para.role.attribute = attribute role { text }
+   db.para.role.attribute = attribute role { text }
 
-   para.attlist =
-      para.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.para.attributes
+   db.para.attlist =
+      db.para.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   para.info = docbook.info.titleforbidden
+   db.para.info = db._info.title.forbidden
 
    db.para =
       element para {
-         para.attlist,
-         para.info,
-         (inlines | blocks.nopara)*
+         db.para.attlist,
+         db.para.info,
+         (db.all.inlines | db.nopara.blocks)*
       }
 }
 
@@ -1329,23 +1173,20 @@ div {
 ]
 div {
 
-   local.simpara.attributes = empty
-
-   simpara.role.attribute = attribute role { text }
+   db.simpara.role.attribute = attribute role { text }
 
-   simpara.attlist =
-      simpara.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.simpara.attributes
+   db.simpara.attlist =
+      db.simpara.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   simpara.info = docbook.info.titleforbidden
+   db.simpara.info = db._info.title.forbidden
 
    db.simpara =
       element simpara {
-         simpara.attlist,
-         simpara.info,
-         inlines*
+         db.simpara.attlist,
+         db.simpara.info,
+         db.all.inlines*
       }
 }
 
@@ -1353,7 +1194,7 @@ div {
 
 ctrl:exclude [ from="admonition.blocks" exclude="admonition.blocks" ]
 
-admonition.contentmodel = docbook.info.titleonly, blocks+
+db.admonition.contentmodel = db.titleonly.info, db.all.blocks+
 
 # ======================================================================
 
@@ -1363,20 +1204,17 @@ admonition.contentmodel = docbook.info.titleonly, blocks+
 ]
 div {
 
-   local.caution.attributes = empty
+   db.caution.role.attribute = attribute role { text }
 
-   caution.role.attribute = attribute role { text }
-
-   caution.attlist =
-      caution.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.caution.attributes
+   db.caution.attlist =
+      db.caution.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.caution =
       element caution {
-         caution.attlist,
-         admonition.contentmodel
+         db.caution.attlist,
+         db.admonition.contentmodel
       }
 }
 
@@ -1388,20 +1226,17 @@ div {
 ]
 div {
 
-   local.important.attributes = empty
-
-   important.role.attribute = attribute role { text }
+   db.important.role.attribute = attribute role { text }
 
-   important.attlist =
-      important.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.important.attributes
+   db.important.attlist =
+      db.important.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.important =
       element important {
-         important.attlist,
-         admonition.contentmodel
+         db.important.attlist,
+         db.admonition.contentmodel
       }
 }
 
@@ -1413,20 +1248,17 @@ div {
 ]
 div {
 
-   local.note.attributes = empty
-
-   note.role.attribute = attribute role { text }
+   db.note.role.attribute = attribute role { text }
 
-   note.attlist =
-      note.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.note.attributes
+   db.note.attlist =
+      db.note.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.note =
       element note {
-         note.attlist,
-         admonition.contentmodel
+         db.note.attlist,
+         db.admonition.contentmodel
       }
 }
 
@@ -1438,20 +1270,17 @@ div {
 ]
 div {
 
-   local.tip.attributes = empty
+   db.tip.role.attribute = attribute role { text }
 
-   tip.role.attribute = attribute role { text }
-
-   tip.attlist =
-      tip.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.tip.attributes
+   db.tip.attlist =
+      db.tip.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.tip =
       element tip {
-         tip.attlist,
-         admonition.contentmodel
+         db.tip.attlist,
+         db.admonition.contentmodel
       }
 }
 
@@ -1463,54 +1292,44 @@ div {
 ]
 div {
 
-   local.warning.attributes = empty
-
-   warning.role.attribute = attribute role { text }
+   db.warning.role.attribute = attribute role { text }
 
-   warning.attlist =
-      warning.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.warning.attributes
+   db.warning.attlist =
+      db.warning.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.warning =
       element warning {
-         warning.attlist,
-         admonition.contentmodel
+         db.warning.attlist,
+         db.admonition.contentmodel
       }
 }
 
 # ======================================================================
 
-spacing.attribute = attribute spacing { "compact" | "normal" }
-
-# ======================================================================
-
 [
    db:refname [ "itemizedlist" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.itemizedlist.attributes = empty
-
-   itemizedlist.role.attribute = attribute role { text }
+   db.itemizedlist.role.attribute = attribute role { text }
 
-   itemizedlist.attlist =
-      itemizedlist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & spacing.attribute?
+   db.itemizedlist.attlist =
+      db.itemizedlist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.spacing.attribute?
     & attribute mark { text }?
-    & local.itemizedlist.attributes
 
-   itemizedlist.info = docbook.info.titleonly
+   db.itemizedlist.info = db._info.title.only
 
    db.itemizedlist =
       element itemizedlist {
-         itemizedlist.attlist,
-         itemizedlist.info,
-         blocks*,
+         db.itemizedlist.attlist,
+         db.itemizedlist.info,
+         db.all.blocks*,
          db.listitem+
       }
 }
@@ -1523,26 +1342,23 @@ div {
 ]
 div {
 
-   local.orderedlist.attributes = empty
+   db.orderedlist.role.attribute = attribute role { text }
 
-   orderedlist.role.attribute = attribute role { text }
-
-   orderedlist.attlist =
-      orderedlist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & spacing.attribute?
-    & continuation.attribute?
+   db.orderedlist.attlist =
+      db.orderedlist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.spacing.attribute?
+    & attribute continuation { "continues" | "restarts" }?
     & attribute inheritnum { "ignore" | "inherit" }?
     & attribute numeration { text }?
-    & local.orderedlist.attributes
 
-   orderedlist.info = docbook.info.titleonly
+   db.orderedlist.info = db._info.title.only
 
    db.orderedlist = element orderedlist {
-      orderedlist.attlist,
-      orderedlist.info,
-      blocks*,
+      db.orderedlist.attlist,
+      db.orderedlist.info,
+      db.all.blocks*,
       db.listitem+
    }
 }
@@ -1555,20 +1371,17 @@ div {
 ]
 div {
 
-   local.listitem.attributes = empty
-
-   listitem.role.attribute = attribute role { text }
+   db.listitem.role.attribute = attribute role { text }
 
-   listitem.attlist =
-      listitem.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.listitem.attlist =
+      db.listitem.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute override { text }?
-    & local.listitem.attributes
 
    db.listitem = element listitem {
-      listitem.attlist,
-      blocks+
+      db.listitem.attlist,
+      db.all.blocks+
    }
 }
 
@@ -1580,22 +1393,19 @@ div {
 ]
 div {
 
-   local.segmentedlist.attributes = empty
-
-   segmentedlist.role.attribute = attribute role { text }
+   db.segmentedlist.role.attribute = attribute role { text }
 
-   segmentedlist.attlist =
-      segmentedlist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.segmentedlist.attributes
+   db.segmentedlist.attlist =
+      db.segmentedlist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   segmentedlist.info = docbook.info.titleonly
+   db.segmentedlist.info = db._info.title.only
 
    db.segmentedlist =
       element segmentedlist {
-         segmentedlist.attlist,
-         segmentedlist.info,
+         db.segmentedlist.attlist,
+         db.segmentedlist.info,
          db.segtitle+,
          db.seglistitem+
       }
@@ -1609,20 +1419,17 @@ div {
 ]
 div {
 
-   local.segtitle.attributes = empty
+   db.segtitle.role.attribute = attribute role { text }
 
-   segtitle.role.attribute = attribute role { text }
-
-   segtitle.attlist =
-      segtitle.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.segtitle.attributes
+   db.segtitle.attlist =
+      db.segtitle.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.segtitle =
       element segtitle {
-         segtitle.attlist,
-         inlines*
+         db.segtitle.attlist,
+         db.all.inlines*
       }
 }
 
@@ -1634,15 +1441,12 @@ div {
 ]
 div {
 
-   local.seglistitem.attributes = empty
-
-   seglistitem.role.attribute = attribute role { text }
+   db.seglistitem.role.attribute = attribute role { text }
 
-   seglistitem.attlist =
-      seglistitem.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.seglistitem.attributes
+   db.seglistitem.attlist =
+      db.seglistitem.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
 
    db.seglistitem =
@@ -1656,7 +1460,7 @@ div {
          ]
       ]
       element seglistitem {
-         seglistitem.attlist,
+         db.seglistitem.attlist,
          db.seg+
       }
 }
@@ -1669,19 +1473,16 @@ div {
 ]
 div {
 
-   local.seg.attributes = empty
-
-   seg.role.attribute = attribute role { text }
+   db.seg.role.attribute = attribute role { text }
 
-   seg.attlist =
-      seg.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.seg.attributes
+   db.seg.attlist =
+      db.seg.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.seg = element seg {
-      seg.attlist,
-      inlines*
+      db.seg.attlist,
+      db.all.inlines*
    }
 }
 
@@ -1693,21 +1494,18 @@ div {
 ]
 div {
 
-   local.simplelist.attributes = empty
+   db.simplelist.role.attribute = attribute role { text }
 
-   simplelist.role.attribute = attribute role { text }
-
-   simplelist.attlist =
-      simplelist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.simplelist.attlist =
+      db.simplelist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute type { "horiz" | "vert" | "inline" }?
     & attribute columns { xsd:integer}?
-    & local.simplelist.attributes
 
    db.simplelist =
       element simplelist {
-         simplelist.attlist,
+         db.simplelist.attlist,
          db.member+
       }
 }
@@ -1720,20 +1518,17 @@ div {
 ]
 div {
 
-   local.member.attributes = empty
-
-   member.role.attribute = attribute role { text }
+   db.member.role.attribute = attribute role { text }
 
-   member.attlist =
-      member.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.member.attributes
+   db.member.attlist =
+      db.member.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.member =
       element member {
-         member.attlist,
-         inlines*
+         db.member.attlist,
+         db.all.inlines*
       }
 }
 
@@ -1745,25 +1540,22 @@ div {
 ]
 div {
 
-   local.variablelist.attributes = empty
-
-   variablelist.role.attribute = attribute role { text }
+   db.variablelist.role.attribute = attribute role { text }
 
-   variablelist.attlist =
-      variablelist.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & spacing.attribute?
+   db.variablelist.attlist =
+      db.variablelist.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.spacing.attribute?
     & attribute termlength { text }?
-    & local.variablelist.attributes
 
-   variablelist.info = docbook.info.titleonly
+   db.variablelist.info = db._info.title.only
 
    db.variablelist =
       element variablelist {
-         variablelist.attlist,
-         variablelist.info,
-         blocks*,
+         db.variablelist.attlist,
+         db.variablelist.info,
+         db.all.blocks*,
          db.varlistentry+
       }
 }
@@ -1776,19 +1568,16 @@ div {
 ]
 div {
 
-   local.varlistentry.attributes = empty
+   db.varlistentry.role.attribute = attribute role { text }
 
-   varlistentry.role.attribute = attribute role { text }
-
-   varlistentry.attlist =
-      varlistentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.varlistentry.attributes
+   db.varlistentry.attlist =
+      db.varlistentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.varlistentry =
       element varlistentry {
-         varlistentry.attlist,
+         db.varlistentry.attlist,
          db.term+,
          db.listitem
       }
@@ -1802,56 +1591,46 @@ div {
 ]
 div {
 
-   local.term.attributes = empty
-
-   term.role.attribute = attribute role { text }
+   db.term.role.attribute = attribute role { text }
 
-   term.attlist =
-      term.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.term.attributes
+   db.term.attlist =
+      db.term.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.term =
       element term {
-         term.attlist,
-         inlines*
+         db.term.attlist,
+         db.all.inlines*
       }
 }
 
 # ======================================================================
 
-floatstyle.attribute = attribute floatstyle { text }
-
-# ======================================================================
-
 [
    db:refname [ "example" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.example.attributes = empty
-
-   example.role.attribute = attribute role { text }
+   db.example.role.attribute = attribute role { text }
 
-   example.attlist =
-      example.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.example.attlist =
+      db.example.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute label { text }?
-    & floatstyle.attribute?
-    & float.attribute?
+    & db.floatstyle.attribute?
+    & db.float.attribute?
     & attribute width { text }?
-    & local.example.attributes
 
-   example.info = docbook.info.titleonlyreq
+   db.example.info = db._info.title.onlyreq
 
    db.example =
       element example {
-         example.attlist,
-         example.info,
-         blocks+
+         db.example.attlist,
+         db.example.info,
+         db.all.blocks+
       }
 }
 
@@ -1863,33 +1642,31 @@ div {
 ]
 div {
 
-   local.informalexample.attributes = empty
+   db.informalexample.role.attribute = attribute role { text }
 
-   informalexample.role.attribute = attribute role { text }
-
-   informalexample.attlist =
-      informalexample.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & floatstyle.attribute?
+   db.informalexample.attlist =
+      db.informalexample.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.floatstyle.attribute?
     & attribute width { text }?
-    & local.informalexample.attributes
 
-   informalexample.info = docbook.info.titleforbidden
+   db.informalexample.info = db._info.title.forbidden
 
    db.informalexample =
       element informalexample {
-         informalexample.attlist,
-         informalexample.info,
-         blocks+
+         db.informalexample.attlist,
+         db.informalexample.info,
+         db.all.blocks+
       }
 }
 
 # ======================================================================
 
-verbatim.inlines = inlines | db.lineannotation
+db.verbatim.inlines = db.all.inlines | db.lineannotation
 
-verbatim.contentmodel = docbook.info.titleforbidden, (db.textobject|verbatim.inlines*)
+db.verbatim.contentmodel =
+   db._info.title.forbidden, (db.textobject|db.verbatim.inlines*)
 
 # ======================================================================
 
@@ -1899,22 +1676,19 @@ verbatim.contentmodel = docbook.info.titleforbidden, (db.textobject|verbatim.inl
 ]
 div {
 
-   local.programlisting.attributes = empty
-
-   programlisting.role.attribute = attribute role { text }
+   db.programlisting.role.attribute = attribute role { text }
 
-   programlisting.attlist =
-      programlisting.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
+   db.programlisting.attlist =
+      db.programlisting.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
     & attribute width { text }?
-    & local.programlisting.attributes
 
    db.programlisting =
       element programlisting {
-         programlisting.attlist,
-         verbatim.contentmodel
+         db.programlisting.attlist,
+         db.verbatim.contentmodel
       }
 }
 
@@ -1926,22 +1700,19 @@ div {
 ]
 div {
 
-   local.literallayout.attributes = empty
-
-   literallayout.role.attribute = attribute role { text }
+   db.literallayout.role.attribute = attribute role { text }
 
-   literallayout.attlist =
-      literallayout.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
+   db.literallayout.attlist =
+      db.literallayout.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
     & attribute class { "monospaced" | "normal" }?
-    & local.literallayout.attributes
 
    db.literallayout =
       element literallayout {
-         literallayout.attlist,
-         verbatim.contentmodel
+         db.literallayout.attlist,
+         db.verbatim.contentmodel
       }
 }
 
@@ -1953,54 +1724,44 @@ div {
 ]
 div {
 
-   local.screen.attributes = empty
+   db.screen.role.attribute = attribute role { text }
 
-   screen.role.attribute = attribute role { text }
-
-   screen.attlist =
-      screen.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
+   db.screen.attlist =
+      db.screen.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
     & attribute width { text }?
-    & local.screen.attributes
 
    db.screen =
       element screen {
-         screen.attlist,
-         verbatim.contentmodel
+         db.screen.attlist,
+         db.verbatim.contentmodel
       }
 }
 
 # ======================================================================
 
-screenshot.block = db.mediaobject
-
-# ======================================================================
-
 [
    db:refname [ "screenshot" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.screenshot.attributes = empty
-
-   screenshot.role.attribute = attribute role { text }
+   db.screenshot.role.attribute = attribute role { text }
 
-   screenshot.attlist =
-      screenshot.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.screenshot.attributes
+   db.screenshot.attlist =
+      db.screenshot.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   screenshot.info = docbook.info
+   db.screenshot.info = db._info
 
    db.screenshot =
       element screenshot {
-         screenshot.attlist,
-         screenshot.info,
-         screenshot.block
+         db.screenshot.attlist,
+         db.screenshot.info,
+         db.mediaobject
       }
 }
 
@@ -2012,27 +1773,24 @@ div {
 ]
 div {
 
-   local.figure.attributes = empty
-
-   figure.role.attribute = attribute role { text }
+   db.figure.role.attribute = attribute role { text }
 
-   figure.attlist =
-      figure.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.figure.attlist =
+      db.figure.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute label { text }?
-    & pgwide.attribute?
-    & floatstyle.attribute?
-    & float.attribute?
-    & local.figure.attributes
+    & db.pgwide.attribute?
+    & db.floatstyle.attribute?
+    & db.float.attribute?
 
-   figure.info = docbook.info.titleonlyreq
+   db.figure.info = db._info.title.onlyreq
 
    db.figure =
       element figure {
-         figure.attlist,
-         figure.info,
-         blocks+
+         db.figure.attlist,
+         db.figure.info,
+         db.all.blocks+
       }
 }
 
@@ -2044,33 +1802,30 @@ div {
 ]
 div {
 
-   local.informalfigure.attributes = empty
+   db.informalfigure.role.attribute = attribute role { text }
 
-   informalfigure.role.attribute = attribute role { text }
-
-   informalfigure.attlist =
-      informalfigure.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.informalfigure.attlist =
+      db.informalfigure.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute label { text }?
-    & pgwide.attribute?
-    & floatstyle.attribute?
-    & float.attribute?
-    & local.informalfigure.attributes
+    & db.pgwide.attribute?
+    & db.floatstyle.attribute?
+    & db.float.attribute?
 
-   informalfigure.info = docbook.info.titleforbidden
+   db.informalfigure.info = db._info.title.forbidden
 
    db.informalfigure =
       element informalfigure {
-         informalfigure.attlist,
-         informalfigure.info,
-         blocks+
+         db.informalfigure.attlist,
+         db.informalfigure.info,
+         db.all.blocks+
       }
 }
 
 # ======================================================================
 
-mediaobject.content =
+db.mediaobject.contentmodel =
    db.videoobject | db.audioobject | db.imageobject | db.textobject
 
 # ======================================================================
@@ -2081,56 +1836,45 @@ mediaobject.content =
 ]
 div {
 
-   local.mediaobject.attributes = empty
-
-   mediaobject.role.attribute = attribute role { text }
+   db.mediaobject.role.attribute = attribute role { text }
 
-   mediaobject.attlist =
-      mediaobject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.mediaobject.attributes
+   db.mediaobject.attlist =
+      db.mediaobject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   mediaobject.info = docbook.info.titleforbidden
+   db.mediaobject.info = db._info.title.forbidden
 
    db.mediaobject =
       element mediaobject {
-         mediaobject.attlist,
-         mediaobject.info,
-         mediaobject.content+
+         db.mediaobject.attlist,
+         db.mediaobject.info,
+         db.mediaobject.contentmodel+
       }
 }
 
 # ======================================================================
 
-inlinemediaobject.content =
-   db.videoobject | db.audioobject | db.imageobject | db.textobject
-
-# ======================================================================
-
 [
    db:refname [ "inlinemediaobject" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.inlinemediaobject.attributes = empty
+   db.inlinemediaobject.role.attribute = attribute role { text }
 
-   inlinemediaobject.role.attribute = attribute role { text }
+   db.inlinemediaobject.attlist =
+      db.inlinemediaobject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   inlinemediaobject.attlist =
-      inlinemediaobject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.inlinemediaobject.attributes
-
-   inlinemediaobject.info = docbook.info.titleforbidden
+   db.inlinemediaobject.info = db._info.title.forbidden
 
    db.inlinemediaobject =
       element inlinemediaobject {
-         inlinemediaobject.attlist,
-         inlinemediaobject.info,
-         inlinemediaobject.content+
+         db.inlinemediaobject.attlist,
+         db.inlinemediaobject.info,
+         db.mediaobject.contentmodel+
       }
 }
 
@@ -2142,22 +1886,19 @@ div {
 ]
 div {
 
-   local.videoobject.attributes = empty
-
-   videoobject.role.attribute = attribute role { text }
+   db.videoobject.role.attribute = attribute role { text }
 
-   videoobject.attlist =
-      videoobject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.videoobject.attributes
+   db.videoobject.attlist =
+      db.videoobject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   videoobject.info = docbook.info.titleforbidden
+   db.videoobject.info = db._info.title.forbidden
 
    db.videoobject =
       element videoobject {
-         videoobject.attlist,
-         videoobject.info,
+         db.videoobject.attlist,
+         db.videoobject.info,
          db.videodata
       }
 }
@@ -2170,55 +1911,45 @@ div {
 ]
 div {
 
-   local.audioobject.attributes = empty
-
-   audioobject.role.attribute = attribute role { text }
+   db.audioobject.role.attribute = attribute role { text }
 
-   audioobject.attlist =
-      audioobject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.audioobject.attributes
+   db.audioobject.attlist =
+      db.audioobject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   audioobject.info = docbook.info.titleforbidden
+   db.audioobject.info = db._info.title.forbidden
 
    db.audioobject =
       element audioobject {
-         audioobject.attlist,
-         audioobject.info,
+         db.audioobject.attlist,
+         db.audioobject.info,
          db.audiodata
       }
 }
 
 # ======================================================================
 
-imageobject.content = db.imagedata
-
-# ======================================================================
-
 [
    db:refname [ "imageobject" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.imageobject.attributes = empty
+   db.imageobject.role.attribute = attribute role { text }
 
-   imageobject.role.attribute = attribute role { text }
+   db.imageobject.attlist =
+      db.imageobject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   imageobject.attlist =
-      imageobject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.imageobject.attributes
-
-   imageobject.info = docbook.info.titleforbidden
+   db.imageobject.info = db._info.title.forbidden
 
    db.imageobject =
       element imageobject {
-         imageobject.attlist,
-         imageobject.info,
-         imageobject.content
+         db.imageobject.attlist,
+         db.imageobject.info,
+         db.imagedata
       }
 }
 
@@ -2230,23 +1961,20 @@ div {
 ]
 div {
 
-   local.textobject.attributes = empty
-
-   textobject.role.attribute = attribute role { text }
+   db.textobject.role.attribute = attribute role { text }
 
-   textobject.attlist =
-      textobject.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.textobject.attributes
+   db.textobject.attlist =
+      db.textobject.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   textobject.info = docbook.info.titleforbidden
+   db.textobject.info = db._info.title.forbidden
 
    db.textobject =
       element textobject {
-         textobject.attlist,
-         textobject.info,
-         (db.phrase | db.textdata | blocks+)
+         db.textobject.attlist,
+         db.textobject.info,
+         (db.phrase | db.textdata | db.all.blocks+)
       }
 }
 
@@ -2258,14 +1986,12 @@ div {
 ]
 div {
 
-   local.videodata.attributes = empty
-
-   videodata.role.attribute = attribute role { text }
+   db.videodata.role.attribute = attribute role { text }
 
-   videodata.attlist =
-      videodata.role.attribute?
-    & common.attributes
-    & data.common.attrib
+   db.videodata.attlist =
+      db.videodata.role.attribute?
+    & db.common.attributes
+    & db.common.data.attributes
     & attribute align { "center" | "char" | "justify" | "left" | "right" }?
     & attribute valign { "bottom" | "middle" | "top" }?
     & attribute width { text }?
@@ -2274,13 +2000,12 @@ div {
     & attribute scale { text }?
     & attribute depth { text }?
     & attribute contentdepth { text }?
-    & local.videodata.attributes
 
-   videodata.info = docbook.info.titleforbidden
+   db.videodata.info = db._info.title.forbidden
 
    db.videodata = element videodata {
-      videodata.attlist,
-      videodata.info
+      db.videodata.attlist,
+      db.videodata.info
    }
 }
 
@@ -2292,22 +2017,19 @@ div {
 ]
 div {
 
-   local.audiodata.attributes = empty
+   db.audiodata.role.attribute = attribute role { text }
 
-   audiodata.role.attribute = attribute role { text }
+   db.audiodata.attlist =
+      db.audiodata.role.attribute?
+    & db.common.attributes
+    & db.common.data.attributes
 
-   audiodata.attlist =
-      audiodata.role.attribute?
-    & common.attributes
-    & data.common.attrib
-    & local.audiodata.attributes
-
-   audiodata.info = docbook.info.titleforbidden
+   db.audiodata.info = db._info.title.forbidden
 
    db.audiodata =
       element audiodata {
-         audiodata.attlist,
-         audiodata.info
+         db.audiodata.attlist,
+         db.audiodata.info
       }
 }
 
@@ -2319,14 +2041,12 @@ div {
 ]
 div {
 
-   local.imagedata.attributes = empty
-
-   imagedata.role.attribute = attribute role { text }
+   db.imagedata.role.attribute = attribute role { text }
 
-   imagedata.attlist =
-      imagedata.role.attribute?
-    & common.attributes
-    & data.common.attrib
+   db.imagedata.attlist =
+      db.imagedata.role.attribute?
+    & db.common.attributes
+    & db.common.data.attributes
     & attribute align { "center" | "char" | "justify" | "left" | "right" }?
     & attribute valign { "bottom" | "middle" | "top" }?
     & attribute width { text }?
@@ -2335,14 +2055,13 @@ div {
     & attribute scale { text }?
     & attribute depth { text }?
     & attribute contentdepth { text }?
-    & local.imagedata.attributes
 
-   imagedata.info = docbook.info.titleforbidden
+   db.imagedata.info = db._info.title.forbidden
 
    db.imagedata =
       element imagedata {
-         imagedata.attlist,
-         imagedata.info
+         db.imagedata.attlist,
+         db.imagedata.info
       }
 }
 
@@ -2354,31 +2073,26 @@ div {
 ]
 div {
 
-   local.textdata.attributes = empty
-
-   textdata.role.attribute = attribute role { text }
+   db.textdata.role.attribute = attribute role { text }
 
-   textdata.attlist =
-      textdata.role.attribute?
-    & common.attributes
-    & data.common.attrib
+   db.textdata.attlist =
+      db.textdata.role.attribute?
+    & db.common.attributes
+    & db.common.data.attributes
     & attribute encoding { text }?
-    & local.textdata.attributes
 
-   textdata.info = docbook.info.titleforbidden
+   db.textdata.info = db._info.title.forbidden
 
    db.textdata =
       element textdata {
-         textdata.attlist,
-         textdata.info
+         db.textdata.attlist,
+         db.textdata.info
       }
 }
 
 # ======================================================================
 
-# db.caption = element caption { blocks+ }
-
-equation.content = db.mediaobject
+db.equation.contentmodel = db.mediaobject+
 
 # ======================================================================
 
@@ -2388,27 +2102,24 @@ equation.content = db.mediaobject
 ]
 div {
 
-   local.equation.attributes = empty
-
-   equation.role.attribute = attribute role { text }
+   db.equation.role.attribute = attribute role { text }
 
-   equation.attlist =
-      equation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.equation.attlist =
+      db.equation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute label { text }?
-    & pgwide.attribute?
-    & floatstyle.attribute?
-    & float.attribute?
-    & local.equation.attributes
+    & db.pgwide.attribute?
+    & db.floatstyle.attribute?
+    & db.float.attribute?
 
-   equation.info = docbook.info.titleonlyreq
+   db.equation.info = db._info.title.onlyreq
 
    db.equation =
       element equation {
-         equation.attlist,
-         equation.info,
-         equation.content+
+         db.equation.attlist,
+         db.equation.info,
+         db.equation.contentmodel
       }
 }
 
@@ -2420,29 +2131,26 @@ div {
 ]
 div {
 
-   local.informalequation.attributes = empty
-
-   informalequation.role.attribute = attribute role { text }
+   db.informalequation.role.attribute = attribute role { text }
 
-   informalequation.attlist =
-      informalequation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.informalequation.attributes
+   db.informalequation.attlist =
+      db.informalequation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   informalequation.info = docbook.info.titleforbidden
+   db.informalequation.info = db._info.title.forbidden
 
    db.informalequation =
       element informalequation {
-         informalequation.attlist,
-         informalequation.info,
-         equation.content+
+         db.informalequation.attlist,
+         db.informalequation.info,
+         db.equation.contentmodel
       }
 }
 
 # ======================================================================
 
-inlineequation.content = db.inlinemediaobject
+db.inlineequation.contentmodel = db.inlinemediaobject+
 
 # ======================================================================
 
@@ -2452,20 +2160,17 @@ inlineequation.content = db.inlinemediaobject
 ]
 div {
 
-   local.inlineequation.attributes = empty
+   db.inlineequation.role.attribute = attribute role { text }
 
-   inlineequation.role.attribute = attribute role { text }
-
-   inlineequation.attlist =
-      inlineequation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.inlineequation.attributes
+   db.inlineequation.attlist =
+      db.inlineequation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.inlineequation =
       element inlineequation {
-         inlineequation.attlist,
-         inlineequation.content+
+         db.inlineequation.attlist,
+         db.inlineequation.contentmodel
       }
 }
 
@@ -2477,22 +2182,19 @@ div {
 ]
 div {
 
-   local.synopsis.attributes = empty
-
-   synopsis.role.attribute = attribute role { text }
+   db.synopsis.role.attribute = attribute role { text }
 
-   synopsis.attlist =
-      synopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
+   db.synopsis.attlist =
+      db.synopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
     & attribute label { text }?
-    & local.synopsis.attributes
 
    db.synopsis =
       element synopsis {
-         synopsis.attlist,
-         verbatim.contentmodel
+         db.synopsis.attlist,
+         db.verbatim.contentmodel
       }
 }
 
@@ -2504,25 +2206,22 @@ div {
 ]
 div {
 
-   local.cmdsynopsis.attributes = empty
-
-   cmdsynopsis.role.attribute = attribute role { text }
+   db.cmdsynopsis.role.attribute = attribute role { text }
 
-   cmdsynopsis.attlist =
-      cmdsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.cmdsynopsis.attlist =
+      db.cmdsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute sepchar { text }?
     & attribute cmdlength { text }?
     & attribute label { text }?
-    & local.cmdsynopsis.attributes
 
-   cmdsynopsis.info = docbook.info.titleforbidden
+   db.cmdsynopsis.info = db._info.title.forbidden
 
    db.cmdsynopsis =
       element cmdsynopsis {
-         cmdsynopsis.attlist,
-         cmdsynopsis.info,
+         db.cmdsynopsis.attlist,
+         db.cmdsynopsis.info,
          (db.command | db.arg | db.group | db.sbr)+,
          db.synopfragment*
       }
@@ -2541,22 +2240,19 @@ choice.attribute = attribute choice { "opt" | "plain" | "req" }
 ]
 div {
 
-   local.arg.attributes = empty
+   db.arg.role.attribute = attribute role { text }
 
-   arg.role.attribute = attribute role { text }
-
-   arg.attlist =
-      arg.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.arg.attlist =
+      db.arg.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & rep.attribute?
     & choice.attribute?
-    & local.arg.attributes
 
    db.arg =
       element arg {
-         arg.attlist,
-         (docbook.text
+         db.arg.attlist,
+         (db._text
           | db.arg
           | db.group
           | db.option
@@ -2573,21 +2269,18 @@ div {
 ]
 div {
 
-   local.group.attributes = empty
-
-   group.role.attribute = attribute role { text }
+   db.group.role.attribute = attribute role { text }
 
-   group.attlist =
-      group.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.group.attlist =
+      db.group.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & rep.attribute?
     & choice.attribute?
-    & local.group.attributes
 
    db.group =
       element group {
-         group.attlist,
+         db.group.attlist,
          (db.arg
           | db.group
           | db.option
@@ -2605,18 +2298,15 @@ div {
 ]
 div {
 
-   local.sbr.attributes = empty
-
-   sbr.role.attribute = attribute role { text }
+   db.sbr.role.attribute = attribute role { text }
 
-   sbr.attlist =
-      sbr.role.attribute?
-    & common.attributes
-    & local.sbr.attributes
+   db.sbr.attlist =
+      db.sbr.role.attribute?
+    & db.common.attributes
 
    db.sbr =
       element sbr {
-         sbr.attlist,
+         db.sbr.attlist,
          empty
       }
 }
@@ -2629,19 +2319,16 @@ div {
 ]
 div {
 
-   local.synopfragment.attributes = empty
+   db.synopfragment.role.attribute = attribute role { text }
 
-   synopfragment.role.attribute = attribute role { text }
-
-   synopfragment.attlist =
-      synopfragment.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.synopfragment.attributes
+   db.synopfragment.attlist =
+      db.synopfragment.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.synopfragment =
       element synopfragment {
-         synopfragment.attlist,
+         db.synopfragment.attlist,
          (db.arg | db.group)+
       }
 }
@@ -2654,15 +2341,12 @@ div {
 ]
 div {
 
-   local.synopfragmentref.attributes = empty
-
-   synopfragmentref.role.attribute = attribute role { text }
+   db.synopfragmentref.role.attribute = attribute role { text }
 
-   synopfragmentref.attlist =
-      synopfragmentref.role.attribute?
-    & common.attributes
-    & linkend.attribute
-    & local.synopfragmentref.attributes
+   db.synopfragmentref.attlist =
+      db.synopfragmentref.role.attribute?
+    & db.common.attributes
+    & db.linkend.attribute
 
    db.synopfragmentref =
       [
@@ -2675,7 +2359,7 @@ div {
          ]
       ]
       element synopfragmentref {
-         synopfragmentref.attlist,
+         db.synopfragmentref.attlist,
          text
       }
 }
@@ -2688,22 +2372,19 @@ div {
 ]
 div {
 
-   local.funcsynopsis.attributes = empty
-
-   funcsynopsis.role.attribute = attribute role { text }
+   db.funcsynopsis.role.attribute = attribute role { text }
 
-   funcsynopsis.attlist =
-      funcsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.funcsynopsis.attributes
+   db.funcsynopsis.attlist =
+      db.funcsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   funcsynopsis.info = docbook.info.titleforbidden
+   db.funcsynopsis.info = db._info.title.forbidden
 
    db.funcsynopsis =
       element funcsynopsis {
-         funcsynopsis.attlist,
-         funcsynopsis.info,
+         db.funcsynopsis.attlist,
+         db.funcsynopsis.info,
          (db.funcsynopsisinfo | db.funcprototype)+
       }
 }
@@ -2716,21 +2397,18 @@ div {
 ]
 div {
 
-   local.funcsynopsisinfo.attributes = empty
+   db.funcsynopsisinfo.role.attribute = attribute role { text }
 
-   funcsynopsisinfo.role.attribute = attribute role { text }
-
-   funcsynopsisinfo.attlist =
-      funcsynopsisinfo.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
-    & local.funcsynopsisinfo.attributes
+   db.funcsynopsisinfo.attlist =
+      db.funcsynopsisinfo.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
 
    db.funcsynopsisinfo =
       element funcsynopsisinfo {
-         funcsynopsisinfo.attlist,
-         verbatim.contentmodel
+         db.funcsynopsisinfo.attlist,
+         db.verbatim.contentmodel
       }
 }
 
@@ -2742,19 +2420,16 @@ div {
 ]
 div {
 
-   local.funcprototype.attributes = empty
-
-   funcprototype.role.attribute = attribute role { text }
+   db.funcprototype.role.attribute = attribute role { text }
 
-   funcprototype.attlist =
-      funcprototype.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.funcprototype.attributes
+   db.funcprototype.attlist =
+      db.funcprototype.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.funcprototype =
       element funcprototype {
-         funcprototype.attlist,
+         db.funcprototype.attlist,
          db.modifier*,
          db.funcdef,
          (db.void | db.varargs | (db.paramdef+, db.varargs?)),
@@ -2770,20 +2445,17 @@ div {
 ]
 div {
 
-   local.funcdef.attributes = empty
-
-   funcdef.role.attribute = attribute role { text }
+   db.funcdef.role.attribute = attribute role { text }
 
-   funcdef.attlist =
-      funcdef.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.funcdef.attributes
+   db.funcdef.attlist =
+      db.funcdef.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.funcdef =
       element funcdef {
-         funcdef.attlist,
-         (docbook.text | db.type | db.function)*
+         db.funcdef.attlist,
+         (db._text | db.type | db.function)*
       }
 }
 
@@ -2795,19 +2467,16 @@ div {
 ]
 div {
 
-   local.void.attributes = empty
+   db.void.role.attribute = attribute role { text }
 
-   void.role.attribute = attribute role { text }
-
-   void.attlist =
-      void.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.void.attributes
+   db.void.attlist =
+      db.void.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.void =
       element void {
-         void.attlist,
+         db.void.attlist,
          empty
       }
 }
@@ -2820,19 +2489,16 @@ div {
 ]
 div {
 
-   local.varargs.attributes = empty
-
-   varargs.role.attribute = attribute role { text }
+   db.varargs.role.attribute = attribute role { text }
 
-   varargs.attlist =
-      varargs.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.varargs.attributes
+   db.varargs.attlist =
+      db.varargs.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.varargs =
       element varargs {
-         varargs.attlist,
+         db.varargs.attlist,
          empty
       }
 }
@@ -2845,21 +2511,18 @@ div {
 ]
 div {
 
-   local.paramdef.attributes = empty
-
-   paramdef.role.attribute = attribute role { text }
+   db.paramdef.role.attribute = attribute role { text }
 
-   paramdef.attlist =
-      paramdef.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.paramdef.attlist =
+      db.paramdef.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     &  attribute choice { "opt" | "req" }?
-    & local.paramdef.attributes
 
    db.paramdef =
       element paramdef {
-         paramdef.attlist,
-         (docbook.text | db.type | db.parameter | db.funcparams)*
+         db.paramdef.attlist,
+         (db._text | db.type | db.parameter | db.funcparams)*
       }
 }
 
@@ -2871,57 +2534,46 @@ div {
 ]
 div {
 
-   local.funcparams.attributes = empty
+   db.funcparams.role.attribute = attribute role { text }
 
-   funcparams.role.attribute = attribute role { text }
-
-   funcparams.attlist =
-      funcparams.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.funcparams.attributes
+   db.funcparams.attlist =
+      db.funcparams.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.funcparams =
       element funcparams {
-         funcparams.attlist,
-         inlines*
+         db.funcparams.attlist,
+         db.all.inlines*
       }
 }
 
 # ======================================================================
 
-oo-method.synopsis.blocks =
-  db.methodsynopsis | db.constructorsynopsis | db.destructorsynopsis
-
-oo-field.synopsis.blocks = db.fieldsynopsis
-
-# ======================================================================
-
 [
    db:refname [ "classsynopsis" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.classsynopsis.attributes = empty
-
-   classsynopsis.role.attribute = attribute role { text }
+   db.classsynopsis.role.attribute = attribute role { text }
 
-   classsynopsis.attlist =
-      classsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & oo-language.attribute
+   db.classsynopsis.attlist =
+      db.classsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.language.attribute
     & attribute class { "class" | "interface" }?
-    & local.classsynopsis.attributes
 
    db.classsynopsis =
       element classsynopsis {
-         classsynopsis.attlist,
-         oo.inlines+,
+         db.classsynopsis.attlist,
+         db.oo.inlines+,
          (db.classsynopsisinfo
-          | oo-method.synopsis.blocks
-          | oo-field.synopsis.blocks)*
+          | db.methodsynopsis
+          | db.constructorsynopsis
+          | db.destructorsynopsis
+          | db.fieldsynopsis)*
       }
 }
 
@@ -2933,21 +2585,18 @@ div {
 ]
 div {
 
-   local.classsynopsisinfo.attributes = empty
+   db.classsynopsisinfo.role.attribute = attribute role { text }
 
-   classsynopsisinfo.role.attribute = attribute role { text }
-
-   classsynopsisinfo.attlist =
-      classsynopsisinfo.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
-    & local.classsynopsisinfo.attributes
+   db.classsynopsisinfo.attlist =
+      db.classsynopsisinfo.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
 
    db.classsynopsisinfo =
       element classsynopsisinfo {
-         classsynopsisinfo.attlist,
-         verbatim.contentmodel
+         db.classsynopsisinfo.attlist,
+         db.verbatim.contentmodel
       }
 }
 
@@ -2959,19 +2608,16 @@ div {
 ]
 div {
 
-   local.ooclass.attributes = empty
-
-   ooclass.role.attribute = attribute role { text }
+   db.ooclass.role.attribute = attribute role { text }
 
-   ooclass.attlist =
-      ooclass.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.ooclass.attributes
+   db.ooclass.attlist =
+      db.ooclass.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.ooclass =
       element ooclass {
-         ooclass.attlist,
+         db.ooclass.attlist,
          (db.package|db.modifier)*,
          db.classname
       }
@@ -2985,19 +2631,16 @@ div {
 ]
 div {
 
-   local.oointerface.attributes = empty
-
-   oointerface.role.attribute = attribute role { text }
+   db.oointerface.role.attribute = attribute role { text }
 
-   oointerface.attlist =
-      oointerface.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.oointerface.attributes
+   db.oointerface.attlist =
+      db.oointerface.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.oointerface =
       element oointerface {
-         oointerface.attlist,
+         db.oointerface.attlist,
          (db.package|db.modifier)*,
          db.interfacename
       }
@@ -3011,19 +2654,16 @@ div {
 ]
 div {
 
-   local.ooexception.attributes = empty
+   db.ooexception.role.attribute = attribute role { text }
 
-   ooexception.role.attribute = attribute role { text }
-
-   ooexception.attlist =
-      ooexception.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.ooexception.attributes
+   db.ooexception.attlist =
+      db.ooexception.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.ooexception =
       element ooexception {
-         ooexception.attlist,
+         db.ooexception.attlist,
          (db.package|db.modifier)*,
          db.exceptionname
       }
@@ -3037,20 +2677,17 @@ div {
 ]
 div {
 
-   local.modifier.attributes = empty
-
-   modifier.role.attribute = attribute role { text }
+   db.modifier.role.attribute = attribute role { text }
 
-   modifier.attlist =
-      modifier.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.modifier.attributes
+   db.modifier.attlist =
+      db.modifier.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.modifier =
       element modifier {
-         modifier.attlist,
-         docbook.text
+         db.modifier.attlist,
+         db._text
       }
 }
 
@@ -3062,20 +2699,17 @@ div {
 ]
 div {
 
-   local.interfacename.attributes = empty
-
-   interfacename.role.attribute = attribute role { text }
+   db.interfacename.role.attribute = attribute role { text }
 
-   interfacename.attlist =
-      interfacename.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.interfacename.attributes
+   db.interfacename.attlist =
+      db.interfacename.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.interfacename =
       element interfacename {
-         interfacename.attlist,
-         docbook.text
+         db.interfacename.attlist,
+         db._text
       }
 }
 
@@ -3087,20 +2721,17 @@ div {
 ]
 div {
 
-   local.exceptionname.attributes = empty
+   db.exceptionname.role.attribute = attribute role { text }
 
-   exceptionname.role.attribute = attribute role { text }
-
-   exceptionname.attlist =
-      exceptionname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.exceptionname.attributes
+   db.exceptionname.attlist =
+      db.exceptionname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.exceptionname =
       element exceptionname {
-         exceptionname.attlist,
-         docbook.text
+         db.exceptionname.attlist,
+         db._text
       }
 }
 
@@ -3112,20 +2743,17 @@ div {
 ]
 div {
 
-   local.fieldsynopsis.attributes = empty
-
-   fieldsynopsis.role.attribute = attribute role { text }
+   db.fieldsynopsis.role.attribute = attribute role { text }
 
-   fieldsynopsis.attlist =
-      fieldsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & oo-language.attribute
-    & local.fieldsynopsis.attributes
+   db.fieldsynopsis.attlist =
+      db.fieldsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.language.attribute
 
    db.fieldsynopsis =
       element fieldsynopsis {
-         fieldsynopsis.attlist,
+         db.fieldsynopsis.attlist,
          db.modifier*,
          db.type?,
          db.varname,
@@ -3141,20 +2769,17 @@ div {
 ]
 div {
 
-   local.initializer.attributes = empty
-
-   initializer.role.attribute = attribute role { text }
+   db.initializer.role.attribute = attribute role { text }
 
-   initializer.attlist =
-      initializer.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.initializer.attributes
+   db.initializer.attlist =
+      db.initializer.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.initializer =
       element initializer {
-         initializer.attlist,
-         docbook.text
+         db.initializer.attlist,
+         db._text
       }
 }
 
@@ -3166,20 +2791,17 @@ div {
 ]
 div {
 
-   local.constructorsynopsis.attributes = empty
+   db.constructorsynopsis.role.attribute = attribute role { text }
 
-   constructorsynopsis.role.attribute = attribute role { text }
-
-   constructorsynopsis.attlist =
-      constructorsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & oo-language.attribute
-    & local.constructorsynopsis.attributes
+   db.constructorsynopsis.attlist =
+      db.constructorsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.language.attribute
 
    db.constructorsynopsis =
       element constructorsynopsis {
-         constructorsynopsis.attlist,
+         db.constructorsynopsis.attlist,
          db.modifier*,
          db.methodname?,
          (db.methodparam+ | db.void?),
@@ -3195,20 +2817,17 @@ div {
 ]
 div {
 
-   local.destructorsynopsis.attributes = empty
-
-   destructorsynopsis.role.attribute = attribute role { text }
+   db.destructorsynopsis.role.attribute = attribute role { text }
 
-   destructorsynopsis.attlist =
-      destructorsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & oo-language.attribute
-    & local.destructorsynopsis.attributes
+   db.destructorsynopsis.attlist =
+      db.destructorsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.language.attribute
 
    db.destructorsynopsis =
       element destructorsynopsis {
-         destructorsynopsis.attlist,
+         db.destructorsynopsis.attlist,
          db.modifier*,
          db.methodname?,
          (db.methodparam+ | db.void?),
@@ -3224,20 +2843,17 @@ div {
 ]
 div {
 
-   local.methodsynopsis.attributes = empty
-
-   methodsynopsis.role.attribute = attribute role { text }
+   db.methodsynopsis.role.attribute = attribute role { text }
 
-   methodsynopsis.attlist =
-      methodsynopsis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & oo-language.attribute
-    & local.methodsynopsis.attributes
+   db.methodsynopsis.attlist =
+      db.methodsynopsis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.language.attribute
 
    db.methodsynopsis =
       element methodsynopsis {
-         methodsynopsis.attlist,
+         db.methodsynopsis.attlist,
          db.modifier*,
          (db.type | db.void)?,
          db.methodname,
@@ -3255,20 +2871,17 @@ div {
 ]
 div {
 
-   local.methodname.attributes = empty
+   db.methodname.role.attribute = attribute role { text }
 
-   methodname.role.attribute = attribute role { text }
-
-   methodname.attlist =
-      methodname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.methodname.attributes
+   db.methodname.attlist =
+      db.methodname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.methodname =
       element methodname {
-         methodname.attlist,
-         docbook.text
+         db.methodname.attlist,
+         db._text
       }
 }
 
@@ -3280,21 +2893,18 @@ div {
 ]
 div {
 
-   local.methodparam.attributes = empty
-
-   methodparam.role.attribute = attribute role { text }
+   db.methodparam.role.attribute = attribute role { text }
 
-   methodparam.attlist =
-      methodparam.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.methodparam.attlist =
+      db.methodparam.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & rep.attribute?
     & choice.attribute?
-    & local.methodparam.attributes
 
    db.methodparam =
       element methodparam {
-         methodparam.attlist,
+         db.methodparam.attlist,
          db.modifier*,
          db.type?,
          ((db.parameter, db.initializer?) | db.funcparams),
@@ -3311,21 +2921,18 @@ div {
 ]
 div {
 
-   local.address.attributes = empty
-
-   address.role.attribute = attribute role { text }
+   db.address.role.attribute = attribute role { text }
 
-   address.attlist =
-      address.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & verbatim.attributes
-    & local.address.attributes
+   db.address.attlist =
+      db.address.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.verbatim.attributes
 
    db.address =
       element address {
-         address.attlist,
-         (docbook.text
+         db.address.attlist,
+         (db._text
           | db.personname
           | db.pob
           | db.street
@@ -3348,20 +2955,17 @@ div {
 ]
 div {
 
-   local.street.attributes = empty
+   db.street.role.attribute = attribute role { text }
 
-   street.role.attribute = attribute role { text }
-
-   street.attlist =
-      street.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.street.attributes
+   db.street.attlist =
+      db.street.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.street =
       element street {
-         street.attlist,
-         docbook.text
+         db.street.attlist,
+         db._text
       }
 }
 
@@ -3373,20 +2977,17 @@ div {
 ]
 div {
 
-   local.pob.attributes = empty
-
-   pob.role.attribute = attribute role { text }
+   db.pob.role.attribute = attribute role { text }
 
-   pob.attlist =
-      pob.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.pob.attributes
+   db.pob.attlist =
+      db.pob.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.pob =
       element pob {
-         pob.attlist,
-         docbook.text
+         db.pob.attlist,
+         db._text
       }
 }
 
@@ -3398,20 +2999,17 @@ div {
 ]
 div {
 
-   local.postcode.attributes = empty
-
-   postcode.role.attribute = attribute role { text }
+   db.postcode.role.attribute = attribute role { text }
 
-   postcode.attlist =
-      postcode.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.postcode.attributes
+   db.postcode.attlist =
+      db.postcode.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.postcode =
       element postcode {
-         postcode.attlist,
-         docbook.text
+         db.postcode.attlist,
+         db._text
       }
 }
 
@@ -3423,20 +3021,17 @@ div {
 ]
 div {
 
-   local.city.attributes = empty
+   db.city.role.attribute = attribute role { text }
 
-   city.role.attribute = attribute role { text }
-
-   city.attlist =
-      city.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.city.attributes
+   db.city.attlist =
+      db.city.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.city =
       element city {
-         city.attlist,
-         docbook.text
+         db.city.attlist,
+         db._text
       }
 }
 
@@ -3448,20 +3043,17 @@ div {
 ]
 div {
 
-   local.state.attributes = empty
-
-   state.role.attribute = attribute role { text }
+   db.state.role.attribute = attribute role { text }
 
-   state.attlist =
-      state.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.state.attributes
+   db.state.attlist =
+      db.state.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.state =
       element state {
-         state.attlist,
-         docbook.text
+         db.state.attlist,
+         db._text
       }
 }
 
@@ -3473,20 +3065,17 @@ div {
 ]
 div {
 
-   local.country.attributes = empty
-
-   country.role.attribute = attribute role { text }
+   db.country.role.attribute = attribute role { text }
 
-   country.attlist =
-      country.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.country.attributes
+   db.country.attlist =
+      db.country.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.country =
       element country {
-         country.attlist,
-         docbook.text
+         db.country.attlist,
+         db._text
       }
 }
 
@@ -3498,20 +3087,17 @@ div {
 ]
 div {
 
-   local.phone.attributes = empty
+   db.phone.role.attribute = attribute role { text }
 
-   phone.role.attribute = attribute role { text }
-
-   phone.attlist =
-      phone.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.phone.attributes
+   db.phone.attlist =
+      db.phone.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.phone =
       element phone {
-         phone.attlist,
-         docbook.text
+         db.phone.attlist,
+         db._text
       }
 }
 
@@ -3523,20 +3109,17 @@ div {
 ]
 div {
 
-   local.fax.attributes = empty
-
-   fax.role.attribute = attribute role { text }
+   db.fax.role.attribute = attribute role { text }
 
-   fax.attlist =
-      fax.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.fax.attributes
+   db.fax.attlist =
+      db.fax.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.fax =
       element fax {
-         fax.attlist,
-         docbook.text
+         db.fax.attlist,
+         db._text
       }
 }
 
@@ -3548,20 +3131,17 @@ div {
 ]
 div {
 
-   local.otheraddr.attributes = empty
-
-   otheraddr.role.attribute = attribute role { text }
+   db.otheraddr.role.attribute = attribute role { text }
 
-   otheraddr.attlist =
-      otheraddr.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.otheraddr.attributes
+   db.otheraddr.attlist =
+      db.otheraddr.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.otheraddr =
       element otheraddr {
-         otheraddr.attlist,
-         docbook.text
+         db.otheraddr.attlist,
+         db._text
       }
 }
 
@@ -3573,19 +3153,16 @@ div {
 ]
 div {
 
-   local.affiliation.attributes = empty
+   db.affiliation.role.attribute = attribute role { text }
 
-   affiliation.role.attribute = attribute role { text }
-
-   affiliation.attlist =
-      affiliation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.affiliation.attributes
+   db.affiliation.attlist =
+      db.affiliation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.affiliation =
       element affiliation {
-         affiliation.attlist,
+         db.affiliation.attlist,
          db.shortaffil?,
          db.jobtitle*,
          db.orgname?,
@@ -3602,20 +3179,17 @@ div {
 ]
 div {
 
-   local.shortaffil.attributes = empty
-
-   shortaffil.role.attribute = attribute role { text }
+   db.shortaffil.role.attribute = attribute role { text }
 
-   shortaffil.attlist =
-      shortaffil.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.shortaffil.attributes
+   db.shortaffil.attlist =
+      db.shortaffil.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.shortaffil =
       element shortaffil {
-         shortaffil.attlist,
-         docbook.text
+         db.shortaffil.attlist,
+         db._text
       }
 }
 
@@ -3627,20 +3201,17 @@ div {
 ]
 div {
 
-   local.jobtitle.attributes = empty
-
-   jobtitle.role.attribute = attribute role { text }
+   db.jobtitle.role.attribute = attribute role { text }
 
-   jobtitle.attlist =
-      jobtitle.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.jobtitle.attributes
+   db.jobtitle.attlist =
+      db.jobtitle.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.jobtitle =
       element jobtitle {
-         jobtitle.attlist,
-         docbook.text
+         db.jobtitle.attlist,
+         db._text
       }
 }
 
@@ -3652,37 +3223,36 @@ div {
 ]
 div {
 
-   local.orgname.attributes = empty
-   ctrl:other-attribute [ name="orgname.class.attrib"
-                          enum-name="orgname.class-enum.attribute"
-                          other-name="orgname.class-other.attributes" ]
+   ctrl:other-attribute [ name="db.orgname.class.attrib"
+                          enum-name="db.orgname.class-enum.attribute"
+                          other-name="db.orgname.class-other.attributes" ]
 
-   orgname.class-enum.attribute =
+   db.orgname.class-enum.attribute =
       attribute class {
          "consortium"
        | "corporation"
        | "informal"
        | "nonprofit" }?
 
-   orgname.class-other.attributes =
+   db.orgname.class-other.attributes =
       attribute class { "other" }?,
       attribute otherclass { text }
 
-   orgname.class.attrib = (orgname.class-enum.attribute | orgname.class-other.attributes)
+   db.orgname.class.attribute =
+      (db.orgname.class-enum.attribute | db.orgname.class-other.attributes)
 
-   orgname.role.attribute = attribute role { text }
+   db.orgname.role.attribute = attribute role { text }
 
-   orgname.attlist =
-      orgname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & orgname.class.attrib
-    & local.orgname.attributes
+   db.orgname.attlist =
+      db.orgname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.orgname.class.attribute
 
    db.orgname =
       element orgname {
-         orgname.attlist,
-         docbook.text
+         db.orgname.attlist,
+         db._text
       }
 }
 
@@ -3694,20 +3264,17 @@ div {
 ]
 div {
 
-   local.orgdiv.attributes = empty
+   db.orgdiv.role.attribute = attribute role { text }
 
-   orgdiv.role.attribute = attribute role { text }
-
-   orgdiv.attlist =
-      orgdiv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.orgdiv.attributes
+   db.orgdiv.attlist =
+      db.orgdiv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.orgdiv =
       element orgdiv {
-         orgdiv.attlist,
-         inlines*
+         db.orgdiv.attlist,
+         db.all.inlines*
       }
 }
 
@@ -3719,20 +3286,17 @@ div {
 ]
 div {
 
-   local.artpagenums.attributes = empty
-
-   artpagenums.role.attribute = attribute role { text }
+   db.artpagenums.role.attribute = attribute role { text }
 
-   artpagenums.attlist =
-      artpagenums.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.artpagenums.attributes
+   db.artpagenums.attlist =
+      db.artpagenums.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.artpagenums =
       element artpagenums {
-         artpagenums.attlist,
-         docbook.text
+         db.artpagenums.attlist,
+         db._text
       }
 }
 
@@ -3744,20 +3308,17 @@ div {
 ]
 div {
 
-   local.personname.attributes = empty
-
-   personname.role.attribute = attribute role { text }
+   db.personname.role.attribute = attribute role { text }
 
-   personname.attlist =
-      personname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.personname.attributes
+   db.personname.attlist =
+      db.personname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.personname =
       element personname {
-         personname.attlist,
-         (docbook.text
+         db.personname.attlist,
+         (db._text
           | (db.honorific
            | db.firstname
            | db.surname
@@ -3768,7 +3329,7 @@ div {
 
 # ======================================================================
 
-person.author =
+db.person.author.contentmodel =
    db.personname,
    (db.personblurb
     | db.affiliation
@@ -3776,7 +3337,7 @@ person.author =
     | db.address
     | db.contrib)*
 
-org.author =
+db.org.author.contentmodel =
    db.orgname,
    (db.orgdiv
     | db.affiliation
@@ -3784,7 +3345,7 @@ org.author =
     | db.address
     | db.contrib)*
 
-credit.contentmodel = person.author | org.author
+db.credit.contentmodel = db.person.author.contentmodel | db.org.author.contentmodel
 
 # ======================================================================
 
@@ -3794,20 +3355,17 @@ credit.contentmodel = person.author | org.author
 ]
 div {
 
-   local.author.attributes = empty
+   db.author.role.attribute = attribute role { text }
 
-   author.role.attribute = attribute role { text }
-
-   author.attlist =
-      author.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.author.attributes
+   db.author.attlist =
+      db.author.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.author =
       element author {
-         author.attlist,
-         credit.contentmodel
+         db.author.attlist,
+         db.credit.contentmodel
       }
 }
 
@@ -3819,19 +3377,16 @@ div {
 ]
 div {
 
-   local.authorgroup.attributes = empty
-
-   authorgroup.role.attribute = attribute role { text }
+   db.authorgroup.role.attribute = attribute role { text }
 
-   authorgroup.attlist =
-      authorgroup.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.authorgroup.attributes
+   db.authorgroup.attlist =
+      db.authorgroup.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.authorgroup =
       element authorgroup {
-         authorgroup.attlist,
+         db.authorgroup.attlist,
          (db.author | db.editor | db.othercredit)+
       }
 }
@@ -3844,19 +3399,16 @@ div {
 ]
 div {
 
-   local.collab.attributes = empty
-
-   collab.role.attribute = attribute role { text }
+   db.collab.role.attribute = attribute role { text }
 
-   collab.attlist =
-      collab.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.collab.attributes
+   db.collab.attlist =
+      db.collab.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.collab =
       element collab {
-         collab.attlist,
+         db.collab.attlist,
          (db.personname | db.orgname)+,
          db.affiliation*
       }
@@ -3870,20 +3422,17 @@ div {
 ]
 div {
 
-   local.authorinitials.attributes = empty
+   db.authorinitials.role.attribute = attribute role { text }
 
-   authorinitials.role.attribute = attribute role { text }
-
-   authorinitials.attlist =
-      authorinitials.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.authorinitials.attributes
+   db.authorinitials.attlist =
+      db.authorinitials.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.authorinitials =
       element authorinitials {
-         authorinitials.attlist,
-         docbook.text
+         db.authorinitials.attlist,
+         db._text
       }
 }
 
@@ -3895,19 +3444,16 @@ div {
 ]
 div {
 
-   local.confgroup.attributes = empty
-
-   confgroup.role.attribute = attribute role { text }
+   db.confgroup.role.attribute = attribute role { text }
 
-   confgroup.attlist =
-      confgroup.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.confgroup.attributes
+   db.confgroup.attlist =
+      db.confgroup.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.confgroup =
       element confgroup {
-         confgroup.attlist,
+         db.confgroup.attlist,
          (db.confdates
           | db.conftitle
           | db.confnum
@@ -3924,20 +3470,17 @@ div {
 ]
 div {
 
-   local.confdates.attributes = empty
-
-   confdates.role.attribute = attribute role { text }
+   db.confdates.role.attribute = attribute role { text }
 
-   confdates.attlist =
-      confdates.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.confdates.attributes
+   db.confdates.attlist =
+      db.confdates.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.confdates =
       element confdates {
-         confdates.attlist,
-         docbook.text
+         db.confdates.attlist,
+         db._text
       }
 }
 
@@ -3949,20 +3492,17 @@ div {
 ]
 div {
 
-   local.conftitle.attributes = empty
+   db.conftitle.role.attribute = attribute role { text }
 
-   conftitle.role.attribute = attribute role { text }
-
-   conftitle.attlist =
-      conftitle.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.conftitle.attributes
+   db.conftitle.attlist =
+      db.conftitle.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.conftitle =
       element conftitle {
-         conftitle.attlist,
-         docbook.text
+         db.conftitle.attlist,
+         db._text
       }
 }
 
@@ -3974,20 +3514,17 @@ div {
 ]
 div {
 
-   local.confnum.attributes = empty
-
-   confnum.role.attribute = attribute role { text }
+   db.confnum.role.attribute = attribute role { text }
 
-   confnum.attlist =
-      confnum.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.confnum.attributes
+   db.confnum.attlist =
+      db.confnum.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.confnum =
       element confnum {
-         confnum.attlist,
-         docbook.text
+         db.confnum.attlist,
+         db._text
       }
 }
 
@@ -3999,20 +3536,17 @@ div {
 ]
 div {
 
-   local.confsponsor.attributes = empty
-
-   confsponsor.role.attribute = attribute role { text }
+   db.confsponsor.role.attribute = attribute role { text }
 
-   confsponsor.attlist =
-      confsponsor.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.confsponsor.attributes
+   db.confsponsor.attlist =
+      db.confsponsor.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.confsponsor =
       element confsponsor {
-         confsponsor.attlist,
-         docbook.text
+         db.confsponsor.attlist,
+         db._text
       }
 }
 
@@ -4024,20 +3558,17 @@ div {
 ]
 div {
 
-   local.contractnum.attributes = empty
+   db.contractnum.role.attribute = attribute role { text }
 
-   contractnum.role.attribute = attribute role { text }
-
-   contractnum.attlist =
-      contractnum.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.contractnum.attributes
+   db.contractnum.attlist =
+      db.contractnum.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.contractnum =
       element contractnum {
-         contractnum.attlist,
-         docbook.text
+         db.contractnum.attlist,
+         db._text
       }
 }
 
@@ -4049,20 +3580,17 @@ div {
 ]
 div {
 
-   local.contractsponsor.attributes = empty
-
-   contractsponsor.role.attribute = attribute role { text }
+   db.contractsponsor.role.attribute = attribute role { text }
 
-   contractsponsor.attlist =
-      contractsponsor.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.contractsponsor.attributes
+   db.contractsponsor.attlist =
+      db.contractsponsor.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.contractsponsor =
       element contractsponsor {
-         contractsponsor.attlist,
-         docbook.text
+         db.contractsponsor.attlist,
+         db._text
       }
 }
 
@@ -4074,19 +3602,16 @@ div {
 ]
 div {
 
-   local.copyright.attributes = empty
-
-   copyright.role.attribute = attribute role { text }
+   db.copyright.role.attribute = attribute role { text }
 
-   copyright.attlist =
-      copyright.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.copyright.attributes
+   db.copyright.attlist =
+      db.copyright.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.copyright =
       element copyright {
-         copyright.attlist,
+         db.copyright.attlist,
          db.year+,
          db.holder*
       }
@@ -4100,20 +3625,17 @@ div {
 ]
 div {
 
-   local.year.attributes = empty
+   db.year.role.attribute = attribute role { text }
 
-   year.role.attribute = attribute role { text }
-
-   year.attlist =
-      year.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.year.attributes
+   db.year.attlist =
+      db.year.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.year =
       element year {
-         year.attlist,
-         docbook.text
+         db.year.attlist,
+         db._text
       }
 }
 
@@ -4125,45 +3647,43 @@ div {
 ]
 div {
 
-   local.holder.attributes = empty
-
-   holder.role.attribute = attribute role { text }
+   db.holder.role.attribute = attribute role { text }
 
-   holder.attlist =
-      holder.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.holder.attributes
+   db.holder.attlist =
+      db.holder.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.holder =
       element holder {
-         holder.attlist,
-         docbook.text
+         db.holder.attlist,
+         db._text
       }
 }
 
 # ======================================================================
 
+db.date.contentmodel = (xsd:date|xsd:dateTime|xsd:gYearMonth|xsd:gYear)
+
+# ======================================================================
+
 [
    db:refname [ "date" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.date.attributes = empty
-
-   date.role.attribute = attribute role { text }
+   db.date.role.attribute = attribute role { text }
 
-   date.attlist =
-      date.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.date.attributes
+   db.date.attlist =
+      db.date.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.date =
       element date {
-         date.attlist,
-         (xsd:date|xsd:dateTime|xsd:gYearMonth|xsd:gYear)
+         db.date.attlist,
+         db.date.contentmodel
       }
 }
 
@@ -4175,20 +3695,17 @@ div {
 ]
 div {
 
-   local.edition.attributes = empty
+   db.edition.role.attribute = attribute role { text }
 
-   edition.role.attribute = attribute role { text }
-
-   edition.attlist =
-      edition.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.edition.attributes
+   db.edition.attlist =
+      db.edition.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.edition =
       element edition {
-         edition.attlist,
-         docbook.text
+         db.edition.attlist,
+         db._text
       }
 }
 
@@ -4200,20 +3717,17 @@ div {
 ]
 div {
 
-   local.editor.attributes = empty
-
-   editor.role.attribute = attribute role { text }
+   db.editor.role.attribute = attribute role { text }
 
-   editor.attlist =
-      editor.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.editor.attributes
+   db.editor.attlist =
+      db.editor.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.editor =
       element editor {
-         editor.attlist,
-         credit.contentmodel
+         db.editor.attlist,
+         db.credit.contentmodel
       }
 }
 
@@ -4225,21 +3739,18 @@ div {
 ]
 div {
 
-   local.biblioid.attributes = empty
-
-   biblioid.role.attribute = attribute role { text }
+   db.biblioid.role.attribute = attribute role { text }
 
-   biblioid.attlist =
-      biblioid.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & biblio.class.attrib
-    & local.biblioid.attributes
+   db.biblioid.attlist =
+      db.biblioid.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.biblio.class.attribute
 
    db.biblioid =
       element biblioid {
-         biblioid.attlist,
-         docbook.text
+         db.biblioid.attlist,
+         db._text
       }
 }
 
@@ -4251,21 +3762,18 @@ div {
 ]
 div {
 
-   local.citebiblioid.attributes = empty
+   db.citebiblioid.role.attribute = attribute role { text }
 
-   citebiblioid.role.attribute = attribute role { text }
-
-   citebiblioid.attlist =
-      citebiblioid.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & biblio.class.attrib
-    & local.citebiblioid.attributes
+   db.citebiblioid.attlist =
+      db.citebiblioid.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.biblio.class.attribute
 
    db.citebiblioid =
       element citebiblioid {
-         citebiblioid.attlist,
-         docbook.text
+         db.citebiblioid.attlist,
+         db._text
       }
 }
 
@@ -4277,21 +3785,18 @@ div {
 ]
 div {
 
-   local.bibliosource.attributes = empty
-
-   bibliosource.role.attribute = attribute role { text }
+   db.bibliosource.role.attribute = attribute role { text }
 
-   bibliosource.attlist =
-      bibliosource.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & biblio.class.attrib
-    & local.bibliosource.attributes
+   db.bibliosource.attlist =
+      db.bibliosource.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.biblio.class.attribute
 
    db.bibliosource =
       element bibliosource {
-         bibliosource.attlist,
-         docbook.text
+         db.bibliosource.attlist,
+         db._text
       }
 }
 
@@ -4303,13 +3808,11 @@ div {
 ]
 div {
 
-   local.bibliorelation.attributes = empty
-
-   ctrl:other-attribute [ name="bibliorelation.type.attrib"
-                          enum-name="bibliorelation.type-enum.attribute"
-                          other-name="bibliorelation.type-other.attributes" ]
+   ctrl:other-attribute [ name="db.bibliorelation.type.attrib"
+                          enum-name="db.bibliorelation.type-enum.attribute"
+                          other-name="db.bibliorelation.type-other.attributes" ]
 
-   bibliorelation.type-enum.attribute =
+   db.bibliorelation.type-enum.attribute =
       attribute type {
          "hasformat"
        | "haspart"
@@ -4326,27 +3829,26 @@ div {
        | "requires"
       }?
 
-   bibliorelation.type-other.attributes =
+   db.bibliorelation.type-other.attributes =
       attribute type { "othertype" }?,
       attribute othertype { xsd:NMTOKEN }
 
-   bibliorelation.type.attrib =
-      (bibliorelation.type-enum.attribute | bibliorelation.type-other.attributes)
+   db.bibliorelation.type.attribute =
+      (db.bibliorelation.type-enum.attribute | db.bibliorelation.type-other.attributes)
 
-   bibliorelation.role.attribute = attribute role { text }
+   db.bibliorelation.role.attribute = attribute role { text }
 
-   bibliorelation.attlist =
-      bibliorelation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & biblio.class.attrib
-    & bibliorelation.type.attrib
-    & local.bibliorelation.attributes
+   db.bibliorelation.attlist =
+      db.bibliorelation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.biblio.class.attribute
+    & db.bibliorelation.type.attribute
 
    db.bibliorelation =
       element bibliorelation {
-         bibliorelation.attlist,
-         docbook.text
+         db.bibliorelation.attlist,
+         db._text
       }
 }
 
@@ -4358,56 +3860,55 @@ div {
 ]
 div {
 
-   local.bibliocoverage.attributes = empty
+   ctrl:other-attribute [ name="db.bibliocoverage.spatial.attrib"
+                          enum-name="db.bibliocoverage.spatial-enum.attribute"
+                          other-name="db.bibliocoverage.spatial-other.attributes" ]
 
-   ctrl:other-attribute [ name="bibliocoverage.spatial.attrib"
-                          enum-name="bibliocoverage.spatial-enum.attribute"
-                          other-name="bibliocoverage.spatial-other.attributes" ]
-
-   bibliocoverage.spatial-enum.attribute =
+   db.bibliocoverage.spatial-enum.attribute =
       attribute spatial {
          "dcmipoint" | "iso3166" | "dcmibox" | "tgn"
       }?
 
-   bibliocoverage.spatial-other.attributes =
+   db.bibliocoverage.spatial-other.attributes =
       attribute spatial { "otherspatial" }?,
       attribute otherspatial { xsd:NMTOKEN }
 
-   bibliocoverage.spatial.attrs =
-      (bibliocoverage.spatial-enum.attribute | bibliocoverage.spatial-other.attributes)
+   db.bibliocoverage.spatial.attribute =
+      (db.bibliocoverage.spatial-enum.attribute
+       | db.bibliocoverage.spatial-other.attributes)
 
-   ctrl:other-attribute [ name="bibliocoverage.temporal.attrib"
-                          enum-name="bibliocoverage.temporal-enum.attribute"
-                          other-name="bibliocoverage.temporal-other.attributes" ]
+   ctrl:other-attribute [ name="db.bibliocoverage.temporal.attrib"
+                          enum-name="db.bibliocoverage.temporal-enum.attribute"
+                          other-name="db.bibliocoverage.temporal-other.attributes" ]
 
-   bibliocoverage.temporal-enum.attribute =
+   db.bibliocoverage.temporal-enum.attribute =
       attribute temporal {
          "dcmiperiod" | "w3c-dtf"
       }?
 
-   bibliocoverage.temporal-other.attributes =
+   db.bibliocoverage.temporal-other.attributes =
       attribute temporal { "othertemporal" }?,
       attribute othertemporal { xsd:NMTOKEN }
 
-   bibliocoverage.temporal.attrs =
-      (bibliocoverage.temporal-enum.attribute | bibliocoverage.temporal-other.attributes)
+   db.bibliocoverage.temporal.attribute =
+      (db.bibliocoverage.temporal-enum.attribute
+       | db.bibliocoverage.temporal-other.attributes)
 
-   bibliocoverage.coverage.attrib =
-      bibliocoverage.spatial.attrs & bibliocoverage.temporal.attrs
+   db.bibliocoverage.coverage.attrib =
+      db.bibliocoverage.spatial.attribute & db.bibliocoverage.temporal.attribute
 
-   bibliocoverage.role.attribute = attribute role { text }
+   db.bibliocoverage.role.attribute = attribute role { text }
 
-   bibliocoverage.attlist =
-      bibliocoverage.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & bibliocoverage.coverage.attrib
-    & local.bibliocoverage.attributes
+   db.bibliocoverage.attlist =
+      db.bibliocoverage.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.bibliocoverage.coverage.attrib
 
    db.bibliocoverage =
       element bibliocoverage {
-         bibliocoverage.attlist,
-         docbook.text
+         db.bibliocoverage.attlist,
+         db._text
       }
 }
 
@@ -4419,23 +3920,20 @@ div {
 ]
 div {
 
-   local.legalnotice.attributes = empty
-
-   legalnotice.role.attribute = attribute role { text }
+   db.legalnotice.role.attribute = attribute role { text }
 
-   legalnotice.attlist =
-      legalnotice.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.legalnotice.attributes
+   db.legalnotice.attlist =
+      db.legalnotice.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   legalnotice.info = docbook.info.titleonly
+   db.legalnotice.info = db._info.title.only
 
    db.legalnotice =
       element legalnotice {
-         legalnotice.attlist,
-         legalnotice.info,
-         blocks+
+         db.legalnotice.attlist,
+         db.legalnotice.info,
+         db.all.blocks+
       }
 }
 
@@ -4447,9 +3945,7 @@ div {
 ]
 div {
 
-   local.othercredit.attributes = empty
-
-   othercredit.class.attribute = attribute class {
+   db.othercredit.class.attribute = attribute class {
       "copyeditor"
     | "graphicdesigner"
     | "other"
@@ -4458,19 +3954,18 @@ div {
     | "translator"
    }?
 
-   othercredit.role.attribute = attribute role { text }
+   db.othercredit.role.attribute = attribute role { text }
 
-   othercredit.attlist =
-      othercredit.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & othercredit.class.attribute
-    & local.othercredit.attributes
+   db.othercredit.attlist =
+      db.othercredit.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.othercredit.class.attribute
 
    db.othercredit =
       element othercredit {
-         othercredit.attlist,
-         credit.contentmodel
+         db.othercredit.attlist,
+         db.credit.contentmodel
       }
 }
 
@@ -4482,20 +3977,17 @@ div {
 ]
 div {
 
-   local.pagenums.attributes = empty
+   db.pagenums.role.attribute = attribute role { text }
 
-   pagenums.role.attribute = attribute role { text }
-
-   pagenums.attlist =
-      pagenums.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.pagenums.attributes
+   db.pagenums.attlist =
+      db.pagenums.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.pagenums =
       element pagenums {
-         pagenums.attlist,
-         docbook.text
+         db.pagenums.attlist,
+         db._text
       }
 }
 
@@ -4507,20 +3999,17 @@ div {
 ]
 div {
 
-   local.contrib.attributes = empty
-
-   contrib.role.attribute = attribute role { text }
+   db.contrib.role.attribute = attribute role { text }
 
-   contrib.attlist =
-      contrib.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.contrib.attributes
+   db.contrib.attlist =
+      db.contrib.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.contrib =
       element contrib {
-         contrib.attlist,
-         docbook.text
+         db.contrib.attlist,
+         db._text
       }
 }
 
@@ -4532,20 +4021,17 @@ div {
 ]
 div {
 
-   local.honorific.attributes = empty
-
-   honorific.role.attribute = attribute role { text }
+   db.honorific.role.attribute = attribute role { text }
 
-   honorific.attlist =
-      honorific.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.honorific.attributes
+   db.honorific.attlist =
+      db.honorific.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.honorific =
       element honorific {
-         honorific.attlist,
-         docbook.text
+         db.honorific.attlist,
+         db._text
       }
 }
 
@@ -4557,20 +4043,17 @@ div {
 ]
 div {
 
-   local.firstname.attributes = empty
+   db.firstname.role.attribute = attribute role { text }
 
-   firstname.role.attribute = attribute role { text }
-
-   firstname.attlist =
-      firstname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.firstname.attributes
+   db.firstname.attlist =
+      db.firstname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.firstname =
       element firstname {
-         firstname.attlist,
-         docbook.text
+         db.firstname.attlist,
+         db._text
       }
 }
 
@@ -4582,20 +4065,17 @@ div {
 ]
 div {
 
-   local.surname.attributes = empty
-
-   surname.role.attribute = attribute role { text }
+   db.surname.role.attribute = attribute role { text }
 
-   surname.attlist =
-      surname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.surname.attributes
+   db.surname.attlist =
+      db.surname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.surname =
       element surname {
-         surname.attlist,
-         docbook.text
+         db.surname.attlist,
+         db._text
       }
 }
 
@@ -4607,20 +4087,17 @@ div {
 ]
 div {
 
-   local.lineage.attributes = empty
-
-   lineage.role.attribute = attribute role { text }
+   db.lineage.role.attribute = attribute role { text }
 
-   lineage.attlist =
-      lineage.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.lineage.attributes
+   db.lineage.attlist =
+      db.lineage.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.lineage =
       element lineage {
-         lineage.attlist,
-         docbook.text
+         db.lineage.attlist,
+         db._text
       }
 }
 
@@ -4632,20 +4109,17 @@ div {
 ]
 div {
 
-   local.othername.attributes = empty
+   db.othername.role.attribute = attribute role { text }
 
-   othername.role.attribute = attribute role { text }
-
-   othername.attlist =
-      othername.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.othername.attributes
+   db.othername.attlist =
+      db.othername.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.othername =
       element othername {
-         othername.attlist,
-         docbook.text
+         db.othername.attlist,
+         db._text
       }
 }
 
@@ -4657,20 +4131,17 @@ div {
 ]
 div {
 
-   local.printhistory.attributes = empty
-
-   printhistory.role.attribute = attribute role { text }
+   db.printhistory.role.attribute = attribute role { text }
 
-   printhistory.attlist =
-      printhistory.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.printhistory.attributes
+   db.printhistory.attlist =
+      db.printhistory.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.printhistory =
       element printhistory {
-         printhistory.attlist,
-         para.blocks+
+         db.printhistory.attlist,
+         db.para.blocks+
       }
 }
 
@@ -4682,25 +4153,18 @@ div {
 ]
 div {
 
-   local.productname.attributes = empty
-
-   productname.class.attribute = attribute class {
-      "copyright" | "registered" | "service" | "trade"
-   }?
-
-   productname.role.attribute = attribute role { text }
+   db.productname.role.attribute = attribute role { text }
 
-   productname.attlist =
-      productname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & productname.class.attribute
-    & local.productname.attributes
+   db.productname.attlist =
+      db.productname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & attribute class { "copyright" | "registered" | "service" | "trade" }?
 
    db.productname =
       element productname {
-         productname.attlist,
-         docbook.text
+         db.productname.attlist,
+         db._text
       }
 }
 
@@ -4712,20 +4176,17 @@ div {
 ]
 div {
 
-   local.productnumber.attributes = empty
-
-   productnumber.role.attribute = attribute role { text }
+   db.productnumber.role.attribute = attribute role { text }
 
-   productnumber.attlist =
-      productnumber.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.productnumber.attributes
+   db.productnumber.attlist =
+      db.productnumber.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.productnumber =
       element productnumber {
-         productnumber.attlist,
-         docbook.text
+         db.productnumber.attlist,
+         db._text
       }
 }
 
@@ -4737,20 +4198,17 @@ div {
 ]
 div {
 
-   local.pubdate.attributes = empty
+   db.pubdate.role.attribute = attribute role { text }
 
-   pubdate.role.attribute = attribute role { text }
-
-   pubdate.attlist =
-      pubdate.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.pubdate.attributes
+   db.pubdate.attlist =
+      db.pubdate.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.pubdate =
       element pubdate {
-         pubdate.attlist,
-         (xsd:date|xsd:dateTime|xsd:gYearMonth|xsd:gYear)
+         db.pubdate.attlist,
+         db.date.contentmodel
       }
 }
 
@@ -4762,19 +4220,16 @@ div {
 ]
 div {
 
-   local.publisher.attributes = empty
-
-   publisher.role.attribute = attribute role { text }
+   db.publisher.role.attribute = attribute role { text }
 
-   publisher.attlist =
-      publisher.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.publisher.attributes
+   db.publisher.attlist =
+      db.publisher.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.publisher =
       element publisher {
-         publisher.attlist,
+         db.publisher.attlist,
          db.publishername,
          db.address*
       }
@@ -4788,20 +4243,17 @@ div {
 ]
 div {
 
-   local.publishername.attributes = empty
-
-   publishername.role.attribute = attribute role { text }
+   db.publishername.role.attribute = attribute role { text }
 
-   publishername.attlist =
-      publishername.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.publishername.attributes
+   db.publishername.attlist =
+      db.publishername.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.publishername =
       element publishername {
-         publishername.attlist,
-         docbook.text
+         db.publishername.attlist,
+         db._text
       }
 }
 
@@ -4813,20 +4265,17 @@ div {
 ]
 div {
 
-   local.releaseinfo.attributes = empty
+   db.releaseinfo.role.attribute = attribute role { text }
 
-   releaseinfo.role.attribute = attribute role { text }
-
-   releaseinfo.attlist =
-      releaseinfo.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.releaseinfo.attributes
+   db.releaseinfo.attlist =
+      db.releaseinfo.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.releaseinfo =
       element releaseinfo {
-         releaseinfo.attlist,
-         docbook.text
+         db.releaseinfo.attlist,
+         db._text
       }
 }
 
@@ -4838,22 +4287,19 @@ div {
 ]
 div {
 
-   local.revhistory.attributes = empty
-
-   revhistory.role.attribute = attribute role { text }
+   db.revhistory.role.attribute = attribute role { text }
 
-   revhistory.attlist =
-      revhistory.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.revhistory.attributes
+   db.revhistory.attlist =
+      db.revhistory.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   revhistory.info = docbook.info.titleonly
+   db.revhistory.info = db._info.title.only
 
    db.revhistory =
       element revhistory {
-         revhistory.attlist,
-         revhistory.info,
+         db.revhistory.attlist,
+         db.revhistory.info,
          db.revision+
       }
 }
@@ -4866,19 +4312,16 @@ div {
 ]
 div {
 
-   local.revision.attributes = empty
-
-   revision.role.attribute = attribute role { text }
+   db.revision.role.attribute = attribute role { text }
 
-   revision.attlist =
-      revision.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.revision.attributes
+   db.revision.attlist =
+      db.revision.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.revision =
       element revision {
-         revision.attlist,
+         db.revision.attlist,
          db.revnumber,
          db.date,
          (db.authorinitials | db.author)*,
@@ -4894,20 +4337,17 @@ div {
 ]
 div {
 
-   local.revnumber.attributes = empty
+   db.revnumber.role.attribute = attribute role { text }
 
-   revnumber.role.attribute = attribute role { text }
-
-   revnumber.attlist =
-      revnumber.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.revnumber.attributes
+   db.revnumber.attlist =
+      db.revnumber.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.revnumber =
       element revnumber {
-         revnumber.attlist,
-         docbook.text
+         db.revnumber.attlist,
+         db._text
       }
 }
 
@@ -4919,20 +4359,17 @@ div {
 ]
 div {
 
-   local.revremark.attributes = empty
-
-   revremark.role.attribute = attribute role { text }
+   db.revremark.role.attribute = attribute role { text }
 
-   revremark.attlist =
-      revremark.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.revremark.attributes
+   db.revremark.attlist =
+      db.revremark.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.revremark =
       element revremark {
-         revremark.attlist,
-         docbook.text
+         db.revremark.attlist,
+         db._text
       }
 }
 
@@ -4944,20 +4381,17 @@ div {
 ]
 div {
 
-   local.revdescription.attributes = empty
-
-   revdescription.role.attribute = attribute role { text }
+   db.revdescription.role.attribute = attribute role { text }
 
-   revdescription.attlist =
-      revdescription.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.revdescription.attributes
+   db.revdescription.attlist =
+      db.revdescription.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.revdescription =
       element revdescription {
-         revdescription.attlist,
-         blocks*
+         db.revdescription.attlist,
+         db.all.blocks*
       }
 }
 
@@ -4969,20 +4403,17 @@ div {
 ]
 div {
 
-   local.seriesvolnums.attributes = empty
+   db.seriesvolnums.role.attribute = attribute role { text }
 
-   seriesvolnums.role.attribute = attribute role { text }
-
-   seriesvolnums.attlist =
-      seriesvolnums.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.seriesvolnums.attributes
+   db.seriesvolnums.attlist =
+      db.seriesvolnums.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.seriesvolnums =
       element seriesvolnums {
-         seriesvolnums.attlist,
-         docbook.text
+         db.seriesvolnums.attlist,
+         db._text
       }
 }
 
@@ -4994,20 +4425,17 @@ div {
 ]
 div {
 
-   local.volumenum.attributes = empty
-
-   volumenum.role.attribute = attribute role { text }
+   db.volumenum.role.attribute = attribute role { text }
 
-   volumenum.attlist =
-      volumenum.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.volumenum.attributes
+   db.volumenum.attlist =
+      db.volumenum.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.volumenum =
       element volumenum {
-         volumenum.attlist,
-         docbook.text
+         db.volumenum.attlist,
+         db._text
       }
 }
 
@@ -5019,20 +4447,17 @@ div {
 ]
 div {
 
-   local.issuenum.attributes = empty
-
-   issuenum.role.attribute = attribute role { text }
+   db.issuenum.role.attribute = attribute role { text }
 
-   issuenum.attlist =
-      issuenum.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.issuenum.attributes
+   db.issuenum.attlist =
+      db.issuenum.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.issuenum =
       element issuenum {
-         issuenum.attlist,
-         docbook.text
+         db.issuenum.attlist,
+         db._text
       }
 }
 
@@ -5044,20 +4469,17 @@ div {
 ]
 div {
 
-   local..attributes = empty
+   db.accel.role.attribute = attribute role { text }
 
-   accel.role.attribute = attribute role { text }
-
-   accel.attlist =
-      accel.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local..attributes
+   db.accel.attlist =
+      db.accel.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.accel  =
       element accel {
-         accel.attlist,
-         docbook.text
+         db.accel.attlist,
+         db._text
       }
 }
 
@@ -5069,23 +4491,20 @@ div {
 ]
 div {
 
-   local.application.attributes = empty
-
    application.class.attribute = attribute class { "hardware" | "software" }
 
-   application.role.attribute = attribute role { text }
+   db.application.role.attribute = attribute role { text }
 
-   application.attlist =
-      application.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.application.attlist =
+      db.application.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & application.class.attribute?
-    & local.application.attributes
 
    db.application =
       element application {
-         application.attlist,
-         docbook.text
+         db.application.attlist,
+         db._text
       }
 }
 
@@ -5097,20 +4516,17 @@ div {
 ]
 div {
 
-   local.package.attributes = empty
-
-   package.role.attribute = attribute role { text }
+   db.package.role.attribute = attribute role { text }
 
-   package.attlist =
-      package.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.package.attributes
+   db.package.attlist =
+      db.package.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.package =
       element package {
-         package.attlist,
-         docbook.text
+         db.package.attlist,
+         db._text
       }
 }
 
@@ -5122,20 +4538,17 @@ div {
 ]
 div {
 
-   local.classname.attributes = empty
+   db.classname.role.attribute = attribute role { text }
 
-   classname.role.attribute = attribute role { text }
-
-   classname.attlist =
-      classname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.classname.attributes
+   db.classname.attlist =
+      db.classname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.classname =
       element classname {
-         classname.attlist,
-         docbook.text
+         db.classname.attlist,
+         db._text
       }
 }
 
@@ -5147,26 +4560,23 @@ div {
 ]
 div {
 
-   local.command.attributes = empty
-
-   command.role.attribute = attribute role { text }
+   db.command.role.attribute = attribute role { text }
 
-   command.attlist =
-      command.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.command.attributes
+   db.command.attlist =
+      db.command.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.command =
       element command {
-         command.attlist,
-         inlines*
+         db.command.attlist,
+         db.all.inlines*
       }
 }
 
 # ======================================================================
 
-computeroutput.inlines = (inlines)
+db.computeroutput.contentmodel = (db.all.inlines*)
 
 # ======================================================================
 
@@ -5176,20 +4586,17 @@ computeroutput.inlines = (inlines)
 ]
 div {
 
-   local.computeroutput.attributes = empty
-
-   computeroutput.role.attribute = attribute role { text }
+   db.computeroutput.role.attribute = attribute role { text }
 
-   computeroutput.attlist =
-      computeroutput.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.computeroutput.attributes
+   db.computeroutput.attlist =
+      db.computeroutput.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.computeroutput =
       element computeroutput {
-         computeroutput.attlist,
-         computeroutput.inlines*
+         db.computeroutput.attlist,
+         db.computeroutput.contentmodel
       }
 }
 
@@ -5201,9 +4608,7 @@ div {
 ]
 div {
 
-   local.database.attributes = empty
-
-   database.class.attribute =
+   db.database.class.attribute =
       attribute class {
          "altkey"
        | "constraint"
@@ -5225,19 +4630,18 @@ div {
        | "view"
       }
 
-   database.role.attribute = attribute role { text }
+   db.database.role.attribute = attribute role { text }
 
-   database.attlist =
-      database.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & database.class.attribute?
-    & local.database.attributes
+   db.database.attlist =
+      db.database.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.database.class.attribute?
 
    db.database =
       element database {
-         database.attlist,
-         docbook.text
+         db.database.attlist,
+         db._text
       }
 }
 
@@ -5249,20 +4653,17 @@ div {
 ]
 div {
 
-   local.email.attributes = empty
-
-   email.role.attribute = attribute role { text }
+   db.email.role.attribute = attribute role { text }
 
-   email.attlist =
-      email.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.email.attributes
+   db.email.attlist =
+      db.email.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.email =
       element email {
-         email.attlist,
-         docbook.text
+         db.email.attlist,
+         db._text
       }
 }
 
@@ -5274,20 +4675,17 @@ div {
 ]
 div {
 
-   local.envar.attributes = empty
-
-   envar.role.attribute = attribute role { text }
+   db.envar.role.attribute = attribute role { text }
 
-   envar.attlist =
-      envar.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.envar.attributes
+   db.envar.attlist =
+      db.envar.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.envar =
       element envar {
-         envar.attlist,
-         docbook.text
+         db.envar.attlist,
+         db._text
       }
 }
 
@@ -5299,20 +4697,17 @@ div {
 ]
 div {
 
-   local.errorcode.attributes = empty
+   db.errorcode.role.attribute = attribute role { text }
 
-   errorcode.role.attribute = attribute role { text }
-
-   errorcode.attlist =
-      errorcode.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.errorcode.attributes
+   db.errorcode.attlist =
+      db.errorcode.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.errorcode =
       element errorcode {
-         errorcode.attlist,
-         docbook.text
+         db.errorcode.attlist,
+         db._text
       }
 }
 
@@ -5324,20 +4719,17 @@ div {
 ]
 div {
 
-   local.errorname.attributes = empty
-
-   errorname.role.attribute = attribute role { text }
+   db.errorname.role.attribute = attribute role { text }
 
-   errorname.attlist =
-      errorname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.errorname.attributes
+   db.errorname.attlist =
+      db.errorname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.errorname =
       element errorname {
-         errorname.attlist,
-         docbook.text
+         db.errorname.attlist,
+         db._text
       }
 }
 
@@ -5349,20 +4741,17 @@ div {
 ]
 div {
 
-   local.errortext.attributes = empty
-
-   errortext.role.attribute = attribute role { text }
+   db.errortext.role.attribute = attribute role { text }
 
-   errortext.attlist =
-      errortext.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.errortext.attributes
+   db.errortext.attlist =
+      db.errortext.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.errortext =
       element errortext {
-         errortext.attlist,
-         docbook.text
+         db.errortext.attlist,
+         db._text
       }
 }
 
@@ -5374,20 +4763,17 @@ div {
 ]
 div {
 
-   local.errortype.attributes = empty
+   db.errortype.role.attribute = attribute role { text }
 
-   errortype.role.attribute = attribute role { text }
-
-   errortype.attlist =
-      errortype.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.errortype.attributes
+   db.errortype.attlist =
+      db.errortype.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.errortype =
       element errortype {
-         errortype.attlist,
-         docbook.text
+         db.errortype.attlist,
+         db._text
       }
 }
 
@@ -5399,10 +4785,8 @@ div {
 ]
 div {
 
-   local.filename.attributes = empty
-
-   filename.path.attribute = attribute path { text }
-   filename.class.attribute =
+   db.filename.path.attribute = attribute path { text }
+   db.filename.class.attribute =
       attribute class {
          "devicefile"
        | "directory"
@@ -5413,20 +4797,19 @@ div {
        | "symlink"
       }
 
-   filename.role.attribute = attribute role { text }
+   db.filename.role.attribute = attribute role { text }
 
-   filename.attlist =
-      filename.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & filename.path.attribute?
-    & filename.class.attribute?
-    & local.filename.attributes
+   db.filename.attlist =
+      db.filename.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.filename.path.attribute?
+    & db.filename.class.attribute?
 
    db.filename =
       element filename {
-         filename.attlist,
-         docbook.text
+         db.filename.attlist,
+         db._text
       }
 }
 
@@ -5438,20 +4821,17 @@ div {
 ]
 div {
 
-   local.function.attributes = empty
-
-   function.role.attribute = attribute role { text }
+   db.function.role.attribute = attribute role { text }
 
-   function.attlist =
-      function.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.function.attributes
+   db.function.attlist =
+      db.function.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.function =
       element function {
-         function.attlist,
-         docbook.text
+         db.function.attlist,
+         db._text
       }
 }
 
@@ -5463,20 +4843,17 @@ div {
 ]
 div {
 
-   local.guibutton.attributes = empty
+   db.guibutton.role.attribute = attribute role { text }
 
-   guibutton.role.attribute = attribute role { text }
-
-   guibutton.attlist =
-      guibutton.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.guibutton.attributes
+   db.guibutton.attlist =
+      db.guibutton.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.guibutton =
       element guibutton {
-         guibutton.attlist,
-         (docbook.text | db.accel | db.superscript | db.subscript)*
+         db.guibutton.attlist,
+         (db._text | db.accel | db.superscript | db.subscript)*
       }
 }
 
@@ -5488,20 +4865,17 @@ div {
 ]
 div {
 
-   local.guiicon.attributes = empty
-
-   guiicon.role.attribute = attribute role { text }
+   db.guiicon.role.attribute = attribute role { text }
 
-   guiicon.attlist =
-      guiicon.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.guiicon.attributes
+   db.guiicon.attlist =
+      db.guiicon.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.guiicon =
       element guiicon {
-         guiicon.attlist,
-         (docbook.text | db.accel | db.superscript | db.subscript)*
+         db.guiicon.attlist,
+         (db._text | db.accel | db.superscript | db.subscript)*
       }
 }
 
@@ -5513,20 +4887,17 @@ div {
 ]
 div {
 
-   local.guilabel.attributes = empty
-
-   guilabel.role.attribute = attribute role { text }
+   db.guilabel.role.attribute = attribute role { text }
 
-   guilabel.attlist =
-      guilabel.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.guilabel.attributes
+   db.guilabel.attlist =
+      db.guilabel.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.guilabel =
       element guilabel {
-         guilabel.attlist,
-         (docbook.text | db.accel | db.superscript | db.subscript)*
+         db.guilabel.attlist,
+         (db._text | db.accel | db.superscript | db.subscript)*
       }
 }
 
@@ -5538,20 +4909,17 @@ div {
 ]
 div {
 
-   local.guimenu.attributes = empty
+   db.guimenu.role.attribute = attribute role { text }
 
-   guimenu.role.attribute = attribute role { text }
-
-   guimenu.attlist =
-      guimenu.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.guimenu.attributes
+   db.guimenu.attlist =
+      db.guimenu.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.guimenu =
       element guimenu {
-         guimenu.attlist,
-         (docbook.text | db.accel | db.superscript | db.subscript)*
+         db.guimenu.attlist,
+         (db._text | db.accel | db.superscript | db.subscript)*
       }
 }
 
@@ -5563,20 +4931,17 @@ div {
 ]
 div {
 
-   local.guimenuitem.attributes = empty
-
-   guimenuitem.role.attribute = attribute role { text }
+   db.guimenuitem.role.attribute = attribute role { text }
 
-   guimenuitem.attlist =
-      guimenuitem.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.guimenuitem.attributes
+   db.guimenuitem.attlist =
+      db.guimenuitem.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.guimenuitem =
       element guimenuitem {
-         guimenuitem.attlist,
-         (docbook.text | db.accel | db.superscript | db.subscript)*
+         db.guimenuitem.attlist,
+         (db._text | db.accel | db.superscript | db.subscript)*
       }
 }
 
@@ -5588,20 +4953,17 @@ div {
 ]
 div {
 
-   local.guisubmenu.attributes = empty
-
-   guisubmenu.role.attribute = attribute role { text }
+   db.guisubmenu.role.attribute = attribute role { text }
 
-   guisubmenu.attlist =
-      guisubmenu.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.guisubmenu.attributes
+   db.guisubmenu.attlist =
+      db.guisubmenu.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.guisubmenu =
       element guisubmenu {
-         guisubmenu.attlist,
-         (docbook.text | db.accel | db.superscript | db.subscript)*
+         db.guisubmenu.attlist,
+         (db._text | db.accel | db.superscript | db.subscript)*
       }
 }
 
@@ -5613,20 +4975,17 @@ div {
 ]
 div {
 
-   local.hardware.attributes = empty
+   db.hardware.role.attribute = attribute role { text }
 
-   hardware.role.attribute = attribute role { text }
-
-   hardware.attlist =
-      hardware.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.hardware.attributes
+   db.hardware.attlist =
+      db.hardware.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.hardware =
       element hardware {
-         hardware.attlist,
-         docbook.text
+         db.hardware.attlist,
+         db._text
       }
 }
 
@@ -5638,13 +4997,11 @@ div {
 ]
 div {
 
-   local.keycap.attributes = empty
-
-   ctrl:other-attribute [ name="keycap.function.attrib"
-                          enum-name="keycap.function-enum.attribute"
-                          other-name="keycap.function-other.attributes" ]
+   ctrl:other-attribute [ name="db.keycap.function.attrib"
+                          enum-name="db.keycap.function-enum.attribute"
+                          other-name="db.keycap.function-other.attributes" ]
 
-   keycap.function-enum.attribute =
+   db.keycap.function-enum.attribute =
       attribute function {
          "alt"
        | "backspace"
@@ -5669,26 +5026,25 @@ div {
        | "up"
       }?
 
-   keycap.function-other.attributes =
+   db.keycap.function-other.attributes =
       attribute function { "other" }?,
       attribute otherfunction { text }
 
-   keycap.function.attrib =
-      (keycap.function-enum.attribute | keycap.function-other.attributes)
+   db.keycap.function.attrib =
+      (db.keycap.function-enum.attribute | db.keycap.function-other.attributes)
 
-   keycap.role.attribute = attribute role { text }
+   db.keycap.role.attribute = attribute role { text }
 
-   keycap.attlist =
-      keycap.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & keycap.function.attrib
-    & local.keycap.attributes
+   db.keycap.attlist =
+      db.keycap.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.keycap.function.attrib
 
    db.keycap =
       element keycap {
-         keycap.attlist,
-         docbook.text
+         db.keycap.attlist,
+         db._text
       }
 }
 
@@ -5700,20 +5056,17 @@ div {
 ]
 div {
 
-   local.keycode.attributes = empty
-
-   keycode.role.attribute = attribute role { text }
+   db.keycode.role.attribute = attribute role { text }
 
-   keycode.attlist =
-      keycode.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.keycode.attributes
+   db.keycode.attlist =
+      db.keycode.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.keycode =
       element keycode {
-         keycode.attlist,
-         docbook.text
+         db.keycode.attlist,
+         db._text
       }
 }
 
@@ -5725,36 +5078,33 @@ div {
 ]
 div {
 
-   local.keycombo.attributes = empty
+   ctrl:other-attribute [ name="db.keycombo.action.attrib"
+                          enum-name="db.keycombo.action-enum.attribute"
+                          other-name="db.keycombo.action-other.attributes" ]
 
-   ctrl:other-attribute [ name="keycombo.action.attrib"
-                          enum-name="keycombo.action-enum.attribute"
-                          other-name="keycombo.action-other.attributes" ]
-
-   keycombo.action-enum.attribute =
+   db.keycombo.action-enum.attribute =
       attribute action {
          "click" | "double-click" | "press" | "seq" | "simul"
       }?
 
-   keycombo.action-other.attributes =
+   db.keycombo.action-other.attributes =
       attribute action { "other" }?,
       attribute otheraction { text }
 
-   keycombo.action.attrib =
-      (keycombo.action-enum.attribute | keycombo.action-other.attributes)
+   db.keycombo.action.attrib =
+      (db.keycombo.action-enum.attribute | db.keycombo.action-other.attributes)
 
-   keycombo.role.attribute = attribute role { text }
+   db.keycombo.role.attribute = attribute role { text }
 
-   keycombo.attlist =
-      keycombo.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & keycombo.action.attrib
-    & local.keycombo.attributes
+   db.keycombo.attlist =
+      db.keycombo.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.keycombo.action.attrib
 
    db.keycombo =
       element keycombo {
-         keycombo.attlist,
+         db.keycombo.attlist,
          (db.keycap|db.keycombo|db.keysym|db.mousebutton)+
       }
 }
@@ -5767,20 +5117,17 @@ div {
 ]
 div {
 
-   local.keysym.attributes = empty
-
-   keysym.role.attribute = attribute role { text }
+   db.keysym.role.attribute = attribute role { text }
 
-   keysym.attlist =
-      keysym.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.keysym.attributes
+   db.keysym.attlist =
+      db.keysym.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.keysym =
       element keysym {
-         keysym.attlist,
-         docbook.text
+         db.keysym.attlist,
+         db._text
       }
 }
 
@@ -5792,20 +5139,17 @@ div {
 ]
 div {
 
-   local.lineannotation.attributes = empty
-
-   lineannotation.role.attribute = attribute role { text }
+   db.lineannotation.role.attribute = attribute role { text }
 
-   lineannotation.attlist =
-      lineannotation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.lineannotation.attributes
+   db.lineannotation.attlist =
+      db.lineannotation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.lineannotation =
       element lineannotation {
-         lineannotation.attlist,
-         inlines*
+         db.lineannotation.attlist,
+         db.all.inlines*
       }
 }
 
@@ -5817,20 +5161,17 @@ div {
 ]
 div {
 
-   local.literal.attributes = empty
+   db.literal.role.attribute = attribute role { text }
 
-   literal.role.attribute = attribute role { text }
-
-   literal.attlist =
-      literal.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.literal.attributes
+   db.literal.attlist =
+      db.literal.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.literal =
       element literal {
-         literal.attlist,
-         inlines*
+         db.literal.attlist,
+         db.all.inlines*
       }
 }
 
@@ -5842,23 +5183,20 @@ div {
 ]
 div {
 
-   local.code.attributes = empty
-
    code.language.attribute = attribute language { text }
 
-   code.role.attribute = attribute role { text }
+   db.code.role.attribute = attribute role { text }
 
-   code.attlist =
-      code.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.code.attlist =
+      db.code.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & code.language.attribute?
-    & local.code.attributes
 
    db.code =
       element code {
-         code.attlist,
-         inlines*
+         db.code.attlist,
+         db.all.inlines*
       }
 }
 
@@ -5870,23 +5208,20 @@ div {
 ]
 div {
 
-   local.constant.attributes = empty
-
    constant.class.attribute = attribute class { "limit" }
 
-   constant.role.attribute = attribute role { text }
+   db.constant.role.attribute = attribute role { text }
 
-   constant.attlist =
-      constant.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.constant.attlist =
+      db.constant.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & constant.class.attribute?
-    & local.constant.attributes
 
    db.constant =
       element constant {
-         constant.attlist,
-         docbook.text
+         db.constant.attlist,
+         db._text
       }
 }
 
@@ -5898,20 +5233,17 @@ div {
 ]
 div {
 
-   local.varname.attributes = empty
+   db.varname.role.attribute = attribute role { text }
 
-   varname.role.attribute = attribute role { text }
-
-   varname.attlist =
-      varname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.varname.attributes
+   db.varname.attlist =
+      db.varname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.varname =
       element varname {
-         varname.attlist,
-         docbook.text
+         db.varname.attlist,
+         db._text
       }
 }
 
@@ -5923,20 +5255,17 @@ div {
 ]
 div {
 
-   local.markup.attributes = empty
-
-   markup.role.attribute = attribute role { text }
+   db.markup.role.attribute = attribute role { text }
 
-   markup.attlist =
-      markup.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.markup.attributes
+   db.markup.attlist =
+      db.markup.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.markup =
       element markup {
-         markup.attlist,
-         docbook.text
+         db.markup.attlist,
+         db._text
       }
 }
 
@@ -5948,19 +5277,16 @@ div {
 ]
 div {
 
-   local.menuchoice.attributes = empty
-
-   menuchoice.role.attribute = attribute role { text }
+   db.menuchoice.role.attribute = attribute role { text }
 
-   menuchoice.attlist =
-      menuchoice.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.menuchoice.attributes
+   db.menuchoice.attlist =
+      db.menuchoice.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.menuchoice =
       element menuchoice {
-         menuchoice.attlist,
+         db.menuchoice.attlist,
          db.shortcut?,
          (db.guibutton|db.guiicon|db.guilabel|db.guimenu|db.guimenuitem|db.guisubmenu)+
       }
@@ -5974,22 +5300,19 @@ div {
 ]
 div {
 
-   local.shortcut.attributes = empty
+   db.shortcut.action.attrib = db.keycombo.action.attrib
 
-   shortcut.action.attrib = keycombo.action.attrib
+   db.shortcut.role.attribute = attribute role { text }
 
-   shortcut.role.attribute = attribute role { text }
-
-   shortcut.attlist =
-      shortcut.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & shortcut.action.attrib
-    & local.shortcut.attributes
+   db.shortcut.attlist =
+      db.shortcut.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.shortcut.action.attrib
 
    db.shortcut =
       element shortcut {
-         shortcut.attlist,
+         db.shortcut.attlist,
          (db.keycap|db.keycombo|db.keysym|db.mousebutton)+
       }
 }
@@ -6002,20 +5325,17 @@ div {
 ]
 div {
 
-   local.mousebutton.attributes = empty
-
-   mousebutton.role.attribute = attribute role { text }
+   db.mousebutton.role.attribute = attribute role { text }
 
-   mousebutton.attlist =
-      mousebutton.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.mousebutton.attributes
+   db.mousebutton.attlist =
+      db.mousebutton.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.mousebutton =
       element mousebutton {
-         mousebutton.attlist,
-         docbook.text
+         db.mousebutton.attlist,
+         db._text
       }
 }
 
@@ -6027,20 +5347,17 @@ div {
 ]
 div {
 
-   local.option.attributes = empty
-
-   option.role.attribute = attribute role { text }
+   db.option.role.attribute = attribute role { text }
 
-   option.attlist =
-      option.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.option.attributes
+   db.option.attlist =
+      db.option.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.option =
       element option {
-         option.attlist,
-         docbook.text
+         db.option.attlist,
+         db._text
       }
 }
 
@@ -6052,20 +5369,17 @@ div {
 ]
 div {
 
-   local.optional.attributes = empty
+   db.optional.role.attribute = attribute role { text }
 
-   optional.role.attribute = attribute role { text }
-
-   optional.attlist =
-      optional.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.optional.attributes
+   db.optional.attlist =
+      db.optional.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.optional =
       element optional {
-         optional.attlist,
-         inlines*
+         db.optional.attlist,
+         db.all.inlines*
       }
 }
 
@@ -6077,29 +5391,26 @@ div {
 ]
 div {
 
-   local.parameter.attributes = empty
-
    parameter.class.attribute = attribute class { "command" | "function" | "option" }
 
-   parameter.role.attribute = attribute role { text }
+   db.parameter.role.attribute = attribute role { text }
 
-   parameter.attlist =
-      parameter.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.parameter.attlist =
+      db.parameter.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & parameter.class.attribute?
-    & local.parameter.attributes
 
    db.parameter =
       element parameter {
-         parameter.attlist,
-         docbook.text
+         db.parameter.attlist,
+         db._text
       }
 }
 
 # ======================================================================
 
-prompt.inlines = (docbook.text)
+prompt.inlines = (db._text)
 
 # ======================================================================
 
@@ -6109,27 +5420,21 @@ prompt.inlines = (docbook.text)
 ]
 div {
 
-   local.prompt.attributes = empty
-
 
-   prompt.role.attribute = attribute role { text }
+   db.prompt.role.attribute = attribute role { text }
 
-   prompt.attlist =
-      prompt.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.prompt.attributes
+   db.prompt.attlist =
+      db.prompt.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.prompt =
       element prompt {
-         prompt.attlist,
+         db.prompt.attlist,
          prompt.inlines*
       }
 }
 
-# ======================================================================
-replaceable.inlines = (docbook.text)
-
 # ======================================================================
 
 [
@@ -6138,24 +5443,21 @@ replaceable.inlines = (docbook.text)
 ]
 div {
 
-   local.replaceable.attributes = empty
-
-   replaceable.class.attribute =
+   db.replaceable.class.attribute =
       attribute class { "command" | "function" | "option" | "parameter" }
 
-   replaceable.role.attribute = attribute role { text }
+   db.replaceable.role.attribute = attribute role { text }
 
-   replaceable.attlist =
-      replaceable.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & replaceable.class.attribute?
-    & local.replaceable.attributes
+   db.replaceable.attlist =
+      db.replaceable.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.replaceable.class.attribute?
 
    db.replaceable =
       element replaceable {
-         replaceable.attlist,
-         replaceable.inlines*
+         db.replaceable.attlist,
+         db._text
       }
 }
 
@@ -6167,20 +5469,17 @@ div {
 ]
 div {
 
-   local.returnvalue.attributes = empty
+   db.returnvalue.role.attribute = attribute role { text }
 
-   returnvalue.role.attribute = attribute role { text }
-
-   returnvalue.attlist =
-      returnvalue.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.returnvalue.attributes
+   db.returnvalue.attlist =
+      db.returnvalue.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.returnvalue =
       element returnvalue {
-         returnvalue.attlist,
-         docbook.text
+         db.returnvalue.attlist,
+         db._text
       }
 }
 
@@ -6192,9 +5491,7 @@ div {
 ]
 div {
 
-   local.tag.attributes = empty
-
-   tag.class.attribute =
+   db.tag.class.attribute =
       attribute class {
          "attribute"
        | "attvalue"
@@ -6210,19 +5507,18 @@ div {
        | "xmlpi"
       }?
 
-   tag.role.attribute = attribute role { text }
+   db.tag.role.attribute = attribute role { text }
 
-   tag.attlist =
-      tag.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & tag.class.attribute
-    & local.tag.attributes
+   db.tag.attlist =
+      db.tag.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.tag.class.attribute
 
    db.tag =
       element tag {
-         tag.attlist,
-         docbook.text
+         db.tag.attlist,
+         db._text
       }
 }
 
@@ -6234,41 +5530,32 @@ div {
 ]
 div {
 
-   local.symbol.attributes = empty
-
-   symbol.class.attribute = attribute class { "limit" }?
+   db.symbol.class.attribute = attribute class { "limit" }?
 
-   symbol.role.attribute = attribute role { text }
+   db.symbol.role.attribute = attribute role { text }
 
-   symbol.attlist =
-      symbol.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & symbol.class.attribute
-    & local.symbol.attributes
+   db.symbol.attlist =
+      db.symbol.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.symbol.class.attribute
 
    db.symbol =
       element symbol {
-         symbol.attlist,
-         docbook.text
+         db.symbol.attlist,
+         db._text
       }
 }
 
 # ======================================================================
 
-systemitem.inlines = (docbook.text)
-
-# ======================================================================
-
 [
    db:refname [ "systemitem" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.systemitem.attributes = empty
-
-   systemitem.class.attribute =
+   db.systemitem.class.attribute =
       attribute class {
          "daemon"
        | "domainname"
@@ -6292,19 +5579,18 @@ div {
        | "username"
       }
 
-   systemitem.role.attribute = attribute role { text }
+   db.systemitem.role.attribute = attribute role { text }
 
-   systemitem.attlist =
-      systemitem.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & systemitem.class.attribute?
-    & local.systemitem.attributes
+   db.systemitem.attlist =
+      db.systemitem.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.systemitem.class.attribute?
 
    db.systemitem =
       element systemitem {
-         systemitem.attlist,
-         systemitem.inlines*
+         db.systemitem.attlist,
+         db._text
       }
 }
 
@@ -6316,23 +5602,20 @@ div {
 ]
 div {
 
-   local.uri.attributes = empty
-
-   uri.type.attribute = attribute type { text }?
+   db.uri.type.attribute = attribute type { text }?
 
-   uri.role.attribute = attribute role { text }
+   db.uri.role.attribute = attribute role { text }
 
-   uri.attlist =
-      uri.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & uri.type.attribute
-    & local.uri.attributes
+   db.uri.attlist =
+      db.uri.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.uri.type.attribute
 
    db.uri =
       element uri {
-         uri.attlist,
-         docbook.text
+         db.uri.attlist,
+         db._text
       }
 }
 
@@ -6344,20 +5627,17 @@ div {
 ]
 div {
 
-   local.token.attributes = empty
-
-   token.role.attribute = attribute role { text }
+   db.token.role.attribute = attribute role { text }
 
-   token.attlist =
-      token.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.token.attributes
+   db.token.attlist =
+      db.token.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.token =
       element token {
-         token.attlist,
-         docbook.text
+         db.token.attlist,
+         db._text
       }
 }
 
@@ -6369,26 +5649,23 @@ div {
 ]
 div {
 
-   local.type.attributes = empty
+   db.type.role.attribute = attribute role { text }
 
-   type.role.attribute = attribute role { text }
-
-   type.attlist =
-      type.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.type.attributes
+   db.type.attlist =
+      db.type.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.type =
       element type {
-         type.attlist,
-         docbook.text
+         db.type.attlist,
+         db._text
       }
 }
 
 # ======================================================================
 
-userinput.inlines = inlines
+userinput.inlines = db.all.inlines
 
 # ======================================================================
 
@@ -6398,19 +5675,16 @@ userinput.inlines = inlines
 ]
 div {
 
-   local.userinput.attributes = empty
-
-   userinput.role.attribute = attribute role { text }
+   db.userinput.role.attribute = attribute role { text }
 
-   userinput.attlist =
-      userinput.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.userinput.attributes
+   db.userinput.attlist =
+      db.userinput.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.userinput =
       element userinput {
-         userinput.attlist,
+         db.userinput.attlist,
          userinput.inlines*
       }
 }
@@ -6423,20 +5697,17 @@ div {
 ]
 div {
 
-   local.abbrev.attributes = empty
-
-   abbrev.role.attribute = attribute role { text }
+   db.abbrev.role.attribute = attribute role { text }
 
-   abbrev.attlist =
-      abbrev.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.abbrev.attributes
+   db.abbrev.attlist =
+      db.abbrev.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.abbrev =
       element abbrev {
-         abbrev.attlist,
-         (docbook.text
+         db.abbrev.attlist,
+         (db._text
           | db.superscript
           | db.subscript
           | db.trademark)*
@@ -6451,20 +5722,17 @@ div {
 ]
 div {
 
-   local.acronym.attributes = empty
+   db.acronym.role.attribute = attribute role { text }
 
-   acronym.role.attribute = attribute role { text }
-
-   acronym.attlist =
-      acronym.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.acronym.attributes
+   db.acronym.attlist =
+      db.acronym.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.acronym =
       element acronym {
-         acronym.attlist,
-         (docbook.text
+         db.acronym.attlist,
+         (db._text
           | db.superscript
           | db.subscript
           | db.trademark)*
@@ -6479,20 +5747,17 @@ div {
 ]
 div {
 
-   local.citation.attributes = empty
-
-   citation.role.attribute = attribute role { text }
+   db.citation.role.attribute = attribute role { text }
 
-   citation.attlist =
-      citation.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.citation.attributes
+   db.citation.attlist =
+      db.citation.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.citation =
       element citation {
-         citation.attlist,
-         docbook.text
+         db.citation.attlist,
+         db._text
       }
 }
 
@@ -6504,19 +5769,16 @@ div {
 ]
 div {
 
-   local.citerefentry.attributes = empty
-
-   citerefentry.role.attribute = attribute role { text }
+   db.citerefentry.role.attribute = attribute role { text }
 
-   citerefentry.attlist =
-      citerefentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.citerefentry.attributes
+   db.citerefentry.attlist =
+      db.citerefentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.citerefentry =
       element citerefentry {
-         citerefentry.attlist,
+         db.citerefentry.attlist,
          db.refentrytitle,
          db.manvolnum?
       }
@@ -6530,20 +5792,17 @@ div {
 ]
 div {
 
-   local.refentrytitle.attributes = empty
+   db.refentrytitle.role.attribute = attribute role { text }
 
-   refentrytitle.role.attribute = attribute role { text }
-
-   refentrytitle.attlist =
-      refentrytitle.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refentrytitle.attributes
+   db.refentrytitle.attlist =
+      db.refentrytitle.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refentrytitle =
       element refentrytitle {
-         refentrytitle.attlist,
-         inlines*
+         db.refentrytitle.attlist,
+         db.all.inlines*
       }
 }
 
@@ -6555,20 +5814,17 @@ div {
 ]
 div {
 
-   local.manvolnum.attributes = empty
-
-   manvolnum.role.attribute = attribute role { text }
+   db.manvolnum.role.attribute = attribute role { text }
 
-   manvolnum.attlist =
-      manvolnum.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.manvolnum.attributes
+   db.manvolnum.attlist =
+      db.manvolnum.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.manvolnum =
       element manvolnum {
-         manvolnum.attlist,
-         docbook.text
+         db.manvolnum.attlist,
+         db._text
       }
 }
 
@@ -6580,9 +5836,7 @@ div {
 ]
 div {
 
-   local.citetitle.attributes = empty
-
-   citetitle.pubwork.attribute =
+   db.citetitle.pubwork.attribute =
       attribute pubwork {
          "article"
        | "bbs"
@@ -6604,19 +5858,18 @@ div {
        | "wiki"
       }
 
-   citetitle.role.attribute = attribute role { text }
+   db.citetitle.role.attribute = attribute role { text }
 
-   citetitle.attlist =
-      citetitle.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & citetitle.pubwork.attribute?
-    & local.citetitle.attributes
+   db.citetitle.attlist =
+      db.citetitle.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.citetitle.pubwork.attribute?
 
    db.citetitle =
       element citetitle {
-         citetitle.attlist,
-         inlines*
+         db.citetitle.attlist,
+         db.all.inlines*
       }
 }
 
@@ -6628,20 +5881,17 @@ div {
 ]
 div {
 
-   local.emphasis.attributes = empty
+   db.emphasis.role.attribute = attribute role { text }
 
-   emphasis.role.attribute = attribute role { text }
-
-   emphasis.attlist =
-      emphasis.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.emphasis.attributes
+   db.emphasis.attlist =
+      db.emphasis.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.emphasis =
       element emphasis {
-         emphasis.attlist,
-         inlines*
+         db.emphasis.attlist,
+         db.all.inlines*
       }
 }
 
@@ -6653,20 +5903,17 @@ div {
 ]
 div {
 
-   local.foreignphrase.attributes = empty
-
-   foreignphrase.role.attribute = attribute role { text }
+   db.foreignphrase.role.attribute = attribute role { text }
 
-   foreignphrase.attlist =
-      foreignphrase.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.foreignphrase.attributes
+   db.foreignphrase.attlist =
+      db.foreignphrase.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.foreignphrase =
       element foreignphrase {
-         foreignphrase.attlist,
-         (text | general.inlines)*
+         db.foreignphrase.attlist,
+         (text | db.general.inlines)*
       }
 }
 
@@ -6678,20 +5925,17 @@ div {
 ]
 div {
 
-   local.phrase.attributes = empty
-
-   phrase.role.attribute = attribute role { text }
+   db.phrase.role.attribute = attribute role { text }
 
-   phrase.attlist =
-      phrase.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.phrase.attributes
+   db.phrase.attlist =
+      db.phrase.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.phrase =
       element phrase {
-         phrase.attlist,
-         inlines*
+         db.phrase.attlist,
+         db.all.inlines*
       }
 }
 
@@ -6703,20 +5947,17 @@ div {
 ]
 div {
 
-   local.quote.attributes = empty
+   db.quote.role.attribute = attribute role { text }
 
-   quote.role.attribute = attribute role { text }
-
-   quote.attlist =
-      quote.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.quote.attributes
+   db.quote.attlist =
+      db.quote.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.quote =
       element quote {
-         quote.attlist,
-         inlines*
+         db.quote.attlist,
+         db.all.inlines*
       }
 }
 
@@ -6728,20 +5969,17 @@ div {
 ]
 div {
 
-   local.subscript.attributes = empty
-
-   subscript.role.attribute = attribute role { text }
+   db.subscript.role.attribute = attribute role { text }
 
-   subscript.attlist =
-      subscript.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.subscript.attributes
+   db.subscript.attlist =
+      db.subscript.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.subscript =
       element subscript {
-         subscript.attlist,
-         docbook.text
+         db.subscript.attlist,
+         db._text
       }
 }
 
@@ -6753,20 +5991,17 @@ div {
 ]
 div {
 
-   local.superscript.attributes = empty
-
-   superscript.role.attribute = attribute role { text }
+   db.superscript.role.attribute = attribute role { text }
 
-   superscript.attlist =
-      superscript.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.superscript.attributes
+   db.superscript.attlist =
+      db.superscript.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.superscript =
       element superscript {
-         superscript.attlist,
-         docbook.text
+         db.superscript.attlist,
+         db._text
       }
 }
 
@@ -6778,24 +6013,21 @@ div {
 ]
 div {
 
-   local.trademark.attributes = empty
-
-   trademark.class.attribute =
+   db.trademark.class.attribute =
       attribute class { "copyright" | "registered" | "service" | "trade" }
 
-   trademark.role.attribute = attribute role { text }
+   db.trademark.role.attribute = attribute role { text }
 
-   trademark.attlist =
-      trademark.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & trademark.class.attribute?
-    & local.trademark.attributes
+   db.trademark.attlist =
+      db.trademark.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.trademark.class.attribute?
 
    db.trademark =
       element trademark {
-         trademark.attlist,
-         docbook.text
+         db.trademark.attlist,
+         db._text
       }
 }
 
@@ -6807,20 +6039,17 @@ div {
 ]
 div {
 
-   local.wordasword.attributes = empty
-
-   wordasword.role.attribute = attribute role { text }
+   db.wordasword.role.attribute = attribute role { text }
 
-   wordasword.attlist =
-      wordasword.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.wordasword.attributes
+   db.wordasword.attlist =
+      db.wordasword.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.wordasword =
       element wordasword {
-         wordasword.attlist,
-         docbook.text
+         db.wordasword.attlist,
+         db._text
       }
 }
 
@@ -6832,16 +6061,13 @@ div {
 ]
 div {
 
-   local.footnoteref.attributes = empty
-
-   footnoteref.role.attribute = attribute role { text }
+   db.footnoteref.role.attribute = attribute role { text }
 
-   footnoteref.attlist =
-      footnoteref.role.attribute?
-    & common.attributes
-    & linkend.attribute
+   db.footnoteref.attlist =
+      db.footnoteref.role.attribute?
+    & db.common.attributes
+    & db.linkend.attribute
     & attribute label { text }?
-    & local.footnoteref.attributes
 
    db.footnoteref =
       [
@@ -6854,7 +6080,7 @@ div {
          ]
       ]
       element footnoteref {
-         footnoteref.attlist,
+         db.footnoteref.attlist,
          empty
       }
 }
@@ -6867,21 +6093,18 @@ div {
 ]
 div {
 
-   local.xref.attributes = empty
+   db.xref.role.attribute = attribute role { text }
 
-   xref.role.attribute = attribute role { text }
-
-   xref.attlist =
-      xref.role.attribute?
-    & common.attributes
-    & common.linking.attributes.req
+   db.xref.attlist =
+      db.xref.role.attribute?
+    & db.common.attributes
+    & db.common.req.linking.attributes
     & attribute xrefstyle { text }?
     & attribute endterm { xsd:IDREF }?
-    & local.xref.attributes
 
    db.xref =
       element xref {
-         xref.attlist,
+         db.xref.attlist,
          empty
       }
 }
@@ -6894,18 +6117,15 @@ div {
 ]
 div {
 
-   local.anchor.attributes = empty
-
-   anchor.role.attribute = attribute role { text }
+   db.anchor.role.attribute = attribute role { text }
 
-   anchor.attlist =
-      anchor.role.attribute?
-    & common.attributes.idreq
-    & local.anchor.attributes
+   db.anchor.attlist =
+      db.anchor.role.attribute?
+    & db.common.idreq.attributes
 
    db.anchor =
       element anchor {
-         anchor.attlist,
+         db.anchor.attlist,
          empty
       }
 }
diff --git a/docbook/relaxng/src/qandaset.rnc b/docbook/relaxng/src/qandaset.rnc
index 88e78d6ed..bdc8db465 100644
--- a/docbook/relaxng/src/qandaset.rnc
+++ b/docbook/relaxng/src/qandaset.rnc
@@ -17,7 +17,7 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-list.blocks |= db.qandaset
+db.list.blocks |= db.qandaset
 
 # ======================================================================
 
@@ -27,24 +27,21 @@ list.blocks |= db.qandaset
 ]
 div {
 
-   local.qandaset.attributes = empty
+   db.qandaset.role.attribute = attribute role { text }
 
-   qandaset.role.attribute = attribute role { text }
-
-   qandaset.attlist =
-      qandaset.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.qandaset.attlist =
+      db.qandaset.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute defaultlabel { "none" | "number" | "qanda" }?
-    & local.qandaset.attributes
 
-   qandaset.info = docbook.info.titleonly
+   db.qandaset.info = db._info.title.only
 
    db.qandaset =
       element qandaset {
-         qandaset.attlist,
-         qandaset.info,
-         blocks*,
+         db.qandaset.attlist,
+         db.qandaset.info,
+         db.all.blocks*,
          (db.qandadiv+ | db.qandaentry+)
       }
 }
@@ -57,23 +54,20 @@ div {
 ]
 div {
 
-   local.qandadiv.attributes = empty
-
-   qandadiv.role.attribute = attribute role { text }
+   db.qandadiv.role.attribute = attribute role { text }
 
-   qandadiv.attlist =
-      qandadiv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.qandadiv.attributes
+   db.qandadiv.attlist =
+      db.qandadiv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   qandadiv.info = docbook.info.titleonly
+   db.qandadiv.info = db._info.title.only
 
    db.qandadiv =
       element qandadiv {
-         qandadiv.attlist,
-         qandadiv.info,
-         blocks*,
+         db.qandadiv.attlist,
+         db.qandadiv.info,
+         db.all.blocks*,
          (db.qandadiv+ | db.qandaentry+)
       }
 }
@@ -86,22 +80,19 @@ div {
 ]
 div {
 
-   local.qandaentry.attributes = empty
-
-   qandaentry.role.attribute = attribute role { text }
+   db.qandaentry.role.attribute = attribute role { text }
 
-   qandaentry.attlist =
-      qandaentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.qandaentry.attributes
+   db.qandaentry.attlist =
+      db.qandaentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   qandaentry.info = docbook.info.titleforbidden
+   db.qandaentry.info = db._info.title.forbidden
 
    db.qandaentry =
       element qandaentry {
-         qandaentry.attlist,
-         qandaentry.info,
+         db.qandaentry.attlist,
+         db.qandaentry.info,
          db.question,
          db.answer*
       }
@@ -115,21 +106,18 @@ div {
 ]
 div {
 
-   local.question.attributes = empty
+   db.question.role.attribute = attribute role { text }
 
-   question.role.attribute = attribute role { text }
-
-   question.attlist =
-      question.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.question.attributes
+   db.question.attlist =
+      db.question.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.question =
       element question {
-         question.attlist,
+         db.question.attlist,
          db.label?,
-         blocks+
+         db.all.blocks+
       }
 }
 
@@ -141,21 +129,18 @@ div {
 ]
 div {
 
-   local.answer.attributes = empty
-
-   answer.role.attribute = attribute role { text }
+   db.answer.role.attribute = attribute role { text }
 
-   answer.attlist =
-      answer.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.answer.attributes
+   db.answer.attlist =
+      db.answer.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.answer =
       element answer {
-         answer.attlist,
+         db.answer.attlist,
          db.label?,
-         blocks+
+         db.all.blocks+
       }
 }
 
@@ -167,20 +152,17 @@ div {
 ]
 div {
 
-   local.label.attributes = empty
-
-   label.role.attribute = attribute role { text }
+   db.label.role.attribute = attribute role { text }
 
-   label.attlist =
-      label.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.label.attributes
+   db.label.attlist =
+      db.label.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.label =
       element label {
-         label.attlist,
-         docbook.text
+         db.label.attlist,
+         db._text
       }
 }
 
diff --git a/docbook/relaxng/src/refentry.rnc b/docbook/relaxng/src/refentry.rnc
index ec6df1dbc..77a9aae4c 100644
--- a/docbook/relaxng/src/refentry.rnc
+++ b/docbook/relaxng/src/refentry.rnc
@@ -18,12 +18,12 @@ default namespace = "http://docbook.org/docbook-ng"
 
 start |= db.refentry
 
-divisions |= db.reference
+db.divisions |= db.reference
 
-part.components |= db.refentry | db.reference
+db.part.components |= db.refentry | db.reference
 
-article.components.optional |= db.refentry*
-article.components.required |= db.refentry+
+db.article.optional.components |= db.refentry*
+db.article.required.components |= db.refentry+
 
 # ======================================================================
 
@@ -33,24 +33,21 @@ article.components.required |= db.refentry+
 ]
 div {
 
-   local.reference.attributes = empty
+   db.reference.role.attribute = attribute role { text }
 
-   reference.role.attribute = attribute role { text }
+   db.reference.attlist =
+      db.reference.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.status.attribute?
+    & db.label.attribute?
 
-   reference.attlist =
-      reference.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & status.attribute?
-    & label.attribute?
-    & local.reference.attributes
-
-   reference.info = docbook.info.titlereq
+   db.reference.info = db._info.title.req
 
    db.reference =
       element reference {
-         reference.attlist,
-         reference.info,
+         db.reference.attlist,
+         db.reference.info,
          db.partintro?,
          db.refentry+
       }
@@ -58,12 +55,12 @@ div {
 
 # ======================================================================
 
-refsections.optional = db.refsection* | db.simplesect*
+db.optional.refsections = db.refsection* | db.simplesect*
 
-refsections.required = db.refsection+ | db.simplesect*
+db.required.refsections = db.refsection+ | db.simplesect*
 
-blocks.or.refsections =
-  (blocks+, refsections.optional) | refsections.required
+db.blocks.or.refsections =
+  (db.all.blocks+, db.optional.refsections) | db.required.refsections
 
 # ======================================================================
 
@@ -73,25 +70,22 @@ blocks.or.refsections =
 ]
 div {
 
-   local.refentry.attributes = empty
-
-   refentry.role.attribute = attribute role { text }
+   db.refentry.role.attribute = attribute role { text }
 
-   refentry.attlist =
-      refentry.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & status.attribute?
-    & label.attribute?
-    & local.refentry.attributes
+   db.refentry.attlist =
+      db.refentry.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.status.attribute?
+    & db.label.attribute?
 
-   refentry.info = docbook.info.titleforbidden
+   db.refentry.info = db._info.title.forbidden
 
    db.refentry =
       element refentry {
-         refentry.attlist,
+         db.refentry.attlist,
          db.indexterm*,
-         refentry.info,
+         db.refentry.info,
          db.refmeta?,
          db.refnamediv+,
          db.refsynopsisdiv?,
@@ -107,19 +101,16 @@ div {
 ]
 div {
 
-   local.refmeta.attributes = empty
-
-   refmeta.role.attribute = attribute role { text }
+   db.refmeta.role.attribute = attribute role { text }
 
-   refmeta.attlist =
-      refmeta.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refmeta.attributes
+   db.refmeta.attlist =
+      db.refmeta.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refmeta =
       element refmeta {
-         refmeta.attlist,
+         db.refmeta.attlist,
          db.indexterm*,
          db.refentrytitle,
          db.manvolnum?,
@@ -131,26 +122,23 @@ div {
 # ======================================================================
 
 [
-   db:refname [ "refmiscinfo" ]
+   db:refname [ "db.refmiscinfo" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.refmiscinfo.attributes = empty
+   db.refmiscinfo.role.attribute = attribute role { text }
 
-   refmiscinfo.role.attribute = attribute role { text }
-
-   refmiscinfo.attlist =
-      refmiscinfo.role.attribute?
-    & common.attributes
-    & common.linking.attributes
+   db.refmiscinfo.attlist =
+      db.refmiscinfo.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
     & attribute class { text }?
-    & local.refmiscinfo.attributes
 
    db.refmiscinfo =
       element refmiscinfo {
-         refmiscinfo.attlist,
-         docbook.text
+         db.refmiscinfo.attlist,
+         db._text
       }
 }
 
@@ -162,19 +150,16 @@ div {
 ]
 div {
 
-   local.refnamediv.attributes = empty
-
-   refnamediv.role.attribute = attribute role { text }
+   db.refnamediv.role.attribute = attribute role { text }
 
-   refnamediv.attlist =
-      refnamediv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refnamediv.attributes
+   db.refnamediv.attlist =
+      db.refnamediv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refnamediv =
       element refnamediv {
-         refnamediv.attlist,
+         db.refnamediv.attlist,
          db.refdescriptor?,
          db.refname+,
          db.refpurpose,
@@ -190,20 +175,17 @@ div {
 ]
 div {
 
-   local.refdescriptor.attributes = empty
-
-   refdescriptor.role.attribute = attribute role { text }
+   db.refdescriptor.role.attribute = attribute role { text }
 
-   refdescriptor.attlist =
-      refdescriptor.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refdescriptor.attributes
+   db.refdescriptor.attlist =
+      db.refdescriptor.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refdescriptor =
       element refdescriptor {
-         refdescriptor.attlist,
-         inlines*
+         db.refdescriptor.attlist,
+         db.all.inlines*
       }
 }
 
@@ -215,20 +197,17 @@ div {
 ]
 div {
 
-   local.refname.attributes = empty
+   db.refname.role.attribute = attribute role { text }
 
-   refname.role.attribute = attribute role { text }
-
-   refname.attlist =
-      refname.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refname.attributes
+   db.refname.attlist =
+      db.refname.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refname =
       element refname {
-         refname.attlist,
-         inlines*
+         db.refname.attlist,
+         db.all.inlines*
       }
 }
 
@@ -240,20 +219,17 @@ div {
 ]
 div {
 
-   local.refpurpose.attributes = empty
-
-   refpurpose.role.attribute = attribute role { text }
+   db.refpurpose.role.attribute = attribute role { text }
 
-   refpurpose.attlist =
-      refpurpose.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refpurpose.attributes
+   db.refpurpose.attlist =
+      db.refpurpose.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refpurpose =
       element refpurpose {
-         refpurpose.attlist,
-         inlines*
+         db.refpurpose.attlist,
+         db.all.inlines*
       }
 }
 
@@ -265,19 +241,16 @@ div {
 ]
 div {
 
-   local.refclass.attributes = empty
-
-   refclass.role.attribute = attribute role { text }
+   db.refclass.role.attribute = attribute role { text }
 
-   refclass.attlist =
-      refclass.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refclass.attributes
+   db.refclass.attlist =
+      db.refclass.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.refclass =
       element refclass {
-         refclass.attlist,
+         db.refclass.attlist,
          (text | db.application)*
       }
 }
@@ -290,23 +263,20 @@ div {
 ]
 div {
 
-   local.refsynopsisdiv.attributes = empty
+   db.refsynopsisdiv.role.attribute = attribute role { text }
 
-   refsynopsisdiv.role.attribute = attribute role { text }
+   db.refsynopsisdiv.attlist =
+      db.refsynopsisdiv.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   refsynopsisdiv.attlist =
-      refsynopsisdiv.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.refsynopsisdiv.attributes
-
-   refsynopsisdiv.info = docbook.info
+   db.refsynopsisdiv.info = db._info
 
    db.refsynopsisdiv =
       element refsynopsisdiv {
-         refsynopsisdiv.attlist,
-         refsynopsisdiv.info,
-         blocks.or.refsections
+         db.refsynopsisdiv.attlist,
+         db.refsynopsisdiv.info,
+         db.blocks.or.refsections
       }
 }
 
@@ -318,24 +288,21 @@ div {
 ]
 div {
 
-   local.refsection.attributes = empty
-
-   refsection.role.attribute = attribute role { text }
+   db.refsection.role.attribute = attribute role { text }
 
-   refsection.attlist =
-      refsection.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & status.attribute?
-    & label.attribute?
-    & local.refsection.attributes
+   db.refsection.attlist =
+      db.refsection.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.status.attribute?
+    & db.label.attribute?
 
-   refsection.info = docbook.info.titlereq
+   db.refsection.info = db._info.title.req
 
    db.refsection =
       element refsection {
-         refsection.attlist,
-         refsection.info,
-         blocks.or.refsections
+         db.refsection.attlist,
+         db.refsection.info,
+         db.blocks.or.refsections
       }
 }
diff --git a/docbook/relaxng/src/sdocbook.rnc b/docbook/relaxng/src/sdocbook.rnc
index 6a1dd94ee..946cad5fd 100644
--- a/docbook/relaxng/src/sdocbook.rnc
+++ b/docbook/relaxng/src/sdocbook.rnc
@@ -17,37 +17,39 @@ default namespace = "http://docbook.org/docbook-ng"
 start = db.article
 
 include "hier.rnc" {
-   sections.optional = db.section*
-   sections.required = db.section+
+   db.optional.sections = db.section*
+   db.required.sections = db.section+
 
-   article.components.optional = db.section*
-   article.components.required = db.section+
+   db.article.optional.components = db.section*
+   db.article.required.components = db.section+
 
    db.ackno = notAllowed
-}
 
-include "bibliography.rnc" {
    db.article =
       element article {
-         article.attlist,
-         article.info,
-         ((blocks+, article.components.optional) | article.components.required),
-         (db.appendix | navigation.components | db.ackno)*
+         db.article.attlist,
+         db.article.info,
+         ((db.all.blocks+,
+            db.article.optional.components)
+          | db.article.required.components),
+         (db.appendix | db.navigation.components | db.ackno)*
       }
+}
 
+include "bibliography.rnc" {
    db.bibliography =
       element bibliography {
-         bibliography.attlist,
-         bibliography.info,
-         blocks*,
+         db.bibliography.attlist,
+         db.bibliography.info,
+         db.all.blocks*,
          (db.bibliodiv+ | db.bibliomixed+)
       }
 
    db.bibliodiv =
       element bibliodiv {
-         bibliodiv.attlist,
-         bibliodiv.info,
-         blocks*,
+         db.bibliodiv.attlist,
+         db.bibliodiv.info,
+         db.all.blocks*,
          db.bibliomixed+
       }
 }
@@ -56,21 +58,21 @@ include "calstbl.rnc"
 include "htmltbl.rnc"
 
 include "pool.rnc" {
-   common.attributes =
-      id.attribute?,
-      xml.lang.attribute?,
-      xml.base.attribute?,
-      revisionflag.attribute?,
-      version.attribute?
-
-   common.attributes.idreq =
-      id.attribute,
-      xml.lang.attribute?,
-      xml.base.attribute?,
-      revisionflag.attribute?,
-      version.attribute?
-
-   info.elements =
+   db.common.attributes =
+      attribute id { xsd:ID }?,
+      attribute version { text }?,
+      attribute xml:lang { text }?,
+      attribute xml:base { text }?,
+      attribute revisionflag { "changed" | "added" | "deleted" | "off" }?
+
+   db.common.idreq.attributes =
+      attribute id { xsd:ID },
+      attribute version { text }?,
+      attribute xml:lang { text }?,
+      attribute xml:base { text }?,
+      attribute revisionflag { "changed" | "added" | "deleted" | "off" }?
+
+   db.info.elements =
       db.abstract
     | db.author
     | db.authorgroup
@@ -89,8 +91,8 @@ include "pool.rnc" {
     | db.subjectset
     | db.volumenum
 
-   bibliographic.elements =
-      info.elements
+   db.bibliographic.elements =
+      db.info.elements
     | db.abbrev
     | db.affiliation
     | db.citetitle
@@ -101,32 +103,32 @@ include "pool.rnc" {
     | db.title
     | db.titleabbrev
 
-   list.blocks = db.itemizedlist|db.orderedlist|db.variablelist
-   admonition.blocks = db.note
-   verbatim.blocks = db.literallayout|db.programlisting
-   para.blocks = db.para
-   publishing.blocks = db.blockquote|db.sidebar
-   graphic.blocks = db.mediaobject
-   informal.blocks = db.informaltable
-   formal.blocks = db.example|db.figure|db.table
-   technical.blocks = empty
-   synopsis.blocks = empty
-
-   blocks.nopara =
-      list.blocks
-    | admonition.blocks
-    | formal.blocks
-    | informal.blocks
-    | publishing.blocks
-    | graphic.blocks
-    | technical.blocks
-    | verbatim.blocks
-    | synopsis.blocks
+   db.list.blocks = db.itemizedlist|db.orderedlist|db.variablelist
+   db.admonition.blocks = db.note
+   db.verbatim.blocks = db.literallayout|db.programlisting
+   db.para.blocks = db.para
+   db.publishing.blocks = db.blockquote|db.sidebar
+   db.graphic.blocks = db.mediaobject
+   db.informal.blocks = db.informaltable
+   db.formal.blocks = db.example|db.figure|db.table
+   db.technical.blocks = empty
+   db.synopsis.blocks = empty
+
+   db.nopara.blocks =
+      db.list.blocks
+    | db.admonition.blocks
+    | db.formal.blocks
+    | db.informal.blocks
+    | db.publishing.blocks
+    | db.graphic.blocks
+    | db.technical.blocks
+    | db.verbatim.blocks
+    | db.synopsis.blocks
     | db.revhistory
 
-   ubiq.inlines = db.inlinemediaobject
+   db.ubiq.inlines = db.inlinemediaobject
 
-   publishing.inlines =
+   db.publishing.inlines =
       db.abbrev
     | db.acronym
     | db.emphasis
@@ -135,62 +137,62 @@ include "pool.rnc" {
     | db.phrase
     | db.quote
 
-   os.inlines =
+   db.os.inlines =
       db.filename
     | db.command
     | db.computeroutput
     | db.userinput
 
-   programming.inlines = empty
-   product.inlines = db.trademark
+   db.programming.inlines = empty
+   db.product.inlines = db.trademark
 
-   bibliography.inlines =
+   db.bibliography.inlines =
       db.citetitle
     | db.author
     | db.personname
     | db.orgname
     | db.editor
 
-   markup.inlines = db.literal|db.email
+   db.markup.inlines = db.literal | db.email
 
-   technical.inlines = db.replaceable | db.option | db.systemitem
-   error.inlines = empty
-   oo.inlines = empty
+   db.technical.inlines = db.replaceable | db.option | db.systemitem
+   db.error.inlines = empty
+   db.oo.inlines = empty
 
-   link.inlines = db.xref
+   db.link.inlines = db.xref
 
-   gui.inlines = empty
-   keyboard.inlines = empty
-   math.inlines = empty
+   db.gui.inlines = empty
+   db.keyboard.inlines = empty
+   db.math.inlines = empty
 
    # ======================================================================
 
-   person.author = db.personname
-   credit.contentmodel = person.author
+   db.person.author.contentmodel = db.personname
+   db.credit.contentmodel = db.person.author.contentmodel
 
    db.abbrev =
       element abbrev {
-         abbrev.attlist,
-         (docbook.text | db.trademark)*
+         db.abbrev.attlist,
+         (db._text | db.trademark)*
       }
 
    db.acronym =
       element acronym {
-         acronym.attlist,
-         (docbook.text | db.trademark)*
+         db.acronym.attlist,
+         (db._text | db.trademark)*
       }
 
    db.affiliation =
       element affiliation {
-         affiliation.attlist,
+         db.affiliation.attlist,
          db.jobtitle*,
          db.orgname?
       }
 
    db.para =
       element para {
-         para.attlist,
-         para.info,
-         inlines*
+         db.para.attlist,
+         db.para.info,
+         db.all.inlines*
       }
 }
diff --git a/docbook/relaxng/src/slides-ng.rnc b/docbook/relaxng/src/slides-ng.rnc
index f17fd2fe0..d6fb67353 100644
--- a/docbook/relaxng/src/slides-ng.rnc
+++ b/docbook/relaxng/src/slides-ng.rnc
@@ -16,32 +16,29 @@ default namespace = "http://docbook.org/docbook-ng"
 
 include "sdocbook.rnc" {
    start = db.slides
-
-   blocks |= db.speakernotes | db.screen
 }
 
+db.all.blocks |= db.speakernotes | db.screen
+
 [
    db:refname [ "slides" ]
    db:refpurpose [ "" ]
 ]
 div {
 
-   local.slides.attributes = empty
-
-   slides.role.attribute = attribute role { text }
+   db.slides.role.attribute = attribute role { text }
 
-   slides.attlist =
-      slides.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.slides.attributes
+   db.slides.attlist =
+      db.slides.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   slides.info = docbook.info.titlereq
+   db.slides.info = db._info.title.req
 
    db.slides =
       element slides {
-         slides.attlist,
-         slides.info,
+         db.slides.attlist,
+         db.slides.info,
          db.speakernotes?,
          db.foil*,
          db.foilgroup*
@@ -54,23 +51,20 @@ div {
 ]
 div {
 
-   local.foilgroup.attributes = empty
+   db.foilgroup.role.attribute = attribute role { text }
 
-   foilgroup.role.attribute = attribute role { text }
+   db.foilgroup.attlist =
+      db.foilgroup.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   foilgroup.attlist =
-      foilgroup.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.foilgroup.attributes
-
-   foilgroup.info = docbook.info.titlereq
+   db.foilgroup.info = db._info.title.req
 
    db.foilgroup =
       element foilgroup {
-         foilgroup.attlist,
-         foilgroup.info,
-         blocks*,
+         db.foilgroup.attlist,
+         db.foilgroup.info,
+         db.all.blocks*,
          db.foil+
       }
 }
@@ -81,23 +75,20 @@ div {
 ]
 div {
 
-   local.foil.attributes = empty
-
-   foil.role.attribute = attribute role { text }
+   db.foil.role.attribute = attribute role { text }
 
-   foil.attlist =
-      foil.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.foil.attributes
+   db.foil.attlist =
+      db.foil.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   foil.info = docbook.info.titlereq
+   db.foil.info = db._info.title.req
 
    db.foil =
       element foil {
-         foil.attlist,
-         foil.info,
-         blocks*
+         db.foil.attlist,
+         db.foil.info,
+         db.all.blocks*
       }
 }
 
@@ -107,22 +98,19 @@ div {
 ]
 div {
 
-   local.speakernotes.attributes = empty
-
-   speakernotes.role.attribute = attribute role { text }
+   db.speakernotes.role.attribute = attribute role { text }
 
-   speakernotes.attlist =
-      speakernotes.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.speakernotes.attributes
+   db.speakernotes.attlist =
+      db.speakernotes.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   speakernotes.info = docbook.info.titlereq
+   db.speakernotes.info = db._info.title.req
 
    db.speakernotes =
       element speakernotes {
-         speakernotes.attlist,
-         speakernotes.info,
-         blocks*
+         db.speakernotes.attlist,
+         db.speakernotes.info,
+         db.all.blocks*
       }
 }
diff --git a/docbook/relaxng/src/svg.rnc b/docbook/relaxng/src/svg.rnc
index 9dfa8b6dd..4c67ef906 100644
--- a/docbook/relaxng/src/svg.rnc
+++ b/docbook/relaxng/src/svg.rnc
@@ -17,10 +17,10 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-imageobject.content |= any.svg
+db.imageobject.content |= db._any.svg
 
-any.svg =
-   element svg:* {
-      anyAttribute*,
-      (text | any.svg)*
-   }
+db._any.svg =
+  element svg:* {
+    db._any.attribute*,
+    (text | db._any)*
+  }
diff --git a/docbook/relaxng/src/tasks.rnc b/docbook/relaxng/src/tasks.rnc
index 9df52aed4..a492513ea 100644
--- a/docbook/relaxng/src/tasks.rnc
+++ b/docbook/relaxng/src/tasks.rnc
@@ -16,9 +16,9 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-technical.blocks |= db.task
+db.technical.blocks |= db.task
 
-task.info = docbook.info.titleonly
+db.task.info = db._info.title.only
 
 # ======================================================================
 
@@ -28,20 +28,17 @@ task.info = docbook.info.titleonly
 ]
 div {
 
-   local.task.attributes = empty
+   db.task.role.attribute = attribute role { text }
 
-   task.role.attribute = attribute role { text }
-
-   task.attlist =
-      task.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.task.attributes
+   db.task.attlist =
+      db.task.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    db.task =
       element task {
-         task.attlist,
-         task.info,
+         db.task.attlist,
+         db.task.info,
          db.tasksummary?,
          db.taskprerequisites?,
          db.procedure,
@@ -58,23 +55,20 @@ div {
 ]
 div {
 
-   local.tasksummary.attributes = empty
-
-   tasksummary.role.attribute = attribute role { text }
+   db.tasksummary.role.attribute = attribute role { text }
 
-   tasksummary.attlist =
-      tasksummary.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.tasksummary.attributes
+   db.tasksummary.attlist =
+      db.tasksummary.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   tasksummary.info = docbook.info.titleonly
+   db.tasksummary.info = db._info.title.only
 
    db.tasksummary =
       element tasksummary {
-         tasksummary.attlist,
-         tasksummary.info,
-         blocks+
+         db.tasksummary.attlist,
+         db.tasksummary.info,
+         db.all.blocks+
       }
 }
 
@@ -86,23 +80,20 @@ div {
 ]
 div {
 
-   local.taskprerequisites.attributes = empty
+   db.taskprerequisites.role.attribute = attribute role { text }
 
-   taskprerequisites.role.attribute = attribute role { text }
+   db.taskprerequisites.attlist =
+      db.taskprerequisites.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   taskprerequisites.attlist =
-      taskprerequisites.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.taskprerequisites.attributes
-
-   taskprerequisites.info = docbook.info.titleonly
+   db.taskprerequisites.info = db._info.title.only
 
    db.taskprerequisites =
       element taskprerequisites {
-         taskprerequisites.attlist,
-         taskprerequisites.info,
-         blocks+
+         db.taskprerequisites.attlist,
+         db.taskprerequisites.info,
+         db.all.blocks+
       }
 }
 
@@ -114,22 +105,19 @@ div {
 ]
 div {
 
-   local.taskrelated.attributes = empty
-
-   taskrelated.role.attribute = attribute role { text }
+   db.taskrelated.role.attribute = attribute role { text }
 
-   taskrelated.attlist =
-      taskrelated.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.taskrelated.attributes
+   db.taskrelated.attlist =
+      db.taskrelated.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   taskrelated.info = docbook.info.titleonly
+   db.taskrelated.info = db._info.title.only
 
    db.taskrelated =
       element taskrelated {
-         taskrelated.attlist,
-         taskrelated.info,
-         blocks+
+         db.taskrelated.attlist,
+         db.taskrelated.info,
+         db.all.blocks+
       }
 }
diff --git a/docbook/relaxng/src/toc.rnc b/docbook/relaxng/src/toc.rnc
index 60196260e..ee3cc1f1a 100644
--- a/docbook/relaxng/src/toc.rnc
+++ b/docbook/relaxng/src/toc.rnc
@@ -15,8 +15,8 @@ namespace s = "http://www.ascc.net/xml/schematron"
 namespace db = "http://docbook.org/docbook-ng"
 default namespace = "http://docbook.org/docbook-ng"
 
-navigation.components |= db.toc
-toc.components |= db.toc
+db.navigation.components |= db.toc
+db.toc.components |= db.toc
 
 # ======================================================================
 
@@ -26,23 +26,20 @@ toc.components |= db.toc
 ]
 div {
 
-   local.toc.attributes = empty
+   db.toc.role.attribute = attribute role { text }
 
-   toc.role.attribute = attribute role { text }
+   db.toc.attlist =
+      db.toc.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
-   toc.attlist =
-      toc.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.toc.attributes
-
-   toc.info = docbook.info.titleonly
+   db.toc.info = db._info.title.only
 
    db.toc =
       element toc {
-         toc.attlist,
-         toc.info,
-         blocks*,
+         db.toc.attlist,
+         db.toc.info,
+         db.all.blocks*,
          (db.tocdiv | db.tocentry)*
       }
 }
@@ -55,24 +52,21 @@ div {
 ]
 div {
 
-   local.tocdiv.attributes = empty
-
-   tocdiv.role.attribute = attribute role { text }
+   db.tocdiv.role.attribute = attribute role { text }
 
-   tocdiv.attlist =
-      tocdiv.role.attribute?
-    & common.attributes
+   db.tocdiv.attlist =
+      db.tocdiv.role.attribute?
+    & db.common.attributes
     & attribute pagenum { text }?
-    & linkend.attribute?
-    & local.tocdiv.attributes
+    & db.linkend.attribute?
 
-   tocdiv.info = docbook.info
+   db.tocdiv.info = db._info
 
    db.tocdiv =
       element tocdiv {
-         tocdiv.attlist,
-         tocdiv.info,
-         blocks*,
+         db.tocdiv.attlist,
+         db.tocdiv.info,
+         db.all.blocks*,
          (db.tocdiv | db.tocentry)+
       }
 }
@@ -85,21 +79,18 @@ div {
 ]
 div {
 
-   local.tocentry.attributes = empty
-
-   tocentry.role.attribute = attribute role { text }
+   db.tocentry.role.attribute = attribute role { text }
 
-   tocentry.attlist =
-      tocentry.role.attribute?
-    & common.attributes
+   db.tocentry.attlist =
+      db.tocentry.role.attribute?
+    & db.common.attributes
     & attribute pagenum { text }?
-    & linkend.attribute?
-    & local.tocentry.attributes
+    & db.linkend.attribute?
 
    db.tocentry =
       element tocentry {
-         tocentry.attlist,
-         inlines*
+         db.tocentry.attlist,
+         db.all.inlines*
       }
 }
 
diff --git a/docbook/relaxng/src/website-ng.rnc b/docbook/relaxng/src/website-ng.rnc
index cc10b3aec..e071a7b6a 100644
--- a/docbook/relaxng/src/website-ng.rnc
+++ b/docbook/relaxng/src/website-ng.rnc
@@ -23,15 +23,15 @@ include "ws-rddl.rnc"
 
 include "sdocbook.rnc" {
    start = ws.webpage
+}
 
-   inlines |= db.tag
+db.list.blocks |= db.simplelist
 
-   list.blocks |= db.simplelist
+db.all.blocks |= ws.webtoc | ws.rss
 
-   blocks |= ws.webtoc | ws.rss
+db.link.inlines |= db.olink
 
-   link.inlines |= db.olink
-}
+db.all.inlines |= db.tag
 
 # ======================================================================
 
@@ -41,14 +41,11 @@ include "sdocbook.rnc" {
 ]
 div {
 
-   local.olink.attributes = empty
-
-   olink.role.attribute = attribute role { text }
+   db.olink.role.attribute = attribute role { text }
 
-   olink.attlist =
-      olink.role.attribute?
-    & common.attributes
-    & local.olink.attributes
+   db.olink.attlist =
+      db.olink.role.attribute?
+    & db.common.attributes
     & attribute linkmode { xsd:IDREF }?
     & attribute localinfo { text }?
     & attribute type { text }?
@@ -58,8 +55,8 @@ div {
 
    db.olink =
       element olink {
-         olink.attlist,
-         inlines*
+         db.olink.attlist,
+         db.all.inlines*
       }
 }
 
@@ -71,23 +68,20 @@ div {
 ]
 div {
 
-   local.webpage.attributes = empty
+   ws.webpage.role.attribute = attribute role { text }
 
-   webpage.role.attribute = attribute role { text }
-
-   webpage.attlist =
-      webpage.role.attribute?
-    & common.attributes.idreq
-    & common.linking.attributes
-    & local.webpage.attributes
+   ws.webpage.attlist =
+      ws.webpage.role.attribute?
+    & db.common.idreq.attributes
+    & db.common.linking.attributes
     & attribute navto { "yes" | "no" }?
 
    ws.webpage =
       element ws:webpage {
-         webpage.attlist,
+         ws.webpage.attlist,
          ws.config*,
          ws.head,
-         component.contentmodel,
+         db.component.contentmodel,
          db.appendix*,
          db.bibliography*
       }
@@ -101,19 +95,16 @@ div {
 ]
 div {
 
-   local.head.attributes = empty
-
-   head.role.attribute = attribute role { text }
+   ws.head.role.attribute = attribute role { text }
 
-   head.attlist =
-      head.role.attribute?
-    & common.attributes
-    & common.linking.attributes
-    & local.head.attributes
+   ws.head.attlist =
+      ws.head.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
 
    ws.head =
       element ws:head {
-         head.attlist,
+         ws.head.attlist,
          db.title,
          db.titleabbrev?,
          db.subtitle?,
@@ -141,14 +132,14 @@ div {
 ]
 div {
 
-   meta.attlist =
+   ws.meta.attlist =
       attribute http-equiv { text }?
     & attribute name { text }?
     & attribute content { text }
 
    ws.meta =
       element ws:meta {
-         meta.attlist,
+         ws.meta.attlist,
          empty
       }
 }
@@ -161,7 +152,7 @@ div {
 ]
 div {
 
-   headlink.attlist =
+   ws.headlink.attlist =
       attribute href { text }?
     & attribute media { text }?
     & attribute name { text }?
@@ -173,7 +164,7 @@ div {
 
    ws.headlink =
       element ws:headlink {
-         headlink.attlist,
+         ws.headlink.attlist,
          empty
       }
 }
@@ -186,14 +177,14 @@ div {
 ]
 div {
 
-   script.attlist =
+   ws.script.attlist =
       attribute src { text }?
     & attribute language { text }?
     & attribute type { text }?
 
    ws.script =
       element ws:script {
-         script.attlist,
+         ws.script.attlist,
          text
       }
 }
@@ -206,13 +197,13 @@ div {
 ]
 div {
 
-   style.attlist =
+   ws.style.attlist =
       attribute src { text }?
     & attribute type { text }?
 
    ws.style =
       element ws:style {
-         style.attlist,
+         ws.style.attlist,
          text
       }
 }
@@ -225,15 +216,15 @@ div {
 ]
 div {
 
-   config.attlist =
-      common.attributes
+   ws.config.attlist =
+      db.common.attributes
     & attribute param { text }
     & attribute value { text }
     & attribute altval { text }?
 
    ws.config =
       element ws:config {
-         config.attlist,
+         ws.config.attlist,
          empty
       }
 }
@@ -246,13 +237,13 @@ div {
 ]
 div {
 
-   summary.attlist =
-      common.attributes
+   ws.summary.attlist =
+      db.common.attributes
 
    ws.summary =
       element ws:summary {
-         summary.attlist,
-         inlines*
+         ws.summary.attlist,
+         db.all.inlines*
       }
 }
 
@@ -264,13 +255,13 @@ div {
 ]
 div {
 
-   base.attlist =
+   ws.base.attlist =
       attribute href { text }
     & attribute target { text }?
 
    ws.base =
       element ws:base {
-         base.attlist,
+         ws.base.attlist,
          empty
       }
 }
@@ -283,12 +274,12 @@ div {
 ]
 div {
 
-   keywords.attlist =
-      common.attributes
+   ws.keywords.attlist =
+      db.common.attributes
 
    ws.keywords =
       element ws:keywords {
-         keywords.attlist,
+         ws.keywords.attlist,
          text
       }
 }
@@ -301,12 +292,12 @@ div {
 ]
 div {
 
-   webtoc.attlist =
-      common.attributes
+   ws.webtoc.attlist =
+      db.common.attributes
 
    ws.webtoc =
       element ws:webtoc {
-         webtoc.attlist,
+         ws.webtoc.attlist,
          empty
       }
 }
@@ -319,13 +310,13 @@ div {
 ]
 div {
 
-   rss.attlist =
-      common.attributes
+   ws.rss.attlist =
+      db.common.attributes
     & attribute feed { text }
 
    ws.rss =
       element ws:rss {
-         rss.attlist,
+         ws.rss.attlist,
          empty
       }
 }
diff --git a/docbook/relaxng/src/ws-rddl.rnc b/docbook/relaxng/src/ws-rddl.rnc
index 3b8108183..e722b55ef 100644
--- a/docbook/relaxng/src/ws-rddl.rnc
+++ b/docbook/relaxng/src/ws-rddl.rnc
@@ -18,8 +18,8 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 default namespace = "http://docbook.org/docbook-ng"
 
-rddl |= rddl.resource
-inlines |= rddl
+ws.rddl |= ws.rddl.resource
+db.all.inlines |= rddl
 
 # ======================================================================
 
@@ -29,11 +29,12 @@ inlines |= rddl
 ]
 div {
 
-   rddl.resource =
+   ws.rddl.resource =
       element rddl:resource {
-         id.attribute?,
-         xml.lang.attribute?,
-         xml.base.attribute?,
+         attribute id { xsd:ID }?,
+         attribute version { text }?,
+         attribute xml:lang { text }?,
+         attribute xml:base { text }?,
 
          [ a:defaultValue = "simple" ]
          attribute xlink:type { "simple" }?,
@@ -52,6 +53,6 @@ div {
          [ a:defaultValue = "none" ]
          attribute xlink:actuate { "none" }?,
 
-         inlines*
+         db.all.inlines*
       }
 }
-- 
2.40.0