RFE 1644553#: Added label attribute to CALS and HTML tables

diff --git a/docbook/relaxng/docbook/src/calstbl.rnc b/docbook/relaxng/docbook/src/calstbl.rnc
index a6f5220725dbeed18692881a8073cc6660f78797..c9feda948ab35b0bc1ff95d9b95584c3c1bfbd14 100644 (file)
--- a/docbook/relaxng/docbook/src/calstbl.rnc
+++ b/docbook/relaxng/docbook/src/calstbl.rnc
@@ -614,9 +614,11 @@ div {
    ctrl:exclude [ from="db.cals.table" exclude="db.cals.informaltable" ]
 
    db.cals.table.role.attribute = attribute role { text }
+   db.cals.table.label.attribute = db.label.attribute
 
    db.cals.table.attlist =
       db.cals.table.role.attribute?
+    & db.cals.table.label.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.tabstyle.attribute?

diff --git a/docbook/relaxng/docbook/src/htmltbl.rnc b/docbook/relaxng/docbook/src/htmltbl.rnc
index 68a8a0830c4effffb13fa5baa88250ae64476ed9..2ed1ca19510bd2dec1da312052b4698577433b6c 100644 (file)
--- a/docbook/relaxng/docbook/src/htmltbl.rnc
+++ b/docbook/relaxng/docbook/src/htmltbl.rnc
@@ -257,10 +257,14 @@ db.html.informaltable.model =
    db:refpurpose [ "A formal (captioned) HTML table in a document" ]
 ]
 div {
+   db.html.table.role.attribute = attribute role { text }
+   db.html.table.label.attribute = db.label.attribute
 
    db.html.table.attlist =
       db.html.attrs
     & db.html.table.attributes
+    & db.html.table.role.attribute?
+    & db.html.table.label.attribute?
     & db.orient.attribute?
     & db.pgwide.attribute?
     & db.tabstyle.attribute?