From ac89337fe4987b2ad9ecce3c4f407247c1c47787 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Mon, 6 Aug 2012 11:57:12 +0200
Subject: [PATCH] Make sure html.xsl is used when building HTML version.

---
 Makefile                 | 5 ++++-
 data/html.xsl            | 6 ++----
 data/stylesheet-fo.xsl   | 6 +++---
 data/stylesheet-html.xsl | 8 ++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 data/stylesheet-html.xsl

diff --git a/Makefile b/Makefile
index cdbc9bd..8c146f3 100644
--- 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)
-	xmlto html-nochunks $<
+	xmlto \
+	  -x data/stylesheet-html.xsl \
+	  html-nochunks \
+	  $<
 
 %.txt: %.xml $(IMAGES)
 	xmlto txt $<
diff --git a/data/html.xsl b/data/html.xsl
index 3ab0534..43cd579 100644
--- a/data/html.xsl
+++ b/data/html.xsl
@@ -1,8 +1,6 @@
 <?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>
diff --git a/data/stylesheet-fo.xsl b/data/stylesheet-fo.xsl
index dcfd54f..7f35945 100644
--- a/data/stylesheet-fo.xsl
+++ b/data/stylesheet-fo.xsl
@@ -1,7 +1,7 @@
 <?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" />
diff --git a/data/stylesheet-html.xsl b/data/stylesheet-html.xsl
new file mode 100644
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> 
-- 
2.51.0