Make sure html.xsl is used when building HTML version.

diff --git a/Makefile b/Makefile
index cdbc9bdc4d50e569ef061efdf7615b3aedfd0f7e..8c146f3a88734183247e6cd335479db80259db90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,10 @@ html: freeculture.html freeculture.nb.html
        fop -c data/fop-params.xconf -fo myfile.fo -pdf $@
 
 %.html: %.xml $(IMAGES)
        fop -c data/fop-params.xconf -fo myfile.fo -pdf $@
 
 %.html: %.xml $(IMAGES)

-       xmlto html-nochunks $<
+       xmlto \
+         -x data/stylesheet-html.xsl \
+         html-nochunks \
+         $<

 
 %.txt: %.xml $(IMAGES)
        xmlto txt $<
 
 %.txt: %.xml $(IMAGES)
        xmlto txt $<

diff --git a/data/html.xsl b/data/html.xsl
index 3ab053463c3e039a243acdc8b560a1f5903e7f90..43cd579974362bb89bf20534236039e4397dfcca 100644 (file)
--- a/data/html.xsl
+++ b/data/html.xsl
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:import
-    href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+

   <xsl:param name="chunk.section.depth">0</xsl:param>
   <xsl:param name="section.autolabel">1</xsl:param>
   <xsl:param name="section.label.includes.component.label">1</xsl:param>
   <xsl:param name="chunk.section.depth">0</xsl:param>
   <xsl:param name="section.autolabel">1</xsl:param>
   <xsl:param name="section.label.includes.component.label">1</xsl:param>

diff --git a/data/stylesheet-fo.xsl b/data/stylesheet-fo.xsl
index dcfd54fb827411bc1331418edb2f23833fe1d938..7f35945392dd7070bb50825f0b48da8283a2b067 100644 (file)
--- a/data/stylesheet-fo.xsl
+++ b/data/stylesheet-fo.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?> 
 <?xml version='1.0'?> 

-<xsl:stylesheet  
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  version="1.0"> 
-  <xsl:import href="file:///usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl"/> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>

 
   <xsl:include href="user_param.xsl" />
   <xsl:include href="pdf.xsl" />
 
   <xsl:include href="user_param.xsl" />
   <xsl:include href="pdf.xsl" />

diff --git a/data/stylesheet-html.xsl b/data/stylesheet-html.xsl
new file mode 100644 (file)
index 0000000..af173af
--- /dev/null
+++ b/data/stylesheet-html.xsl
@@ -0,0 +1,8 @@
+<?xml version='1.0'?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> 
+
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+
+  <xsl:include href="user_param.xsl" />
+  <xsl:include href="html.xsl" />
+</xsl:stylesheet>