Remove blockinfo from blockquote; fix informaltable in the HTML tables case

diff --git a/docbook/simple/sdocbook-custom.dtd b/docbook/simple/sdocbook-custom.dtd
index 5ac62e754777417ef8d1657c523464285f3cca22..d3f31b5f03f4352d3d862cc4a193a51e70d88a10 100644 (file)
--- a/docbook/simple/sdocbook-custom.dtd
+++ b/docbook/simple/sdocbook-custom.dtd
@@ -223,10 +223,11 @@
 <!ENTITY % systemitem.element "IGNORE">
 <!ENTITY % computeroutput.element "IGNORE">
 <!ENTITY % userinput.element "IGNORE">
+<!ENTITY % blockquote.element  "IGNORE">
 
 <!ENTITY % cals.table.module "INCLUDE">
-<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.3CR2//EN"
+                   "http://docbook.org/xml/4.3CR2/docbookx.dtd"
 >
 %docbook;
 
@@ -282,7 +283,16 @@
 
 <!ENTITY % simple.informaltable.element "INCLUDE">
 <![%simple.informaltable.element;[
-<!ELEMENT informaltable (mediaobject+|tgroup+) %tbl.table.excep;>
+
+<![%allow.html.tables;[
+<!ENTITY % informaltable.table.mdl
+       "((mediaobject+|tgroup+)
+          |(caption, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
+]]>
+<!ENTITY % informaltable.table.mdl
+       "(mediaobject+|tgroup+)">
+
+<!ELEMENT informaltable (%informaltable.table.mdl;) %tbl.table.excep;>
 ]]>
 
 <!ENTITY % simple.replaceable.element "INCLUDE">
@@ -405,5 +415,10 @@
 <!ELEMENT userinput %ho; (%cptr.char.mix;)*>
 ]]>
 
+<!ENTITY % simple.blockquote.element "INCLUDE">
+<![%simple.blockquote.element;[
+<!ELEMENT blockquote %ho; (title?, attribution?, (%component.mix;)+)>
+]]>
+
 <!-- End of Simplified DocBook DTD V1.0 ................................... -->
 <!-- ...................................................................... -->