[docbook-checkins] CVS: docbook/xml dbpoolx.mod,1.81,1.82

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/docbook/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv16797

Modified Files:
	dbpoolx.mod 
Log Message:
Refactor parameter entities for informaltable so that textobject is handled correctly; avoid duplicate ID on caption when HTML tables are allowed.

Index: dbpoolx.mod
===================================================================
RCS file: /cvsroot/docbook/docbook/xml/dbpoolx.mod,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -U2 -r1.81 -r1.82
--- dbpoolx.mod	20 Dec 2003 17:15:47 -0000	1.81
+++ dbpoolx.mod	21 Dec 2003 18:18:36 -0000	1.82
@@ -3679,9 +3679,9 @@
 
 <!-- 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-->]]>
 
@@ -3721,6 +3721,14 @@
 
 <![ %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;