From: Norman Walsh <ndw@nwalsh.com>
Date: Sun, 21 Dec 2003 18:18:36 +0000 (+0000)
Subject: Refactor parameter entities for informaltable so that textobject is handled correctly... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83c5d8c23a7ea7133ee648d6790262b0df8e29fd;p=docbook-dsssl

Refactor parameter entities for informaltable so that textobject is handled correctly; avoid duplicate ID on caption when HTML tables are allowed.
---

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index b6aed310b..ceb7d7397 100644
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -3678,11 +3678,11 @@ in the text (no (0) value, the default)
 <!ENTITY % local.informaltable.attrib "">
 
 <!-- the following entity may have been declared by the XHTML table module -->
-<!ENTITY % informal.tbl.table.mdl "graphic+|mediaobject+|tgroup+">
+<!ENTITY % informal.tbl.table.mdl "textobject*, (graphic+|mediaobject+|tgroup+)">
 
 <!ENTITY % informaltable.element "INCLUDE">
 <![%informaltable.element;[
-<!ELEMENT informaltable %ho; (blockinfo?, textobject*, (%informal.tbl.table.mdl;))>
+<!ELEMENT informaltable %ho; (blockinfo?, (%informal.tbl.table.mdl;))>
 <!--end of informaltable.element-->]]>
 
 <!-- Frame, Colsep, and Rowsep must be repeated because
@@ -3720,8 +3720,16 @@ in the text (no (0) value, the default)
 <!-- attrs comes from HTML tables ... -->
 
 <![ %allow.html.tables; [
+<!-- common.attrib, but without ID because ID is in attrs -->
 <!ENTITY % caption.attlist.content "
-		%common.attrib;
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;
 		%caption.role.attrib;
 		%attrs;
 		align	(top|bottom|left|right)	#IMPLIED