From: David Cramer <david@thingbag.net>
Date: Sat, 20 Oct 2012 23:12:33 +0000 (+0000)
Subject: Slides: Change html to xhtml passim.
X-Git-Tag: release/1.79.1~6^2~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00b655d6c515a2f7008a048803805e744219d0ef;p=docbook-dsssl

Slides: Change html to xhtml passim.
---

diff --git a/xsl/Makefile b/xsl/Makefile
index bea99eb04..7ea8f04e4 100644
--- 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 78d04f65b..cdd63cc8a 100644
--- 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 58f932d26..36590dc81 100644
--- 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 ae12fb10a..7c60a3849 100644
--- 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 444022675..f829a08e4 100644
--- 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 581e69130..5c1b8a5dc 100644
--- 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>