From 00aa8e0bcaecd25587bc0a7fa01af93032b112d1 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 21 Jan 2012 21:43:17 +0000
Subject: [PATCH] Quickbook: Merge to quickbook-dev

[SVN r76630]
---
 xsl/docbook-layout.xsl | 15 +++++++++++++++
 xsl/html-single.xsl    | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/xsl/docbook-layout.xsl b/xsl/docbook-layout.xsl
index dfd5afd..8d3a8d7 100644
--- a/xsl/docbook-layout.xsl
+++ b/xsl/docbook-layout.xsl
@@ -208,4 +208,19 @@
       <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
     </xsl:apply-templates>
   </xsl:template>
+  
+  
+  <!--  Adds the section ID as a class to the section DIV so that we
+        can style sections individually. -->
+  <xsl:template match="section" mode="class.value">
+    <xsl:param name="class" select="local-name(.)"/>
+    <xsl:param name="node" select="."/>
+    <xsl:variable name="id">
+      <xsl:call-template name="object.id">
+        <xsl:with-param name="object" select="$node"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:value-of select="concat($class,' ',translate($id, '.', '_'))"/>
+  </xsl:template>
+  
 </xsl:stylesheet>
diff --git a/xsl/html-single.xsl b/xsl/html-single.xsl
index d453a84..98ed2b0 100644
--- a/xsl/html-single.xsl
+++ b/xsl/html-single.xsl
@@ -13,8 +13,21 @@
   <!-- Import the HTML stylesheet -->
   <xsl:import 
     href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-  <xsl:import href="admon.xsl"/>
-  <xsl:import href="relative-href.xsl"/>
+  <xsl:import
+    href="http://docbook.sourceforge.net/release/xsl/current/html/math.xsl"/>
+
+  <!-- Override the encoding to the more universally usefull utf8. -->
+  <xsl:output method="html" encoding="UTF-8" indent="no"/>
+  
+  <!-- We have to make sure that our templates override all
+       docbook templates.  Therefore, we include our own templates
+       instead of importing them.  In order for this to work,
+       the stylesheets included here cannot also include each other -->
+  <xsl:include href="docbook-layout.xsl"/>
+  <xsl:include href="admon.xsl"/>
+  <xsl:include href="xref.xsl"/>
+  <xsl:include href="relative-href.xsl"/>
+  <xsl:include href="callout.xsl"/>
 
   <xsl:param name="admon.style"/>
   <xsl:param name="admon.graphics">1</xsl:param>