Prevent entrytbl from appearing directly in a row in an entrytbl; exclude tables...

diff --git a/docbook/relaxng/src/calstbl.rnc b/docbook/relaxng/src/calstbl.rnc
index b5fa71b4bae797b4e78e6fd565dacb4e590221b2..d6eff18cbec16671bd0154e84a483067b624e8c1 100644 (file)
--- a/docbook/relaxng/src/calstbl.rnc
+++ b/docbook/relaxng/src/calstbl.rnc
@@ -281,19 +281,92 @@ div {
          db.entrytbl.attlist,
          db.colspec*,
          db.spanspec*,
-         db.cals.thead?,
-         db.cals.tbody
+         db.cals.entrytbl.thead?,
+         db.cals.entrytbl.tbody
+      }
+}
+
+# ======================================================================
+
+[
+   db:refname [ "thead" ]
+   db:refpurpose [ "" ]
+]
+div {
+
+   db.cals.entrytbl.thead.role.attribute = attribute role { text }
+
+   db.cals.entrytbl.thead.attlist =
+      db.cals.entrytbl.thead.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.valign.attribute?
+
+   db.cals.entrytbl.thead =
+      element thead {
+         db.cals.entrytbl.thead.attlist,
+         db.colspec*,
+         db.entrytbl.row+
       }
 }
 
 # ======================================================================
 
+[
+   db:refname [ "tbody" ]
+   db:refpurpose [ "" ]
+]
+div {
+
+   db.cals.entrytbl.tbody.role.attribute = attribute role { text }
+
+   db.cals.entrytbl.tbody.attlist =
+      db.cals.entrytbl.tbody.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.valign.attribute?
+
+   db.cals.entrytbl.tbody =
+      element tbody {
+         db.cals.entrytbl.tbody.attlist,
+         db.entrytbl.row+
+      }
+}
+
+# ======================================================================
+
+[
+   db:refname [ "row" ]
+   db:refpurpose [ "" ]
+]
+div {
+
+   db.entrytbl.row.role.attribute = attribute role { text }
+
+   db.entrytbl.row.attlist =
+      db.entrytbl.row.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+    & db.rowsep.attribute?
+    & db.valign.attribute?
+
+   db.entrytbl.row = element row {
+      db.entrytbl.row.attlist,
+      db.entry+
+   }
+}
+
+# ======================================================================
+
 [
    db:refname [ "table" ]
    db:refpurpose [ "" ]
 ]
 div {
 
+   ctrl:exclude [ from="db.cals.table" exclude="db.cals.table" ]
+   ctrl:exclude [ from="db.cals.table" exclude="db.cals.informaltable" ]
+
    db.cals.table.role.attribute = attribute role { text }
 
    db.cals.table.attlist =