Add support for html.script param to insert Javascript references.

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index d185e19e1b9b68e1beffea441042051d4425a692..f663cf37990f68c63a3391248034b109d49f9274 100644 (file)
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -148,6 +148,12 @@
     </xsl:call-template>
   </xsl:if>
 
+  <xsl:if test="$html.script != ''">
+    <xsl:call-template name="output.html.scripts">
+      <xsl:with-param name="scripts" select="normalize-space($html.script)"/>
+    </xsl:call-template>
+  </xsl:if>
+
   <xsl:if test="$link.mailto.url != ''">
     <link rev="made"
           href="{$link.mailto.url}"/>
@@ -228,6 +234,29 @@ body { background-image: url('</xsl:text>
   </xsl:choose>
 </xsl:template>
 
+<xsl:template name="output.html.scripts">
+  <xsl:param name="scripts" select="''"/>
+
+  <xsl:choose>
+    <xsl:when test="contains($scripts, ' ')">
+      <xsl:variable name="script.filename" select="substring-before($scripts, ' ')"/>
+
+      <xsl:call-template name="make.script.link">
+        <xsl:with-param name="script.filename" select="$script.filename"/>
+      </xsl:call-template>
+
+      <xsl:call-template name="output.html.scripts">
+        <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$scripts != ''">
+      <xsl:call-template name="make.script.link">
+        <xsl:with-param name="script.filename" select="$scripts"/>
+      </xsl:call-template>
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
 <!-- ============================================================ -->
 
 <xsl:template match="*" mode="head.keywords.content">

diff --git a/xsl/html/html.xsl b/xsl/html/html.xsl
index 541424adec562a8efb0e5382fbd8659aa41d0423..02626ad5476b3e3bafb6341e8bd53dd31c556f98 100644 (file)
--- a/xsl/html/html.xsl
+++ b/xsl/html/html.xsl
@@ -475,7 +475,54 @@
 <xsl:template name="make.css.link">
   <xsl:param name="css.filename" select="''"/>
 
-  <xsl:variable name="href.to.uri" select="$css.filename"/>
+  <xsl:variable name="href">
+    <xsl:call-template name="relative.path.link">
+      <xsl:with-param name="target.pathname" select="$css.filename"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="string-length($css.filename) != 0">
+    <link rel="stylesheet" 
+          type="text/css"
+          href="{$href}"/>
+  </xsl:if>
+</xsl:template>
+
+<!-- And the same applies to script links -->
+<xsl:template name="make.script.link">
+  <xsl:param name="script.filename" select="''"/>
+
+  <xsl:variable name="src">
+    <xsl:call-template name="relative.path.link">
+      <xsl:with-param name="target.pathname" select="$script.filename"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="string-length($script.filename) != 0">
+    <script>
+      <xsl:attribute name="src">
+        <xsl:value-of select="$src"/>
+      </xsl:attribute>
+      <xsl:attribute name="type">
+        <xsl:value-of select="$html.script.type"/>
+      </xsl:attribute>
+      <xsl:call-template name="other.script.attributes">
+        <xsl:with-param name="script.filename" select="$script.filename"/>
+      </xsl:call-template>
+    </script>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="other.script.attributes">
+  <xsl:param name="script.filename"/>
+  <!-- Placeholder template to allow customization to 
+       insert additional script element attributes if needed -->
+</xsl:template>
+
+<xsl:template name="relative.path.link">
+  <xsl:param name="target.pathname"/>
+  
+  <xsl:variable name="href.to.uri" select="$target.pathname"/>
 
   <xsl:variable name="href.from.uri">
     <xsl:call-template name="href.target.uri">
@@ -511,11 +558,7 @@
     <xsl:value-of select="$href.to"/>
   </xsl:variable>
 
-  <xsl:if test="string-length($css.filename) != 0">
-    <link rel="stylesheet" 
-          type="text/css"
-          href="{$href}"/>
-  </xsl:if>
+  <xsl:value-of select="$href"/>
 </xsl:template>
 
 <!-- ==================================================================== -->