Inclusion of highlighting code was simplified. Only one import is now necessary.

diff --git a/xsl/fo/highlight.xsl b/xsl/fo/highlight.xsl
index ae9c71fda642fd2336ea6dd4d68b71a364daa5a2..2ed68d43d3c9b122e5c4ddd30c4933302c9b5ccf 100644 (file)
--- a/xsl/fo/highlight.xsl
+++ b/xsl/fo/highlight.xsl
@@ -15,6 +15,8 @@
 \r
      ******************************************************************** -->\r
 \r
+<xsl:import href="../highlighting/common.xsl"/>\r
+\r
 <xsl:template match='xslthl:keyword' mode="xslthl">\r
   <fo:inline font-weight="bold"><xsl:apply-templates mode="xslthl"/></fo:inline>\r
 </xsl:template>\r

diff --git a/xsl/highlighting/README b/xsl/highlighting/README
index 5291d1c8fefbceba7fb0250e62087b88aa55e0fb..0b31d32f4653814c4bcef3217a02e398f6520106 100644 (file)
--- a/xsl/highlighting/README
+++ b/xsl/highlighting/README
@@ -2,8 +2,7 @@ To use the syntax higlighting extension with DocBook-XSL 1.74.3+, you must:
 1. Use a processor that works with the extension: Saxon 6 or Xalan-J.
 2. Add the latest version of xslthl-2.X.X.jar to your classpath.
 3. Set the highlight.source parameter to 1.
-4. Import into your customization two stylesheet modules, 
-   highlighting/common.xsl and one of the following:
+4. Import into your customization one of the following stylesheet module:
   * html/highlight.xsl
   * xhtml/highlight.xsl
   * xhtml-1_1/highlight.xsl

diff --git a/xsl/html/highlight.xsl b/xsl/html/highlight.xsl
index 082750611f69f84cdf314abf3cfa4fa3e972b147..6c9c34223b96dd8fb9d4d32194795a74f1ff72b6 100644 (file)
--- a/xsl/html/highlight.xsl
+++ b/xsl/html/highlight.xsl
@@ -14,6 +14,8 @@
 \r
      ******************************************************************** -->\r
 \r
+<xsl:import href="../highlighting/common.xsl"/>\r
+\r
 <xsl:template match='xslthl:keyword' mode="xslthl">\r
   <b class="hl-keyword"><xsl:apply-templates mode="xslthl"/></b>\r
 </xsl:template>\r