Put HTML attributes on caption of HTML tables are allowed

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index 3ea658356d8bd7a61d13f72d940f5fd81c99fed6..b6aed310b2df34525c1e196b94dee6ae3b62507a 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -3437,26 +3437,6 @@ in the text (no (0) value, the default)
 <!--end of textdata.attlist-->]]>
 <!--end of textdata.module-->]]>
 
-<!ENTITY % caption.module "INCLUDE">
-<![ %caption.module; [
-<!ENTITY % local.caption.attrib "">
-<!ENTITY % caption.role.attrib "%role.attrib;">
-
-<!ENTITY % caption.element "INCLUDE">
-<![ %caption.element; [
-<!ELEMENT caption %ho; (#PCDATA | %textobject.mix;)*>
-<!--end of caption.element-->]]>
-
-<!ENTITY % caption.attlist "INCLUDE">
-<![ %caption.attlist; [
-<!ATTLIST caption
-               %common.attrib;
-               %caption.role.attrib;
-               %local.caption.attrib;
->
-<!--end of caption.attlist-->]]>
-<!--end of caption.module-->]]>
-
 <!ENTITY % mediaobjectco.module "INCLUDE">
 <![ %mediaobjectco.module; [
 <!ENTITY % local.mediaobjectco.attrib "">
@@ -3712,7 +3692,6 @@ in the text (no (0) value, the default)
 <!-- includes Label -->
 <!-- includes common attributes -->
 
-
 <!ENTITY % informaltable.attlist "INCLUDE">
 <![%informaltable.attlist;[
 <!ATTLIST informaltable
@@ -3726,6 +3705,40 @@ in the text (no (0) value, the default)
 <!--end of informaltable.attlist-->]]>
 <!--end of informaltable.module-->]]>
 
+<!ENTITY % caption.module "INCLUDE">
+<![ %caption.module; [
+<!ENTITY % local.caption.attrib "">
+<!ENTITY % caption.role.attrib "%role.attrib;">
+
+<!ENTITY % caption.element "INCLUDE">
+<![ %caption.element; [
+<!ELEMENT caption %ho; (#PCDATA | %textobject.mix;)*>
+<!--end of caption.element-->]]>
+
+<!ENTITY % caption.attlist "INCLUDE">
+<![ %caption.attlist; [
+<!-- attrs comes from HTML tables ... -->
+
+<![ %allow.html.tables; [
+<!ENTITY % caption.attlist.content "
+               %common.attrib;
+               %caption.role.attrib;
+               %attrs;
+               align   (top|bottom|left|right) #IMPLIED
+               %local.caption.attrib;
+">
+]]>
+<!ENTITY % caption.attlist.content "
+               %common.attrib;
+               %caption.role.attrib;
+               %local.caption.attrib;
+">
+
+<!ATTLIST caption %caption.attlist.content;>
+
+<!--end of caption.attlist-->]]>
+<!--end of caption.module-->]]>
+
 <!-- ...................................................................... -->
 <!-- Synopses ............................................................. -->