Move stylesheet.result.type out of param and put it explicitly in each stylesheet...

diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index 2064b9b7351e1a2d5f4e9e3fce1dee1204950826..c5da75bf6892c5293046381628c1f4194d7e8931 100644 (file)
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -68,6 +68,8 @@
 <xsl:include href="passivetex.xsl"/>
 <xsl:include href="xep.xsl"/>
 
+<xsl:param name="stylesheet.result.type" select="'fo'"/>
+
 <!-- ==================================================================== -->
 
 <xsl:key name="id" match="*" use="@id"/>

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index 2bd5216d41f750cca41f150baee51befab1240fe..9938655d32d4a4292e74fb8a979aafff0aac49b8 100644 (file)
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -63,6 +63,8 @@
 <xsl:include href="chunker.xsl"/>
 <xsl:include href="html-rtf.xsl"/>
 
+<xsl:param name="stylesheet.result.type" select="'html'"/>
+
 <!-- ==================================================================== -->
 
 <xsl:key name="id" match="*" use="@id"/>

diff --git a/xsl/params/stylesheet.result.type.xml b/xsl/params/stylesheet.result.type.xml
deleted file mode 100644 (file)
index e5cefae..0000000
--- a/xsl/params/stylesheet.result.type.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<refentry id="stylesheet.result.type">
-<refmeta>
-<refentrytitle>stylesheet.result.type</refentrytitle>
-<refmiscinfo role="type">list</refmiscinfo>
-<refmiscinfo role="value">html</refmiscinfo>
-<refmiscinfo role="value">fo</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>stylesheet.result.type</refname>
-<refpurpose>Identifies the output format of this stylesheet</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<src:fragment id='stylesheet.result.type.frag'><xsl:param name="stylesheet.result.type" select="'html'"/></src:fragment>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-
-<para>The Saxon extension functions need to know if the output format
-is HTML ('html') or XSL Formatting Objects ('fo'). This variable answers
-that question. Valid settings are 'html' or 'fo'.</para>
-
-</refsect1>
-</refentry>

diff --git a/xsl/xhtml/html2xhtml.xsl b/xsl/xhtml/html2xhtml.xsl
index 80ba5cbf9530cf9bea8cfed57bef0cf119babcdc..10be14bdbe8b391a50705c7a925ac0033e5c5f12 100644 (file)
--- a/xsl/xhtml/html2xhtml.xsl
+++ b/xsl/xhtml/html2xhtml.xsl
@@ -25,6 +25,13 @@
   </xsl:copy>
 </xsl:template>
 
+<xsl:template match="xsl:param[@name='stylesheet.result.type']">
+  <xsl:copy>
+    <xsl:copy-of select="@*"/>
+    <xsl:attribute name="select">'xhtml'</xsl:attribute>
+  </xsl:copy>
+</xsl:template>
+
 <xsl:template match="xsl:param[@name='make.valid.html']">
   <xsl:copy>
     <xsl:copy-of select="@*"/>