Allow caption in mediaobject, figure, example, and table

diff --git a/docbook/relaxng/docbook/src/calstbl.rnc b/docbook/relaxng/docbook/src/calstbl.rnc
index 93511f7476a907f4ad49b208f6e71414382b482e..7bd8f815d1e9f4265841c433a00ca409dceee37c 100644 (file)
--- a/docbook/relaxng/docbook/src/calstbl.rnc
+++ b/docbook/relaxng/docbook/src/calstbl.rnc
@@ -613,7 +613,8 @@ div {
       db.cals.table.info,
       db.indexing.inlines*,
       db.textobject*,
-      (db.mediaobject+|db.tgroup+)
+      (db.mediaobject+|db.tgroup+),
+      db.caption?
    }
 }
 

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index dde945c62ccc8a74970be026be64b882c3b4fea4..3c42727b7150da984fb497655466874e0e91e9fc 100644 (file)
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -1959,7 +1959,8 @@ div {
       element example {
          db.example.attlist,
          db.example.info,
-         db.all.blocks+
+         db.all.blocks+,
+         db.caption?
       }
 }
 
@@ -2129,7 +2130,8 @@ div {
       element figure {
          db.figure.attlist,
          db.figure.info,
-         db.all.blocks+
+         db.all.blocks+,
+         db.caption?
       }
 }
 
@@ -2189,7 +2191,8 @@ div {
       element mediaobject {
          db.mediaobject.attlist,
          db.mediaobject.info,
-         db.mediaobject.content+
+         db.mediaobject.content+,
+         db.caption?
       }
 }
 
@@ -2481,6 +2484,35 @@ div {
 
 # ======================================================================
 
+[
+   db:refname [ "caption" ]
+   db:refpurpose [ "A caption" ]
+]
+div {
+   ctrl:exclude [ from="db.caption" exclude="db.formal.blocks" ]
+   ctrl:exclude [ from="db.caption" exclude="db.admonition.blocks" ]
+   ctrl:exclude [ from="db.caption" exclude="db.sidebar" ]
+   ctrl:exclude [ from="db.caption" exclude="db.task" ]
+
+   db.caption.role.attribute = attribute role { text }
+
+   db.caption.attlist =
+      db.caption.role.attribute?
+    & db.common.attributes
+    & db.common.linking.attributes
+
+   db.caption.info = db._info.title.forbidden
+
+   db.caption =
+      element caption {
+         db.caption.attlist,
+         db.caption.info,
+         db.all.blocks+
+      }
+}
+
+# ======================================================================
+
 [
    db:refname [ "synopsis" ]
    db:refpurpose [ "A general-purpose element for representing the syntax of commands or functions" ]