Integrated FO and HTML PI docs into the doc build.

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 07b600773de636c87826b7672257933853e72049..0708666024a0e81edd3c2091f2176fdc4521df9f 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,5 +1,5 @@
 include ../../releasetools/Variables.mk
-DIRS=common refentry html fo manpages roundtrip slides-html slides-fo website template utility pi-fo
+DIRS=common refentry html fo manpages roundtrip slides-html slides-fo website template utility pi-fo pi-html
 
 DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
 PARAM_XSL_FILES=$(shell for file in $$(find .. -name "param.xsl"); do \

diff --git a/xsl/docsrc/Makefile.incl b/xsl/docsrc/Makefile.incl
index 522b89eef81ae7ac7ae6278be03f3a2586769263..da8aaa64f93f1b2333927042e58f5f275b9644f6 100644 (file)
--- a/xsl/docsrc/Makefile.incl
+++ b/xsl/docsrc/Makefile.incl
@@ -1,3 +1,4 @@
+XJPARSEFLAGS=-E 0 -w
 all: $(XMLFILES)
 
 clean:
@@ -6,7 +7,7 @@ clean:
 %.refsect1.xml: %.xml $(JREF2REFSECT1)
        $(XSLT) $< $(JREF2REFSECT1) $@
 
-%.xml : %.xsl $(XSL2JREF) ../legalnotice.xml
+%.xml : %.xsl $(XSL2JREF)
        $(XSLT) $< $(XSL2JREF) /dev/null output-file=$@
        $(XJPARSE) $(XJPARSEFLAGS) $@
 

diff --git a/xsl/docsrc/pi-fo/Makefile b/xsl/docsrc/pi-fo/Makefile
new file mode 100644 (file)
index 0000000..d3a4b8f
--- /dev/null
+++ b/xsl/docsrc/pi-fo/Makefile
@@ -0,0 +1,4 @@
+include ../../../releasetools/Variables.mk
+VPATH=../../fo
+XMLFILES = pi.xml pi.refsect1.xml
+include ../Makefile.incl

diff --git a/xsl/docsrc/pi-html/Makefile b/xsl/docsrc/pi-html/Makefile
new file mode 100644 (file)
index 0000000..d3a4b8f
--- /dev/null
+++ b/xsl/docsrc/pi-html/Makefile
@@ -0,0 +1,4 @@
+include ../../../releasetools/Variables.mk
+VPATH=../../fo
+XMLFILES = pi.xml pi.refsect1.xml
+include ../Makefile.incl

diff --git a/xsl/docsrc/reference.dbk b/xsl/docsrc/reference.dbk
index 5759526fab285d4d78d3c8dd9d8683ebd20b7168..2c2f00062b727f63f9d6a0867790c49d6e9ab42d 100644 (file)
--- a/xsl/docsrc/reference.dbk
+++ b/xsl/docsrc/reference.dbk
@@ -11,7 +11,7 @@
   <info><releaseinfo role="meta">$Id$ </releaseinfo>
     <xi:include href="./authors.xml"/>
     <xi:include href="./copyright.xml" xpointer="xpointer(//*[local-name() = 'copyright'])"/>
-    <xi:include href="./legalnotice.xml"/>
+    <xi:include href="./license.xml"/>
     <xi:include href="./warranty.xml"/>
     <abstract xml:id="about">
       <title>About this document</title>
@@ -30,12 +30,12 @@
               >http://www.sagehill.net/docbookxsl/index.html</link>
           </para>
         </note>
-        This document is divided into two sets of references:
-        the first set provides user documentation; the second,
+        This document is divided into three sets of references:
+        the first two sets provides user documentation; the third,
         developer documentation.</para>
     </abstract>
   </info>
-  <book xml:id="user"><title>DocBook XSL Stylesheets: User Reference</title>
+  <book xml:id="param"><title>DocBook XSL Stylesheets User Reference: Parameters</title>
     <info>
       <abstract>
         <para>This is generated reference documentation for all
@@ -120,7 +120,52 @@
       <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/reference)" />
     </part>
   </book>
-  <book xml:id="developer"><title>DocBook XSL Stylesheets: Developer Reference</title>
+  <book xml:id="pi"><title>DocBook XSL Stylesheets User Reference: PIs</title>
+    <info>
+      <abstract>
+        <para>This is generated reference documentation for all
+          user-specifiable processing instructions in the DocBook
+          XSL stylesheets.
+          <note>
+            <para>You add these PIs at particular points in a document to
+              cause specific “exceptions” to formatting/output behavior. To
+              make global changes in formatting/output behavior across an
+              entire document, it’s better to do it by setting an
+              appropriate stylesheet parameter (if there is one).</para>
+          </note>
+        </para>
+      </abstract>
+    </info>
+    <part xml:id="pi-html">
+      <?dbhtml dir="pi/fo"?>
+      <xi:include href="./pi-html/pi.refsect1.xml" xpointer="xpointer(/reference/title)" />
+
+      <xi:include href="./pi-html/pi.refsect1.xml"
+        xpointer="xpointer(/reference/partintro)" />
+
+      <reference xml:id="pi-html-ref">
+        <title>Templates</title>
+        <xi:include
+          href="./pi-html/pi.refsect1.xml"
+          xpointer="xpointer(/reference/refentry)" />
+      </reference>
+    </part>
+    <part xml:id="pi-fo">
+      <?dbhtml dir="pi/fo"?>
+      <xi:include href="./pi-fo/pi.refsect1.xml" xpointer="xpointer(/reference/title)" />
+
+      <xi:include href="./pi-fo/pi.refsect1.xml"
+        xpointer="xpointer(/reference/partintro)" />
+
+      <reference xml:id="pi-fo-ref">
+        <title>Templates</title>
+        <xi:include
+          href="./pi-fo/pi.refsect1.xml"
+          xpointer="xpointer(/reference/refentry)" />
+      </reference>
+    </part>
+  </book>
+  <book xml:id="developer"><title>DocBook XSL Stylesheets Developer Reference</title>
     <info>
       <abstract>
         <para>This is technical reference documentation for
@@ -130,15 +175,6 @@
           the stylesheets.</para>
       </abstract>
     </info>
-    <part xml:id="pi">
-      <?dbhtml dir="pi"?>
-      <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/bookinfo/title)" />
-      <partintro xml:id="piintro">
-        <xi:include href="./pi/pi.xml"
-          xpointer="xpointer(/book/bookinfo/abstract/node())" />
-      </partintro>
-      <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/reference)" />
-    </part>
     <part xml:id="lib">
       <?dbhtml dir="lib"?>
       <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/bookinfo/title)" />