- Reorganize stylesheets for easier customization

svn path=/projects/xml-tools/; revision=40730

share/xsl/freebsd-fo.xsl

@@ -11,6 +11,9 @@
   <!-- Pull in the base stylesheets -->
   <xsl:import href="/usr/local/share/xsl/docbook/fo/docbook.xsl"/>
 
+  <!-- Include the common customizations -->
+  <xsl:include href="freebsd-common.xsl"/>
+
   <!-- Redefine variables, and replace templates as necessary here -->
 
   <xsl:param name="freebsd.output.print"
@@ -22,10 +25,6 @@
   <xsl:param name="freebsd.output.print.twoside"
              select="'0'"/>
 
-  <!-- Include the common stylesheets -->
-
-  <xsl:include href="freebsd-common.xsl"/>
-
   <!-- FO specific customisation goes here -->
 
   <xsl:param name="use.extensions" select="1"/>

share/xsl/freebsd-xhtml-chunk.xsl

@@ -8,9 +8,9 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="freebsd.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/>
-
-  <!-- Redefine variables, and replace templates as necessary here -->
 
+  <!-- Pull in common XHTML customizations -->
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
 </xsl:stylesheet>
 

share/xsl/freebsd-xhtml-common.xsl

@@ -8,7 +8,11 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/html/docbook.xsl"/>
+  <!-- XXX hardcoded path.  Very bad.  Should be turned in to a paramater -->
+  <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
+
+  <!-- Include the common customizations -->
+  <xsl:include href="freebsd-common.xsl"/>
 
   <!-- Redefine variables, and replace templates as necessary here -->
   <xsl:param name="freebsd.output.html" select="'0'"/>
@@ -31,5 +35,8 @@
     contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
     For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
   </xsl:template>
-</xsl:stylesheet>
 
+  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
+    <xsl:call-template name="inline.monoseq"/>
+  </xsl:template>
+</xsl:stylesheet>

share/xsl/freebsd-xhtml.xsl

@@ -8,10 +8,9 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/html/chunk.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/docbook.xsl"/>
 
-  <!-- Redefine variables, and replace templates as necessary here -->
+  <!-- Pull in common XHTML customizations -->
-
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
-  <xsl:include href="freebsd-common.xsl"/>
 </xsl:stylesheet>
 

share/xsl/freebsd.xsl

@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- $FreeBSD$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                exclude-result-prefixes="#default">
-
-  <!-- Pull in the base stylesheets -->
-  <!-- XXX hardcoded path.  Very bad.  Should be turned in to a paramater -->
-  <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
-
-  <!-- Redefine variables, and replace templates as necessary here -->
-  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
-    <xsl:call-template name="inline.monoseq"/>
-  </xsl:template>
-
-</xsl:stylesheet>