diff options
| -rw-r--r-- | share/xsl/freebsd-fo.xsl | 7 | ||||
| -rw-r--r-- | share/xsl/freebsd-xhtml-chunk.xsl (renamed from share/xsl/default.xsl) | 6 | ||||
| -rw-r--r-- | share/xsl/freebsd-xhtml-common.xsl (renamed from share/xsl/freebsd-html.xsl) | 11 | ||||
| -rw-r--r-- | share/xsl/freebsd-xhtml.xsl (renamed from share/xsl/freebsd-html-chunk.xsl) | 7 | ||||
| -rw-r--r-- | share/xsl/freebsd.xsl | 19 |
5 files changed, 18 insertions, 32 deletions
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl index 725ed0a268..be0987069b 100644 --- a/share/xsl/freebsd-fo.xsl +++ b/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"/> diff --git a/share/xsl/default.xsl b/share/xsl/freebsd-xhtml-chunk.xsl index 29122aadc4..635c922d13 100644 --- a/share/xsl/default.xsl +++ b/share/xsl/freebsd-xhtml-chunk.xsl @@ -8,9 +8,9 @@ exclude-result-prefixes="#default"> <!-- Pull in the base stylesheets --> - <xsl:import href="freebsd.xsl"/> - - <!-- Redefine variables, and replace templates as necessary here --> + <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/> + <!-- Pull in common XHTML customizations --> + <xsl:include href="freebsd-xhtml-common.xsl"/> </xsl:stylesheet> diff --git a/share/xsl/freebsd-html.xsl b/share/xsl/freebsd-xhtml-common.xsl index f493e29fb4..ded9e0f2ab 100644 --- a/share/xsl/freebsd-html.xsl +++ b/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 <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.<br/> For questions about this documentation, e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</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> diff --git a/share/xsl/freebsd-html-chunk.xsl b/share/xsl/freebsd-xhtml.xsl index b274add9d5..bcb0c26738 100644 --- a/share/xsl/freebsd-html-chunk.xsl +++ b/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 --> - - <xsl:include href="freebsd-common.xsl"/> + <!-- Pull in common XHTML customizations --> + <xsl:include href="freebsd-xhtml-common.xsl"/> </xsl:stylesheet> diff --git a/share/xsl/freebsd.xsl b/share/xsl/freebsd.xsl deleted file mode 100644 index 0d0e09fa1c..0000000000 --- a/share/xsl/freebsd.xsl +++ /dev/null @@ -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> |