Added wordml into doc and release build.

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 60d4434d29e2f9b8174a7c17010a060497154ffe..e37714f1c838fbff03f6dfa9bf5447de1819181e 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -9,7 +9,7 @@ CRSTYLE=creference.xsl
 BSTYLE=book.xsl
 VPATH=../docsrc
 
-DIRS=common refentry lib html fo manpages slides/html website tools template pi
+DIRS=common refentry lib html fo manpages wordml slides/html website tools template pi
 
 all: copyright.html warranty.html reference.html index.html
        for i in $(DIRS) __bogus__; do \

diff --git a/xsl/doc/wordml/Makefile b/xsl/doc/wordml/Makefile
new file mode 100644 (file)
index 0000000..a0a2b58
--- /dev/null
+++ b/xsl/doc/wordml/Makefile
@@ -0,0 +1,19 @@
+include ../../../cvstools/Makefile.incl
+
+STYLE=../jrefhtml.xsl
+VPATH=../../docsrc/wordml
+XSLTOPT=
+
+HTMLFILES = param.html
+
+all: $(HTMLFILES)
+
+%.html : %.xml $(STYLE)
+       $(XSLT) $< $(STYLE) $@ $(XSLTOPT)
+
+param.html: docparam.xml
+       $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT)
+       touch param.html
+
+clean:
+       rm -f *.html

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 96c0a1aa40ca29624a2931deb092ebbb798ff7df..0fff632f27ffe76f8a1ed97cf0eeb8520626d058 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,4 +1,4 @@
-DIRS=common refentry html fo manpages slides/html website template tools pi
+DIRS=common refentry html fo manpages wordml slides/html website template tools pi
 
 all: xsl-params.xsl
        for i in $(DIRS) __bogus__; do \

diff --git a/xsl/docsrc/make-xsl-params.pl b/xsl/docsrc/make-xsl-params.pl
index 63c1dd204beb947b564253d702287bb966ed2974..eac35b0a6e7c5c18d1ffe0ac6e63df1ad1a6796b 100755 (executable)
--- a/xsl/docsrc/make-xsl-params.pl
+++ b/xsl/docsrc/make-xsl-params.pl
@@ -53,6 +53,22 @@ foreach my $param (/<xsl:param name="[^\"]+"/gs) {
     print "    <member>$1</member>\n", 
 }
 
+print <<EOF5;
+  </simplelist>
+</xsl:variable>
+
+<xsl:variable name="xsl-wordml-parameters-list">
+  <simplelist>
+EOF5
+
+open (F, "../wordml/param.xsl");
+read (F, $_, -s "../wordml/param.xsl");
+close (F);
+foreach my $param (/<xsl:param name="[^\"]+"/gs) {
+    $param =~ /name=\"(.*)\"/;
+    print "    <member>$1</member>\n", 
+}
+
 print <<EOF4;
   </simplelist>
 </xsl:variable>

diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml
index d2fd92ac6b7aafc9e2fabdd879ffe380ac6067a1..aa8bde99106c0ae84b4f9bd649b4c909882a924c 100644 (file)
--- a/xsl/docsrc/reference.xml
+++ b/xsl/docsrc/reference.xml
@@ -8,6 +8,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 <!ENTITY fo-param.xml SYSTEM "fo/docparam.xml" NDATA SGML>
 <!ENTITY fo-table.xml SYSTEM "fo/table.xml" NDATA SGML>
 <!ENTITY manpages-param.xml SYSTEM "manpages/docparam.xml" NDATA SGML>
+<!ENTITY wordml-param.xml SYSTEM "wordml/docparam.xml" NDATA SGML>
 <!ENTITY slides-html-param.xml SYSTEM "slides/html/docparam.xml" NDATA SGML>
 <!ENTITY website-param.xml SYSTEM "website/docparam.xml" NDATA SGML>
 <!ENTITY titlepage.xml SYSTEM "template/titlepage.xml" NDATA SGML>
@@ -43,6 +44,9 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
       <listitem><para><olink type="title" localinfo="manpages/index.html"
       targetdocent="manpages-param.xml"/></para>
       </listitem>
+      <listitem><para><olink type="title" localinfo="wordml/index.html"
+      targetdocent="wordml-param.xml"/></para>
+      </listitem>
       <listitem><para><olink type="title" localinfo="slides/html/index.html"
       targetdocent="slides-html-param.xml"/></para>
       </listitem>

diff --git a/xsl/docsrc/wordml/Makefile b/xsl/docsrc/wordml/Makefile
new file mode 100644 (file)
index 0000000..a80b59b
--- /dev/null
+++ b/xsl/docsrc/wordml/Makefile
@@ -0,0 +1,19 @@
+include ../../../cvstools/Makefile.incl
+
+JSTYLE=../../docsrc/xsl2jref.xsl
+VPATH=../../wordml
+
+XMLFILES = docparam.xml
+
+all: $(XMLFILES)
+
+clean:
+       rm -f $(XMLFILES)
+
+%.xml : %.xsl $(JSTYLE)
+       $(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+       $(XJPARSE) $@
+
+docparam.xml: ../../wordml/param.xsl
+       $(MAKE) -C ../../wordml param.xml
+       cp ../../wordml/param.xml docparam.xml

diff --git a/xsl/docsrc/xsl-param-link.xsl b/xsl/docsrc/xsl-param-link.xsl
index eb0cf68da7bce6dcea3a823b2b3140679557f44c..48a4cbc8cd8d29f1607127a1f76b11b76c10d7a4 100644 (file)
--- a/xsl/docsrc/xsl-param-link.xsl
+++ b/xsl/docsrc/xsl-param-link.xsl
@@ -13,6 +13,9 @@
 <xsl:param name="manpages-baseuri"
            select="'http://docbook.sourceforge.net/release/xsl/current/doc/manpages/'"/>
 
+<xsl:param name="wordml-baseuri"
+           select="'http://docbook.sourceforge.net/release/xsl/current/doc/wordml/'"/>
+
 <xsl:template match="parameter">
   <xsl:variable name="markup">
     <xsl:apply-imports/>
@@ -36,6 +39,12 @@
     </xsl:call-template>
   </xsl:variable>
 
+  <xsl:variable name="iswordml">
+    <xsl:call-template name="is-wordml-parameter">
+      <xsl:with-param name="param" select="normalize-space(.)"/>
+    </xsl:call-template>
+  </xsl:variable>
+
   <xsl:choose>
     <xsl:when test="$ishtml != 0">
       <a href="{concat($html-baseuri, normalize-space(.))}.html">
@@ -52,6 +61,11 @@
         <xsl:copy-of select="$markup"/>
       </a>
     </xsl:when>
+    <xsl:when test="$iswordml != 0">
+      <a href="{concat($wordml-baseuri, normalize-space(.))}.html">
+        <xsl:copy-of select="$markup"/>
+      </a>
+    </xsl:when>
     <xsl:otherwise>
       <xsl:copy-of select="$markup"/>
     </xsl:otherwise>

diff --git a/xsl/wordml/.cvsignore b/xsl/wordml/.cvsignore
new file mode 100644 (file)
index 0000000..bf7e41f
--- /dev/null
+++ b/xsl/wordml/.cvsignore
@@ -0,0 +1,5 @@
+Makefile.param
+param.xml
+param.xsl
+profile-docbook.xsl
+xref.xsl

diff --git a/xsl/wordml/Makefile b/xsl/wordml/Makefile
index fe6057f27b8fa76cc5d03b607c1906219683d9d9..bf6c563a13fa0c437618d1f52f08f41d624c3db2 100644 (file)
--- a/xsl/wordml/Makefile
+++ b/xsl/wordml/Makefile
@@ -1,3 +1,5 @@
+include ../../cvstools/Makefile.incl
+
 # Change this to where you are storing your roundtripping stylesheets
 STYLESHEETDIR = .
 
@@ -19,6 +21,20 @@ include Makefile.param
 
 all:   param.xsl
 
+xml: param.xml
+
+html: param.html
+
+param.html: param.xml
+       $(XSLT) $< ../docsrc/lrefentry.xsl $@
+
+param.xml: param.xweb $(PARAMS)
+       ../../cvstools/paramchk -m Makefile.param $<
+       $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html
+       $(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
+       $(XSLT) $(PARAMSTRIP) ../../litprog/w2docbook.xsl $@
+       $(RM) $(PARAMPROF) $(PARAMSTRIP)
+
 param.xsl:     param.xweb
        ../../cvstools/paramchk -m Makefile.param $<
        $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=wordml
@@ -30,7 +46,7 @@ Makefile.param:
        ../../cvstools/paramchk -m $@ param.xweb
 
 clean:
-       $(RM) param.xsl
+       $(RM) param.xml param.html param.xsl
        $(RM) Makefile.param
        echo "# foo" > Makefile.param
 

diff --git a/xsl/wordml/param.xweb b/xsl/wordml/param.xweb
index 6d1b3e2b2f038752b734b0bd28f32d12379f4921..efceddc9e31a3be8124835097529904799ac5ad7 100644 (file)
--- a/xsl/wordml/param.xweb
+++ b/xsl/wordml/param.xweb
@@ -21,7 +21,7 @@
     </copyright>
   </bookinfo>
 
-  <preface>
+  <preface id="preface">
     <title>Introduction</title>
 
     <para>This is technical documentation for the DocBook XSL Stylesheets to produce WordML output (or Apple Pages); it documents the parameters, templates and usage of the stylesheet(s).</para>
@@ -30,6 +30,7 @@
   </preface>
 
 &wordml.template;
+&pages.template;
 
   <appendix>
     <title>The Stylesheet</title>