]> granicus.if.org Git - docbook-dsssl/commitdiff
Made changes to cause build of separate
authorMichael Smith <xmldoc@users.sourceforge.net>
Mon, 5 Mar 2007 10:23:21 +0000 (10:23 +0000)
committerMichael Smith <xmldoc@users.sourceforge.net>
Mon, 5 Mar 2007 10:23:21 +0000 (10:23 +0000)
slides/fo/param.xsl and slides/html/param.xsl files,
and updated doc build to handle that split. Also
updated build of ChangeLog.xml, NEWS file and
RELEASE-NOTES.{html,txt,pdf} builds to include slides
and website changes.
Closes bug #1671745. Thanks to Justus Piater.

24 files changed:
xsl/doc/Makefile
xsl/doc/slides-fo/.cvsignore [moved from xsl/doc/slides/.cvsignore with 100% similarity]
xsl/doc/slides-fo/Makefile [moved from xsl/doc/slides/Makefile with 75% similarity]
xsl/doc/slides-html/.cvsignore [new file with mode: 0644]
xsl/doc/slides-html/Makefile [new file with mode: 0644]
xsl/docsrc/Makefile
xsl/docsrc/reference.dbk
xsl/docsrc/reference.xml
xsl/docsrc/slides-fo/.cvsignore [moved from xsl/docsrc/slides/.cvsignore with 100% similarity]
xsl/docsrc/slides-fo/Makefile [moved from xsl/docsrc/slides/Makefile with 80% similarity]
xsl/docsrc/slides-html/.cvsignore [new file with mode: 0644]
xsl/docsrc/slides-html/Makefile [new file with mode: 0644]
xsl/slides/Makefile
xsl/slides/fo/.cvsignore
xsl/slides/fo/Makefile
xsl/slides/fo/param.ent [new file with mode: 0644]
xsl/slides/fo/param.xweb [new file with mode: 0644]
xsl/slides/html/.cvsignore
xsl/slides/html/Makefile [new file with mode: 0644]
xsl/slides/html/param.ent [new file with mode: 0644]
xsl/slides/html/param.xweb [moved from xsl/slides/param.xweb with 73% similarity]
xsl/slides/param.ent [deleted file]
xsl/tools/xsl/build/make-xsl-params.xsl
xsl/tools/xsl/build/xsl-param-link.xsl

index fa408b9f51f185570e8aca4956cf5e474c57a0bf..7a493ffc599265caff0d6440daa9c7708c2f8d4b 100644 (file)
@@ -16,7 +16,7 @@ GZIPFLAGS=
 
 VPATH=../docsrc
 
-DIRS=common refentry lib html fo manpages roundtrip slides website template pi
+DIRS=common refentry lib html fo manpages roundtrip slides-html slides-fo website template pi
 
 # build reference.pdf.gz except for snapshot releases
 ifneq (snapshot,$(findstring snapshot,$(RELVER)))
similarity index 75%
rename from xsl/doc/slides/Makefile
rename to xsl/doc/slides-fo/Makefile
index 6b43114d1a1f6aba2d6d347eed5a64cfd13c335b..cef3f67c138ec0f80681d0cd6b4cdc8a8c994c64 100644 (file)
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
-VPATH=../../docsrc/slides/
+VPATH=../../docsrc/slides-fo
 HTMLFILES = index.html
 include ../Makefile.incl
diff --git a/xsl/doc/slides-html/.cvsignore b/xsl/doc/slides-html/.cvsignore
new file mode 100644 (file)
index 0000000..2d19fc7
--- /dev/null
@@ -0,0 +1 @@
+*.html
diff --git a/xsl/doc/slides-html/Makefile b/xsl/doc/slides-html/Makefile
new file mode 100644 (file)
index 0000000..d66e0ea
--- /dev/null
@@ -0,0 +1,4 @@
+include ../../../releasetools/Variables.mk
+VPATH=../../docsrc/slides-html
+HTMLFILES = index.html
+include ../Makefile.incl
index 5ba1845f939a7f571307f236a71c1fc41326f34e..293c1d361be0c1137a549f1410da9fe4be5036dc 100644 (file)
@@ -1,5 +1,5 @@
 include ../../releasetools/Variables.mk
-DIRS=common refentry html fo manpages roundtrip slides website template
+DIRS=common refentry html fo manpages roundtrip slides-html slides-fo website template
 
 DOCBOOK5_RNG=../../docbook/relaxng/docbook/docbook.rng
 PARAM_XSL_FILES=$(shell for file in $$(find .. -name "param.xsl"); do \
index ca4e3a61504efd5f7e189ce582342c3c79490a39..36444c49b56b1f03a147a50f982a6722c98c1d49 100644 (file)
       </listitem>
       <listitem>
         <para><xi:include
-        href="./slides/docparam.xml"
+        href="./slides-html/docparam.xml"
+        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
+      </listitem>
+      <listitem>
+        <para><xi:include
+        href="./slides-fo/docparam.xml"
         xpointer="xpointer(/book/bookinfo/title/node())"/></para>
       </listitem>
       <listitem>
     <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
 
-  <part id="slides">
-    <xi:include href="./slides/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="slidesintro">
-      <xi:include href="./slides/docparam.xml"
+  <part id="slides-html">
+    <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+    <partintro id="slideshtmlintro">
+      <xi:include href="./slides-html/docparam.xml"
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
+    </partintro>
+    <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/reference)" />
+  </part>
+
+  <part id="slides-fo">
+    <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+    <partintro id="slidesfointro">
+      <xi:include href="./slides-fo/docparam.xml"
                   xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
-    <xi:include href="./slides/docparam.xml" xpointer="xpointer(/book/reference)" />
+    <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
 
   <part id="website">
index 29f8f32130a3a53c16ddfaa7b9531f5c3ca0b315..42b139ff63cb00d68da94ee35b0de7745e134c06 100644 (file)
@@ -9,7 +9,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 <!ENTITY fo-table.xml SYSTEM "fo/table.xml" NDATA SGML>
 <!ENTITY manpages-param.xml SYSTEM "manpages/docparam.xml" NDATA SGML>
 <!ENTITY roundtrip-param.xml SYSTEM "roundtrip/docparam.xml" NDATA SGML>
-<!ENTITY slides-param.xml SYSTEM "slides/docparam.xml" NDATA SGML>
+<!ENTITY slides-html-param.xml SYSTEM "slides-html/docparam.xml" NDATA SGML>
+<!ENTITY slides-fo-param.xml SYSTEM "slides-fo/docparam.xml" NDATA SGML>
 <!ENTITY website-param.xml SYSTEM "website/docparam.xml" NDATA SGML>
 <!ENTITY titlepage.xml SYSTEM "template/titlepage.xml" NDATA SGML>
 <!ENTITY pi.xml SYSTEM "pi/pi.xml" NDATA SGML>
@@ -64,8 +65,11 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
       <listitem><para><olink type="title" localinfo="roundtrip/index.html"
       targetdocent="roundtrip-param.xml"/></para>
       </listitem>
-      <listitem><para><olink type="title" localinfo="slides/index.html"
-      targetdocent="slides-param.xml"/></para>
+      <listitem><para><olink type="title" localinfo="slides-html/index.html"
+      targetdocent="slides-html-param.xml"/></para>
+      </listitem>
+      <listitem><para><olink type="title" localinfo="slides-fo/index.html"
+      targetdocent="slides-fo-param.xml"/></para>
       </listitem>
       <listitem><para><olink type="title" localinfo="website/index.html"
       targetdocent="website-param.xml"/></para>
similarity index 80%
rename from xsl/docsrc/slides/Makefile
rename to xsl/docsrc/slides-fo/Makefile
index 8fcf838622a47360f63aabaee04c6e41cbe17f8c..ea6ba303cecf64e4e607fe09ce189f8ed7ca6619 100644 (file)
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
-VPATH=../../slides
+VPATH=../../slides/fo
 XMLFILES = docparam.xml
 include ../Makefile.incl
diff --git a/xsl/docsrc/slides-html/.cvsignore b/xsl/docsrc/slides-html/.cvsignore
new file mode 100644 (file)
index 0000000..597a43c
--- /dev/null
@@ -0,0 +1,2 @@
+*.xml
+Makefile.param
diff --git a/xsl/docsrc/slides-html/Makefile b/xsl/docsrc/slides-html/Makefile
new file mode 100644 (file)
index 0000000..f6e2a8b
--- /dev/null
@@ -0,0 +1,4 @@
+include ../../../releasetools/Variables.mk
+VPATH=../../slides/html
+XMLFILES = docparam.xml
+include ../Makefile.incl
index 3caa3a98d00b09bd1f81c609800faf18de31cda2..ea3fef6434638237ba72fecbc064ce5115761ba8 100644 (file)
@@ -1,15 +1,7 @@
 include ../../buildtools/Makefile.incl
 
-XSLFILES=param.xsl
-ALLTARGETS=base $(XSLFILES)
-PROFILECONDITION=slides
-CLEANTARGETS=base-clean
 DIRS = fo xhtml
 
-include ../Makefile.incl
-
-.PHONY: fo xhtml
-
 base:
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
@@ -17,7 +9,7 @@ base:
                fi \
        done
 
-base-clean:
+clean:
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
                        echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
index a96e80a907fb3f2ba579f09382afa91c3a975e3c..68e01ace6b628b0b297197f69a734cd2c0ab8278 100644 (file)
@@ -1,2 +1,4 @@
 plain-titlepage.xsl
 ChangeLog
+param.xsl
+Makefile.param
index 86ca3fb59320ec575d85b8ad8abc1ac32bb0ff98..eab95be715c2b237e154f363c73d15e5a879c490 100644 (file)
@@ -1,11 +1,15 @@
 include ../../../buildtools/Makefile.incl
 
+XSLFILES=param.xsl plain-titlepage.xsl
+ALLTARGETS=$(XSLFILES)
+PROFILECONDITION=slides-fo
 TTLTEMPLATEXSL=$(DOCBOOK_SVN)/xsl/template/titlepage.xsl
+CLEANTARGETS=titlepage-clean
 
-all: plain-titlepage.xsl
+include ../../Makefile.incl
 
 %.xsl: %.xml
        $(XSLT) $< $(TTLTEMPLATEXSL) $@
 
-clean: 
+titlepage-clean:
        $(RM) plain-titlepage.xsl
diff --git a/xsl/slides/fo/param.ent b/xsl/slides/fo/param.ent
new file mode 100644 (file)
index 0000000..f4bdce8
--- /dev/null
@@ -0,0 +1,11 @@
+<!ENTITY slide.font.family SYSTEM "../../params/slide.font.family.xml">
+<!ENTITY slide.title.font.family SYSTEM "./../../params/slide.title.font.family.xml">
+<!ENTITY foil.title.master SYSTEM "../../params/foil.title.master.xml">
+<!ENTITY foil.title.size SYSTEM "../../params/foil.title.size.xml">
+<!ENTITY foil.properties SYSTEM "../../params/foil.properties.xml">
+<!ENTITY foil.subtitle.properties SYSTEM "../../params/foil.subtitle.properties.xml">
+<!ENTITY foilgroup.properties SYSTEM "../../params/foilgroup.properties.xml">
+<!ENTITY running.foot.properties SYSTEM "../../params/running.foot.properties.xml">
+<!ENTITY slides.properties SYSTEM "../../params/slides.properties.xml">
+<!ENTITY speakernote.properties SYSTEM "../../params/speakernote.properties.xml">
+
diff --git a/xsl/slides/fo/param.xweb b/xsl/slides/fo/param.xweb
new file mode 100644 (file)
index 0000000..4cb46d4
--- /dev/null
@@ -0,0 +1,111 @@
+<!DOCTYPE book [
+<!ENTITY % param.ent SYSTEM "param.ent">
+%param.ent;
+]>
+<book xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="slides_fo_doc">
+<bookinfo>
+<title>Slides FO Parameter Reference</title>
+<releaseinfo role="meta">
+$Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $
+</releaseinfo>
+<author>
+  <surname>Walsh</surname>
+  <firstname>Norman</firstname>
+</author>
+<copyright>
+  <year>2002</year>
+  <holder>Norman Walsh</holder>
+</copyright>
+<abstract>
+  <para>This is reference documentation for all user-configurable
+  parameters in the DocBook XSL Slides FO stylesheet (for generating
+  PDF slide presentations). Note that qthe Slides stylesheet for FO
+  output is a customization layer of the DocBook XSL FO
+  stylesheet. Therefore, in addition to the slides-specific parameters
+  listed in this section, you can also use a number of <ulink
+  url="http://docbook.sourceforge.net/release/xsl/current/doc/fo/index.html"
+  >FO stylesheet parameters</ulink> to control Slides FO output.</para>
+</abstract>
+</bookinfo>
+
+<reference id="slides_fo_general_params">
+  <title>General Params</title>
+&slide.title.font.family;
+&slide.font.family;
+&foil.title.master;
+&foil.title.size;
+</reference>
+
+<reference id="slides_fo_property_sets">
+  <title>Property Sets</title>
+&slides.properties;
+&foilgroup.properties;
+&foil.subtitle.properties;
+&foil.properties;
+&speakernote.properties;
+&running.foot.properties;
+</reference>
+
+<!--
+<refentry id="">
+<refmeta>
+<refentrytitle></refentrytitle>
+<refmiscinfo role="type">string</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname></refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='.frag'>
+<xsl:param name="" select="''"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>FIXME:</para>
+
+</refsect1>
+</refentry>
+-->
+
+<appendix id="styleheet"><title>The Stylesheet</title>
+
+<para>The <filename>param.xsl</filename> stylesheet is just a wrapper
+around all these parameters.</para>
+
+<src:fragment id="top" mundane-result-prefixes="xsl">
+
+<!-- This file is generated from param.xweb; do not edit this file! -->
+
+<xsl:stylesheet exclude-result-prefixes="src" version="1.0">
+
+<!-- ********************************************************************
+     $Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $
+     ********************************************************************
+
+     This file is part of the DocBook Slides Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<src:fragref linkend="slide.font.family.frag"/>
+<src:fragref linkend="slide.title.font.family.frag"/>
+<src:fragref linkend="foil.title.master.frag"/>
+<src:fragref linkend="foil.title.size.frag"/>
+<src:fragref linkend="foilgroup.properties.frag"/>
+<src:fragref linkend="foil.properties.frag"/>
+<src:fragref linkend="foil.subtitle.properties.frag"/>
+<src:fragref linkend="running.foot.properties.frag"/>
+<src:fragref linkend="speakernote.properties.frag"/>
+<src:fragref linkend="slides.properties.frag"/>
+
+</xsl:stylesheet>
+</src:fragment>
+
+</appendix>
+
+</book>
index 56631abf1919d1804b8f9d3fe4471fc5c1854375..9026a245e213f41a519d863be17108d60f2f6923 100644 (file)
@@ -1 +1,3 @@
 ChangeLog
+param.xsl
+Makefile.param
diff --git a/xsl/slides/html/Makefile b/xsl/slides/html/Makefile
new file mode 100644 (file)
index 0000000..1e1c413
--- /dev/null
@@ -0,0 +1,7 @@
+include ../../../buildtools/Makefile.incl
+
+XSLFILES=param.xsl
+ALLTARGETS=$(XSLFILES)
+PROFILECONDITION=slides-html
+
+include ../../Makefile.incl
diff --git a/xsl/slides/html/param.ent b/xsl/slides/html/param.ent
new file mode 100644 (file)
index 0000000..ade0603
--- /dev/null
@@ -0,0 +1,51 @@
+<!ENTITY active.toc SYSTEM "../../params/active.toc.xml">
+<!ENTITY body.bg.color SYSTEM "../../params/body.bg.color.xml">
+<!ENTITY bullet.image SYSTEM "../../params/bullet.image.xml">
+<!ENTITY css.stylesheet SYSTEM "../../params/css.stylesheet.xml">
+<!ENTITY css.stylesheet.dir SYSTEM "../../params/css.stylesheet.dir.xml">
+<!ENTITY dynamic.toc SYSTEM "../../params/dynamic.toc.xml">
+<!ENTITY foilgroup.toc SYSTEM "../../params/foilgroup.toc.xml">
+<!ENTITY graphics.dir SYSTEM "../../params/graphics.dir.xml">
+<!ENTITY hidetoc.image SYSTEM "../../params/hidetoc.image.xml">
+<!ENTITY home.image SYSTEM "../../params/home.image.xml">
+<!ENTITY keyboard.nav SYSTEM "../../params/keyboard.nav.xml">
+<!ENTITY minus.image SYSTEM "../../params/minus.image.xml">
+<!ENTITY multiframe SYSTEM "../../params/multiframe.xml">
+<!ENTITY multiframe.bottom.bgcolor SYSTEM "../../params/multiframe.bottom.bgcolor.xml">
+<!ENTITY multiframe.navigation.height SYSTEM "../../params/multiframe.navigation.height.xml">
+<!ENTITY multiframe.top.bgcolor SYSTEM "../../params/multiframe.top.bgcolor.xml">
+<!ENTITY nav.separator SYSTEM "../../params/nav.separator.xml">
+<!ENTITY next.image SYSTEM "../../params/next.image.xml">
+<!ENTITY no.home.image SYSTEM "../../params/no.home.image.xml">
+<!ENTITY no.next.image SYSTEM "../../params/no.next.image.xml">
+<!ENTITY no.prev.image SYSTEM "../../params/no.prev.image.xml">
+<!ENTITY no.toc.image SYSTEM "../../params/no.toc.image.xml">
+<!ENTITY no.up.image SYSTEM "../../params/no.up.image.xml">
+<!ENTITY output.indent SYSTEM "../../params/output.indent.xml">
+<!ENTITY overlay SYSTEM "../../params/overlay.xml">
+<!ENTITY overlay.js SYSTEM "../../params/overlay.js.xml">
+<!ENTITY overlay.logo SYSTEM "../../params/overlay.logo.xml">
+<!ENTITY plus.image SYSTEM "../../params/plus.image.xml">
+<!ENTITY prev.image SYSTEM "../../params/prev.image.xml">
+<!ENTITY script.dir SYSTEM "../../params/script.dir.xml">
+<!ENTITY show.foil.number SYSTEM "../../params/show.foil.number.xml">
+<!ENTITY showtoc.image SYSTEM "../../params/showtoc.image.xml">
+<!ENTITY slides.js SYSTEM "../../params/slides.js.xml">
+<!ENTITY text.home SYSTEM "../../params/text.home.xml">
+<!ENTITY text.next SYSTEM "../../params/text.next.xml">
+<!ENTITY text.prev SYSTEM "../../params/text.prev.xml">
+<!ENTITY text.toc SYSTEM "../../params/text.toc.xml">
+<!ENTITY text.up SYSTEM "../../params/text.up.xml">
+<!ENTITY titlefoil.html SYSTEM "../../params/titlefoil.html.xml">
+<!ENTITY toc.bg.color SYSTEM "../../params/toc.bg.color.xml">
+<!ENTITY toc.hide.show SYSTEM "../../params/toc.hide.show.xml">
+<!ENTITY toc.html SYSTEM "../../params/toc.html.xml">
+<!ENTITY toc.image SYSTEM "../../params/toc.image.xml">
+<!ENTITY toc.row.height SYSTEM "../../params/toc.row.height.xml">
+<!ENTITY toc.width SYSTEM "../../params/toc.width.xml">
+<!ENTITY ua.js SYSTEM "../../params/ua.js.xml">
+<!ENTITY up.image SYSTEM "../../params/up.image.xml">
+<!ENTITY xbCollapsibleLists.js SYSTEM "../../params/xbCollapsibleLists.js.xml">
+<!ENTITY xbDOM.js SYSTEM "../../params/xbDOM.js.xml">
+<!ENTITY xbLibrary.js SYSTEM "../../params/xbLibrary.js.xml">
+<!ENTITY xbStyle.js SYSTEM "../../params/xbStyle.js.xml">
similarity index 73%
rename from xsl/slides/param.xweb
rename to xsl/slides/html/param.xweb
index de61880bfa90cf310733d925097d9ba398278d64..d3bdaf5cf57612027458ee6c3875c8597af6be86 100644 (file)
@@ -2,11 +2,11 @@
 <!ENTITY % param.ent SYSTEM "param.ent">
 %param.ent;
 ]>
-<book xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="slides_doc">
+<book xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="slides_html_doc">
 <bookinfo>
-<title>Slides Parameter Reference</title>
+<title>Slides HTML Parameter Reference</title>
 <releaseinfo role="meta">
-$Id$
+$Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $
 </releaseinfo>
 <author>
   <surname>Walsh</surname>
@@ -18,40 +18,18 @@ $Id$
 </copyright>
 <abstract>
   <para>This is reference documentation for all user-configurable
-  parameters in the DocBook XSL Slides stylesheet (for generating
-  slide presentations). Note that the Slides stylesheet for HTML
-  output is a customization layer of the DocBook XSL HTML stylesheet,
-  while the Slides stylesheet for FO output is a customization layer
-  of the DocBook XSL FO stylesheet. Therefore, in addition to the
-  slides-specific parameters listed in this section, you can also use
-  a number of <ulink
+  parameters in the DocBook XSL Slides HTML stylesheet (for generating
+  HTML slide presentations). Note that the Slides stylesheet for HTML
+  output is a customization layer of the DocBook XSL HTML
+  stylesheet. Therefore, in addition to the slides-specific parameters
+  listed in this section, you can also use a number of <ulink
   url="http://docbook.sourceforge.net/release/xsl/current/doc/html/index.html"
-  >HTML stylesheet parameters</ulink> and <ulink
-  url="http://docbook.sourceforge.net/release/xsl/current/doc/fo/index.html"
-  >FO stylesheet parameters</ulink> to control Slides output.</para>
+  >HTML stylesheet parameters</ulink> to control Slides HTML output.</para>
 </abstract>
 </bookinfo>
 
-<reference id="fo_general_params">
-  <title>FO: General Params</title>
-&slide.title.font.family;
-&slide.font.family;
-&foil.title.master;
-&foil.title.size;
-</reference>
-
-<reference id="fo_property_sets">
-  <title>FO: Property Sets</title>
-&slides.properties;
-&foilgroup.properties;
-&foil.subtitle.properties;
-&foil.properties;
-&speakernote.properties;
-&running.foot.properties;
-</reference>
-
 <reference id="html_general_params">
-<title>HTML: General Parameters</title>
+<title>General Parameters</title>
 &keyboard.nav;
 &css.stylesheet;
 &css.stylesheet.dir;
@@ -64,7 +42,7 @@ $Id$
 </reference>
 
 <reference id="html_frame_params">
-<title>HTML: Frame Parameters</title>
+<title>Frame Parameters</title>
 &nav.separator;
 &toc.row.height;
 &toc.bg.color;
@@ -81,7 +59,7 @@ $Id$
 </reference>
 
 <reference id="html_graphic_parms">
-<title>HTML: Graphics Parameters</title>
+<title>Graphics Parameters</title>
 &graphics.dir;
 &bullet.image;
 &next.image;
@@ -103,7 +81,7 @@ $Id$
 </reference>
 
 <reference id="html_javascript_params">
-<title>HTML: JavaScript Parameters</title>
+<title>JavaScript Parameters</title>
 &script.dir;
 &ua.js;
 &xbDOM.js;
@@ -115,7 +93,7 @@ $Id$
 </reference>
 
 <reference id="html_l10n_params">
-<title>HTML: Localization Parameters</title>
+<title>Localization Parameters</title>
 &text.home;
 &text.toc;
 &text.prev;
@@ -160,7 +138,7 @@ around all these parameters.</para>
 <xsl:stylesheet exclude-result-prefixes="src" version="1.0">
 
 <!-- ********************************************************************
-     $Id$
+     $Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $
      ********************************************************************
 
      This file is part of the DocBook Slides Stylesheet distribution.
@@ -175,12 +153,7 @@ around all these parameters.</para>
 <src:fragref linkend="css.stylesheet.frag"/>
 <src:fragref linkend="css.stylesheet.dir.frag"/>
 <src:fragref linkend="dynamic.toc.frag"/>
-<src:fragref linkend="foilgroup.properties.frag"/>
 <src:fragref linkend="foilgroup.toc.frag"/>
-<src:fragref linkend="foil.properties.frag"/>
-<src:fragref linkend="foil.subtitle.properties.frag"/>
-<src:fragref linkend="foil.title.master.frag"/>
-<src:fragref linkend="foil.title.size.frag"/>
 <src:fragref linkend="graphics.dir.frag"/>
 <src:fragref linkend="hidetoc.image.frag"/>
 <src:fragref linkend="home.image.frag"/>
@@ -203,14 +176,9 @@ around all these parameters.</para>
 <src:fragref linkend="overlay.logo.frag"/>
 <src:fragref linkend="plus.image.frag"/>
 <src:fragref linkend="prev.image.frag"/>
-<src:fragref linkend="running.foot.properties.frag"/>
 <src:fragref linkend="script.dir.frag"/>
 <src:fragref linkend="show.foil.number.frag"/>
 <src:fragref linkend="showtoc.image.frag"/>
-<src:fragref linkend="slide.title.font.family.frag"/>
-<src:fragref linkend="speakernote.properties.frag"/>
-<src:fragref linkend="slide.font.family.frag"/>
-<src:fragref linkend="slides.properties.frag"/>
 <src:fragref linkend="slides.js.frag"/>
 <src:fragref linkend="text.home.frag"/>
 <src:fragref linkend="text.next.frag"/>
diff --git a/xsl/slides/param.ent b/xsl/slides/param.ent
deleted file mode 100644 (file)
index 6382f2a..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<!ENTITY active.toc SYSTEM "../params/active.toc.xml">
-<!ENTITY body.bg.color SYSTEM "../params/body.bg.color.xml">
-<!ENTITY bullet.image SYSTEM "../params/bullet.image.xml">
-<!ENTITY css.stylesheet SYSTEM "../params/css.stylesheet.xml">
-<!ENTITY css.stylesheet.dir SYSTEM "../params/css.stylesheet.dir.xml">
-<!ENTITY dynamic.toc SYSTEM "../params/dynamic.toc.xml">
-<!ENTITY foil.properties SYSTEM "../params/foil.properties.xml">
-<!ENTITY foil.subtitle.properties SYSTEM "../params/foil.subtitle.properties.xml">
-<!ENTITY foil.title.master SYSTEM "../params/foil.title.master.xml">
-<!ENTITY foil.title.size SYSTEM "../params/foil.title.size.xml">
-<!ENTITY foilgroup.properties SYSTEM "../params/foilgroup.properties.xml">
-<!ENTITY foilgroup.toc SYSTEM "../params/foilgroup.toc.xml">
-<!ENTITY graphics.dir SYSTEM "../params/graphics.dir.xml">
-<!ENTITY hidetoc.image SYSTEM "../params/hidetoc.image.xml">
-<!ENTITY home.image SYSTEM "../params/home.image.xml">
-<!ENTITY keyboard.nav SYSTEM "../params/keyboard.nav.xml">
-<!ENTITY minus.image SYSTEM "../params/minus.image.xml">
-<!ENTITY multiframe SYSTEM "../params/multiframe.xml">
-<!ENTITY multiframe.bottom.bgcolor SYSTEM "../params/multiframe.bottom.bgcolor.xml">
-<!ENTITY multiframe.navigation.height SYSTEM "../params/multiframe.navigation.height.xml">
-<!ENTITY multiframe.top.bgcolor SYSTEM "../params/multiframe.top.bgcolor.xml">
-<!ENTITY nav.separator SYSTEM "../params/nav.separator.xml">
-<!ENTITY next.image SYSTEM "../params/next.image.xml">
-<!ENTITY no.home.image SYSTEM "../params/no.home.image.xml">
-<!ENTITY no.next.image SYSTEM "../params/no.next.image.xml">
-<!ENTITY no.prev.image SYSTEM "../params/no.prev.image.xml">
-<!ENTITY no.toc.image SYSTEM "../params/no.toc.image.xml">
-<!ENTITY no.up.image SYSTEM "../params/no.up.image.xml">
-<!ENTITY output.indent SYSTEM "../params/output.indent.xml">
-<!ENTITY overlay SYSTEM "../params/overlay.xml">
-<!ENTITY overlay.js SYSTEM "../params/overlay.js.xml">
-<!ENTITY overlay.logo SYSTEM "../params/overlay.logo.xml">
-<!ENTITY plus.image SYSTEM "../params/plus.image.xml">
-<!ENTITY prev.image SYSTEM "../params/prev.image.xml">
-<!ENTITY running.foot.properties SYSTEM "../params/running.foot.properties.xml">
-<!ENTITY script.dir SYSTEM "../params/script.dir.xml">
-<!ENTITY show.foil.number SYSTEM "../params/show.foil.number.xml">
-<!ENTITY showtoc.image SYSTEM "../params/showtoc.image.xml">
-<!ENTITY slide.font.family SYSTEM "../params/slide.font.family.xml">
-<!ENTITY slide.title.font.family SYSTEM "../params/slide.title.font.family.xml">
-<!ENTITY slides.js SYSTEM "../params/slides.js.xml">
-<!ENTITY slides.properties SYSTEM "../params/slides.properties.xml">
-<!ENTITY speakernote.properties SYSTEM "../params/speakernote.properties.xml">
-<!ENTITY text.home SYSTEM "../params/text.home.xml">
-<!ENTITY text.next SYSTEM "../params/text.next.xml">
-<!ENTITY text.prev SYSTEM "../params/text.prev.xml">
-<!ENTITY text.toc SYSTEM "../params/text.toc.xml">
-<!ENTITY text.up SYSTEM "../params/text.up.xml">
-<!ENTITY titlefoil.html SYSTEM "../params/titlefoil.html.xml">
-<!ENTITY toc.bg.color SYSTEM "../params/toc.bg.color.xml">
-<!ENTITY toc.hide.show SYSTEM "../params/toc.hide.show.xml">
-<!ENTITY toc.html SYSTEM "../params/toc.html.xml">
-<!ENTITY toc.image SYSTEM "../params/toc.image.xml">
-<!ENTITY toc.row.height SYSTEM "../params/toc.row.height.xml">
-<!ENTITY toc.width SYSTEM "../params/toc.width.xml">
-<!ENTITY ua.js SYSTEM "../params/ua.js.xml">
-<!ENTITY up.image SYSTEM "../params/up.image.xml">
-<!ENTITY xbCollapsibleLists.js SYSTEM "../params/xbCollapsibleLists.js.xml">
-<!ENTITY xbDOM.js SYSTEM "../params/xbDOM.js.xml">
-<!ENTITY xbLibrary.js SYSTEM "../params/xbLibrary.js.xml">
-<!ENTITY xbStyle.js SYSTEM "../params/xbStyle.js.xml">
index 1f0836d6acb0acf18be81c48b95b73eff31065f8..dc6aa4c06cd648c973ea94789f1350d2ee5cf529 100644 (file)
@@ -18,7 +18,7 @@
   <!-- ==================================================================== -->
 
   <!-- * This stylesheet expects itself as input  -->
-  <xsl:param name="param.dirs">html fo manpages roundtrip</xsl:param>
+  <xsl:param name="param.dirs">html fo manpages roundtrip slides/fo slides/html website</xsl:param>
 
   <xsl:template match="/">
     <xslt:stylesheet version="1.0"> 
     <!-- * param.xsl file, then read through that param.xsl file -->
     <!-- * to collect parameter names. -->
     <xsl:param name="dir"/>
+    <xsl:param name="adjusted-dir">
+      <xsl:call-template name="make.adjusted-dir">
+        <xsl:with-param name="dir" select="$dir"/>
+      </xsl:call-template>
+    </xsl:param>
     <xsl:param name="remaining.dirs"/>
     <!-- * When the value of $dir reaches empty, then we have depleted -->
     <!-- * the list of directories and it's time to stop recursing -->
     <xsl:if test="not($dir = '')">
       <xsl:variable name="param.xsl" select="concat('../../../', $dir, '/', 'param.xsl')"/>
-      <xslt:variable name="xsl-{$dir}-parameters-list">
+      <xslt:variable name="xsl-{$adjusted-dir}-parameters-list">
         <simplelist role="param">
           <xsl:for-each select="document($param.xsl)//*[local-name() = 'param']">
             <xsl:sort select="@name"/>
@@ -91,8 +96,8 @@
           </xsl:for-each>
         </simplelist>
       </xslt:variable>
-      <xslt:variable name="xsl-{$dir}-parameters"
-                     select="exsl:node-set($xsl-{$dir}-parameters-list)/simplelist"/>
+      <xslt:variable name="xsl-{$adjusted-dir}-parameters"
+                     select="exsl:node-set($xsl-{$adjusted-dir}-parameters-list)/simplelist"/>
       <xsl:call-template name="make.param.list">
         <!-- * pop the name of the next directory off the list of -->
         <!-- * remaining directories -->
 
   <xsl:template name="make.is.parameter.template">
     <xsl:param name="dir"/>
+    <xsl:param name="adjusted-dir">
+      <xsl:call-template name="make.adjusted-dir">
+        <xsl:with-param name="dir" select="$dir"/>
+      </xsl:call-template>
+    </xsl:param>
     <xsl:param name="remaining.dirs"/>
     <xsl:if test="not($dir = '')">
       <!-- * for each directory, construct a template. -->
-      <xslt:template name="is-{$dir}-parameter">
+      <xslt:template name="is-{$adjusted-dir}-parameter">
         <xslt:param name="param" select="''"/>
         <xslt:choose>
-          <xslt:when test="$xsl-{$dir}-parameters/member[. = $param]">1</xslt:when>
+          <xslt:when test="$xsl-{$adjusted-dir}-parameters/member[. = $param]">1</xslt:when>
           <xslt:otherwise>0</xslt:otherwise>
         </xslt:choose>
       </xslt:template>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
+
+  <xsl:template name="make.adjusted-dir">
+    <xsl:param name="dir"/>
+    <xsl:param name="basedir">
+      <xsl:value-of select="substring-before($dir, '/')"/>
+    </xsl:param>
+    <xsl:param name="subdir">
+      <xsl:value-of select="substring-after($dir, '/')"/>
+    </xsl:param>
+      <xsl:choose>
+        <xsl:when test="contains($dir,'/')">
+          <xsl:value-of select="concat($basedir,'-',$subdir)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$dir"/>
+        </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
index 82a2245abca6054e4a04a00fba4ac91758881ce7..b1fa8f05eaf4da8e1ccc3ba46121e610602e8f1b 100644 (file)
 <xsl:param name="roundtrip-baseuri"
            select="'http://docbook.sourceforge.net/release/xsl/current/doc/roundtrip/'"/>
 
+<xsl:param name="slides-html-baseuri"
+           select="'http://docbook.sourceforge.net/release/xsl/current/doc/slides-html/'"/>
+
+<xsl:param name="slides-fo-baseuri"
+           select="'http://docbook.sourceforge.net/release/xsl/current/doc/slides-fo/'"/>
+
+<xsl:param name="website-baseuri"
+           select="'http://docbook.sourceforge.net/release/xsl/current/doc/website/'"/>
+
 <xsl:template match="parameter">
   <xsl:variable name="markup">
     <xsl:apply-imports/>
     </xsl:call-template>
   </xsl:variable>
 
+  <xsl:variable name="isslideshtml">
+    <xsl:call-template name="is-slides-html-parameter">
+      <xsl:with-param name="param" select="normalize-space(.)"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="isslidesfo">
+    <xsl:call-template name="is-slides-fo-parameter">
+      <xsl:with-param name="param" select="normalize-space(.)"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="iswebsite">
+    <xsl:call-template name="is-website-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">
         <xsl:copy-of select="$markup"/>
       </a>
     </xsl:when>
+    <xsl:when test="$isslideshtml != 0">
+      <a href="{concat($slides-html-baseuri, normalize-space(.))}.html">
+        <xsl:copy-of select="$markup"/>
+      </a>
+    </xsl:when>
+    <xsl:when test="$isslidesfo != 0">
+      <a href="{concat($slides-fo-baseuri, normalize-space(.))}.html">
+        <xsl:copy-of select="$markup"/>
+      </a>
+    </xsl:when>
+    <xsl:when test="$iswebsite != 0">
+      <a href="{concat($website-baseuri, normalize-space(.))}.html">
+        <xsl:copy-of select="$markup"/>
+      </a>
+    </xsl:when>
     <xsl:otherwise>
       <xsl:copy-of select="$markup"/>
     </xsl:otherwise>