Refactor XInclude support

diff --git a/docbook/relaxng/docbook/Makefile b/docbook/relaxng/docbook/Makefile
index 5b376298c4e2999b492b441d5c99e287353f8af3..e45aa9f184ddbaed3bf9c8d797715c60fb6ee3f9 100644 (file)
--- a/docbook/relaxng/docbook/Makefile
+++ b/docbook/relaxng/docbook/Makefile
@@ -28,6 +28,6 @@ clean:: ; rm -rf $(_OUTTOP)
 
 .SUFFIXES:
 
-MODULES=docbook dbforms defguide
+MODULES=docbook dbforms defguide docbookxi
 
 include $(addsuffix /Makefile,$(MODULES))

diff --git a/docbook/relaxng/docbook/dbforms/Makefile b/docbook/relaxng/docbook/dbforms/Makefile
index e104e68ab857e011952be106c0ba13f8b2a6505c..0c1842bd0bac24f589420788486f8df477aed3ab 100644 (file)
--- a/docbook/relaxng/docbook/dbforms/Makefile
+++ b/docbook/relaxng/docbook/dbforms/Makefile
@@ -10,14 +10,14 @@ clean:: ; rm -f dbforms.rng dbforms.rnc dbforms.dtd
 
 $(_OUTTOP)/dbforms/dbforms.rng: dbforms/htmlform.rnc \
              src/annotations.rnc src/bibliography.rnc \
-             src/callouts.rnc src/calstbl.rnc src/dbforms.rnc \
+             src/callouts.rnc src/calstbl.rnc \
              src/docbook.rnc src/ebnf.rnc src/glossary.rnc \
-             src/hier.rnc src/htmlform.rnc src/htmltbl.rnc \
+             src/hier.rnc src/htmltbl.rnc \
              src/index.rnc src/math.rnc src/mathml.rnc \
              src/msgset.rnc src/pool.rnc src/qandaset.rnc \
              src/refentry.rnc src/refsect1.rnc src/sect1.rnc \
              src/svg.rnc src/tasks.rnc src/toc.rnc \
-             src/xinclude.rnc src/xlink.rnc
+             docbookxi/xinclude.rnc src/xlink.rnc
 
 include _footer.mak
 

diff --git a/docbook/relaxng/docbook/defguide/Makefile b/docbook/relaxng/docbook/defguide/Makefile
index 258cadeaadaf323424897aa6b5fde0eb6ffd9d16..4d86674be99b5bfebc0381053deaf0b2d7a35c7a 100644 (file)
--- a/docbook/relaxng/docbook/defguide/Makefile
+++ b/docbook/relaxng/docbook/defguide/Makefile
@@ -10,17 +10,31 @@ SRCS = defguide.rnc
 
 BINARY = defguide.rnd
 
+all:: defguide.rng defguide.rnc defguide.dtd
+
+clean:: ; rm -f $(_MODULE)/defguide.rnc
+
 $(_MODULE)/defguide.rnc: src/docbook.rnc
-       cat $< | grep -v xinclude | sed "s/include \"/include \"..\/src\//" > $@
+       cat $< | sed "s/include \"/include \"..\/src\//" > $@
+       echo 'include "../dbforms/htmlform.rnc"' >> $@
 
 $(_OUTTOP)/defguide/defguide.rng: src/annotations.rnc src/bibliography.rnc \
-             src/callouts.rnc src/calstbl.rnc src/dbforms.rnc \
+             src/callouts.rnc src/calstbl.rnc dbforms/htmlform.rnc \
              src/docbook.rnc src/ebnf.rnc src/glossary.rnc \
-             src/hier.rnc src/htmlform.rnc src/htmltbl.rnc \
+             src/hier.rnc src/htmltbl.rnc \
              src/index.rnc src/math.rnc src/mathml.rnc \
              src/msgset.rnc src/pool.rnc src/qandaset.rnc \
              src/refentry.rnc src/refsect1.rnc src/sect1.rnc \
              src/svg.rnc src/tasks.rnc src/toc.rnc \
-             src/xinclude.rnc src/xlink.rnc
+             docbookxi/xinclude.rnc src/xlink.rnc
 
 include _footer.mak
+
+defguide.rng: $(basename $(defguide_BINARY)).rnx
+       $(XSLTPROC) --output $@ $(TOOLS)/removedoc.xsl $<
+
+defguide.rnc: defguide.rng
+       $(RUNTRANG) $< $@
+
+defguide.dtd: $(basename $(defguide_BINARY)).dtx defguide.rnc
+       $(XSLTPROC) -output $@ $(TOOLS)/xml2dtd.xsl $<

diff --git a/docbook/relaxng/docbook/docbook/Makefile b/docbook/relaxng/docbook/docbook/Makefile
index 7b03d0d07fb48c2258b0acada37b7991558947df..edfb5bab7196a30efc2668a6d33314f3d24cf7f5 100644 (file)
--- a/docbook/relaxng/docbook/docbook/Makefile
+++ b/docbook/relaxng/docbook/docbook/Makefile
@@ -9,14 +9,14 @@ all:: docbook.rng docbook.rnc docbook.dtd
 clean:: ; rm -f docbook.rng docbook.rnc docbook.dtd
 
 $(_OUTTOP)/docbook/docbook.rng: src/annotations.rnc src/bibliography.rnc \
-             src/callouts.rnc src/calstbl.rnc src/dbforms.rnc \
+             src/callouts.rnc src/calstbl.rnc \
              src/docbook.rnc src/ebnf.rnc src/glossary.rnc \
-             src/hier.rnc src/htmlform.rnc src/htmltbl.rnc \
+             src/hier.rnc src/htmltbl.rnc \
              src/index.rnc src/math.rnc src/mathml.rnc \
              src/msgset.rnc src/pool.rnc src/qandaset.rnc \
              src/refentry.rnc src/refsect1.rnc src/sect1.rnc \
              src/svg.rnc src/tasks.rnc src/toc.rnc \
-             src/xinclude.rnc src/xlink.rnc
+             src/xlink.rnc
 
 include _footer.mak
 

diff --git a/docbook/relaxng/docbook/docbookxi/Makefile b/docbook/relaxng/docbook/docbookxi/Makefile
new file mode 100644 (file)
index 0000000..f80a09a
--- /dev/null
+++ b/docbook/relaxng/docbook/docbookxi/Makefile
@@ -0,0 +1,36 @@
+# This Makefile builds the $(_OUTTOP)/docbookxi/docbookxi.rnd
+
+include _header.mak
+
+SRCS = docbookxi.rnc
+
+BINARY = docbookxi.rnd
+
+all:: docbookxi.rng docbookxi.rnc docbookxi.dtd
+
+clean:: ; rm -f $(_MODULE)/docbookxi.rnc
+
+$(_MODULE)/docbookxi.rnc: src/docbook.rnc
+       cat $< | sed "s/include \"/include \"..\/src\//" > $@
+       echo 'include "../dbforms/htmlform.rnc"' >> $@
+
+$(_OUTTOP)/docbookxi/docbookxi.rng: src/annotations.rnc src/bibliography.rnc \
+             src/callouts.rnc src/calstbl.rnc dbforms/htmlform.rnc \
+             src/docbook.rnc src/ebnf.rnc src/glossary.rnc \
+             src/hier.rnc src/htmltbl.rnc \
+             src/index.rnc src/math.rnc src/mathml.rnc \
+             src/msgset.rnc src/pool.rnc src/qandaset.rnc \
+             src/refentry.rnc src/refsect1.rnc src/sect1.rnc \
+             src/svg.rnc src/tasks.rnc src/toc.rnc \
+             docbookxi/xinclude.rnc src/xlink.rnc
+
+include _footer.mak
+
+docbookxi.rng: $(basename $(docbookxi_BINARY)).rnx
+       $(XSLTPROC) --output $@ $(TOOLS)/removedoc.xsl $<
+
+docbookxi.rnc: docbookxi.rng
+       $(RUNTRANG) $< $@
+
+docbookxi.dtd: $(basename $(docbookxi_BINARY)).dtx docbookxi.rnc
+       $(XSLTPROC) -output $@ $(TOOLS)/xml2dtd.xsl $<

diff --git a/docbook/relaxng/docbook/docbookxi/docbookxi.rnc b/docbook/relaxng/docbook/docbookxi/docbookxi.rnc
new file mode 100644 (file)
index 0000000..4668bac
--- /dev/null
+++ b/docbook/relaxng/docbook/docbookxi/docbookxi.rnc
@@ -0,0 +1,21 @@
+# This file is part of DocBook NG: The "Mezcal" Release.
+
+# This schema is a "work-in-progress". It validates a DocBook-like grammar that
+# may, in some incarnation, form the basis for DocBook V.next. Or it may not.
+# At the moment, it's just an exploration by Norm. It has utterly no normative
+# value at all.
+#
+# Author: Norman Walsh, <ndw@nwalsh.com>
+# Source: Derived from DocBook XML V4.3
+# Release: $Id$
+#
+# ======================================================================
+
+namespace ctrl = "http://nwalsh.com/xmlns/schema-control/"
+namespace rng  = "http://relaxng.org/ns/structure/1.0"
+namespace s = "http://www.ascc.net/xml/schematron"
+namespace db = "http://docbook.org/ns/docbook"
+default namespace = "http://docbook.org/ns/docbook"
+
+include "../src/docbook/rnc"
+include "xinclude.rnc"

diff --git a/docbook/relaxng/docbook/src/xinclude.rnc b/docbook/relaxng/docbook/docbookxi/xinclude.rnc
similarity index 100%
rename from docbook/relaxng/docbook/src/xinclude.rnc
rename to docbook/relaxng/docbook/docbookxi/xinclude.rnc

diff --git a/docbook/relaxng/docbook/src/docbook.rnc b/docbook/relaxng/docbook/src/docbook.rnc
index 86e35bb2404e6777b63466071b0c61cb52ff11b9..040ae3c8349edf27b0db08af064adc1ce6d224d0 100644 (file)
--- a/docbook/relaxng/docbook/src/docbook.rnc
+++ b/docbook/relaxng/docbook/src/docbook.rnc
@@ -28,7 +28,6 @@ start = db.set
 include "pool.rnc"
 include "annotations.rnc"
 include "xlink.rnc"
-include "xinclude.rnc"
 include "hier.rnc"
 include "sect1.rnc"
 include "refentry.rnc"