Slides: Change html to xhtml passim.

diff --git a/xsl/Makefile b/xsl/Makefile
index bea99eb0463837d7795020d33e08d38aeb8a56ed..7ea8f04e499ac3fc93aac164f6996500f0c23004 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -63,11 +63,11 @@ DISTRIB_PACKAGES = doc
 URILIST = \
 .\ http://docbook.sourceforge.net/release/xsl/current/
 
-DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website extensions webhelp xhtml5 epub3
+DIRS=common lib html fo manpages htmlhelp javahelp eclipse roundtrip slides website extensions xhtml webhelp xhtml5 epub3
 
 .PHONY: distrib clean doc docsrc xhtml
 
-all: base xhtml
+all: base
 # If you're annoyed about getting the reminder that it's possible
 # to use xsltproc to build, delete the following conditional from
 # this makefile.

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 78d04f65b1d84a303ee8d220d51540af007d0877..cdd63cc8acf7dea46ab2b5d2e0febe44d3811bf8 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -22,7 +22,7 @@ GZIPFLAGS=
 
 HTMLMANIFEST=HTML.manifest
 
-PARAM_DIRS=html fo manpages roundtrip slides/fo slides/html website
+PARAM_DIRS=html fo manpages roundtrip slides/fo slides/xhtml website
 PI_DIRS=html fo common
 
 PARAM_XML_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xml)

diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml
index 58f932d2600e11036fe64f4af37aa4901cabeaa0..36590dc815a617546a7d3acd74078dd7e3ef28d6 100644 (file)
--- a/xsl/docsrc/reference.xml
+++ b/xsl/docsrc/reference.xml
@@ -134,7 +134,7 @@
             output.</para>
         </note>
       </partintro>
-      <xi:include href="../slides/html/param.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../slides/xhtml/param.xml" xpointer="xpointer(/book/reference)" />
       <xi:include href="../slides/fo/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="website">

diff --git a/xsl/slides/Makefile b/xsl/slides/Makefile
index ae12fb10ac9483f7d9b5817ee729a3371bbaca20..7c60a3849c8265ce58d6a141d44812fcbef3db99 100644 (file)
--- a/xsl/slides/Makefile
+++ b/xsl/slides/Makefile
@@ -11,3 +11,4 @@ clean:
        for i in $(DIRS); do \
          echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
        done
+       rm xhtml/params.xsl

diff --git a/xsl/tools/xsl/build/make-xsl-params.xsl b/xsl/tools/xsl/build/make-xsl-params.xsl
index 4440226757a1ea246e2dceacc5028ccead460f58..f829a08e46a40fa5c3033038f3908c6909d7aad6 100644 (file)
--- a/xsl/tools/xsl/build/make-xsl-params.xsl
+++ b/xsl/tools/xsl/build/make-xsl-params.xsl
@@ -18,7 +18,7 @@
   <!-- ==================================================================== -->
 
   <!-- * This stylesheet expects itself as input  -->
-  <xsl:param name="param.dirs">html fo manpages roundtrip slides/fo slides/html website</xsl:param>
+  <xsl:param name="param.dirs">html fo manpages roundtrip slides/fo slides/xhtml website</xsl:param>
 
   <xsl:template match="/">
     <xslt:stylesheet version="1.0"> 

diff --git a/xsl/tools/xsl/build/xsl-param-link.xsl b/xsl/tools/xsl/build/xsl-param-link.xsl
index 581e6913058388b1aa696d16e7578327706e0dc8..5c1b8a5dcef35aee2ee6ca1ea5b420700a0e1d4c 100644 (file)
--- a/xsl/tools/xsl/build/xsl-param-link.xsl
+++ b/xsl/tools/xsl/build/xsl-param-link.xsl
@@ -13,7 +13,7 @@
   <xsl:param name="fo-baseuri" select="concat($doc-baseuri,'fo/')"/>
   <xsl:param name="manpages-baseuri" select="concat($doc-baseuri,'manpages/')"/>
   <xsl:param name="roundtrip-baseuri" select="concat($doc-baseuri,'roundtrip/')"/>
-  <xsl:param name="slides-html-baseuri" select="concat($doc-baseuri,'slides/')"/>
+  <xsl:param name="slides-xhtml-baseuri" select="concat($doc-baseuri,'slides/')"/>
   <xsl:param name="slides-fo-baseuri" select="concat($doc-baseuri,'slides/')"/>
   <xsl:param name="website-baseuri" select="concat($doc-baseuri,'website/')"/>
 
@@ -44,7 +44,7 @@
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="isslideshtml">
-      <xsl:call-template name="is-slides-html-parameter">
+      <xsl:call-template name="is-slides-xhtml-parameter">
         <xsl:with-param name="param" select="normalize-space(.)"/>
       </xsl:call-template>
     </xsl:variable>
@@ -80,7 +80,7 @@
         </a>
       </xsl:when>
       <xsl:when test="$isslideshtml != 0">
-        <a href="{concat($slides-html-baseuri, normalize-space(.))}.html">
+        <a href="{concat($slides-xhtml-baseuri, normalize-space(.))}.html">
           <xsl:copy-of select="$markup"/>
         </a>
       </xsl:when>