Update to be based on 4.5 and remove caption from informaltable

diff --git a/docbook/simple/Makefile b/docbook/simple/Makefile
index aa08757cbbea3f030f3aaa3ed0d99b4dfa8b7c31..26bfb560a5d05fe22ffa6b312a04cf381722154f 100644 (file)
--- a/docbook/simple/Makefile
+++ b/docbook/simple/Makefile
@@ -7,10 +7,10 @@ FMGO=-N
 all: sdocbook.dtd sdocbookref.dtd
 
 test:
-       $(XJPARSE) tests/testcust.xml
-       $(XJPARSE) tests/testrefcust.xml
-       $(XJPARSE) tests/test.xml
-       $(XJPARSE) tests/testcss.xml
+       $(XJPARSE) -d tests/testcust.xml
+       $(XJPARSE) -d tests/testrefcust.xml
+       $(XJPARSE) -d tests/test.xml
+       $(XJPARSE) -d tests/testcss.xml
 
 freshmeat:
 ifeq ($(VERSION),)
@@ -21,11 +21,11 @@ else
 endif
 
 sdocbook.dtd: sdocbook-custom.dtd $(MODULES)
-       $(XJPARSE) tests/testcust.xml
+       $(XJPARSE) -d tests/testcust.xml
        $(FLATTEN) sdocbook-custom.dtd > sdocbook.dtd
 
 sdocbookref.dtd: sdocbookref-custom.dtd $(MODULES)
-       $(XJPARSE) tests/testrefcust.xml
+       $(XJPARSE) -d tests/testrefcust.xml
        $(FLATTEN) sdocbookref-custom.dtd > sdocbookref.dtd
 
 doc: sdocbook.dtd

diff --git a/docbook/simple/sdbpool.mod b/docbook/simple/sdbpool.mod
index 5a73667d3660d7b534b529be69e8a9a8dcb31d05..df97254f23949e0251cc934cd1e51ce43bdb9609 100644 (file)
--- a/docbook/simple/sdbpool.mod
+++ b/docbook/simple/sdbpool.mod
@@ -135,6 +135,11 @@
                |%para.class;           |blockquote
                %local.textobject.mix;">
 
+<!ENTITY % local.mediaobject.mix "">
+<!ENTITY % mediaobject.mix
+               "videoobject|audioobject|imageobject|textobject
+                %local.mediaobject.mix;">
+
 <!ENTITY % local.listpreamble.mix "">
 <!ENTITY % listpreamble.mix
                "                        %admon.class;

diff --git a/docbook/simple/sdocbook-custom.dtd b/docbook/simple/sdocbook-custom.dtd
index 9b5f5965f8150b25bc9bb9bb2c4ebc3f9dbb0e70..949d6af9e1ad4a57833b1258ea5036666385bdc0 100644 (file)
--- a/docbook/simple/sdocbook-custom.dtd
+++ b/docbook/simple/sdocbook-custom.dtd
@@ -234,8 +234,8 @@
 <!ENTITY % superscript.element "IGNORE">
 
 <!ENTITY % cals.table.module "INCLUDE">
-<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://docbook.org/xml/4.3/docbookx.dtd"
+<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5CR2//EN"
+                   "http://docbook.org/xml/4.5CR2/docbookx.dtd"
 >
 %docbook;
 
@@ -295,7 +295,7 @@
 <![%allow.html.tables;[
 <!ENTITY % informaltable.table.mdl
        "((mediaobject+|tgroup+)
-          |(caption, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
+          |((col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
 ]]>
 <!ENTITY % informaltable.table.mdl
        "(mediaobject+|tgroup+)">

diff --git a/docbook/simple/sinclist.mod b/docbook/simple/sinclist.mod
index a7fe659758879b7138fc0da7d283c9900c8cd27d..32e90afe6c9ff24528c6e6d7630a9c39c4ae557f 100644 (file)
--- a/docbook/simple/sinclist.mod
+++ b/docbook/simple/sinclist.mod
@@ -319,5 +319,12 @@
 <!ENTITY % uri.module "IGNORE">
 <!ENTITY % allow.html.tables "INCLUDE">
 
+<!-- new in 4.4 or 4.5 -->
+<!ENTITY % bibliolist.module "IGNORE">
+<!ENTITY % mathphrase.module "IGNORE">
+<!ENTITY % termdef.module "IGNORE">
+<!ENTITY % biblioref.module "IGNORE">
+<!ENTITY % package.module "IGNORE">
+
 <!-- End of Simplified DocBook Include Module V1.1 ........................ -->
 <!-- ...................................................................... -->