From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 8 Feb 2012 06:03:39 +0000 (+0000)
Subject: Turn off body.attributes since HTML5 does not like them.
X-Git-Tag: release/1.79.1~6^2~540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa8e14d5bf6e9011c269977595031fa18eec73b0;p=docbook-dsssl

Turn off body.attributes since HTML5 does not like them.
Fix qanda entries in TOC to use <li> instead of <dd>.
---

diff --git a/xsl/xhtml5/html5-element-mods.xsl b/xsl/xhtml5/html5-element-mods.xsl
index 0c0813284..f40edc13d 100644
--- a/xsl/xhtml5/html5-element-mods.xsl
+++ b/xsl/xhtml5/html5-element-mods.xsl
@@ -917,7 +917,7 @@
   </section>
 </xsl:template>
 
-<!-- HTML5: each dt must have a dd -->
+<!-- HTML5: uses <ul> instead of <dl> for TOC -->
 <xsl:template match="question" mode="qandatoc.mode">
   <xsl:variable name="firstch">
     <!-- Use a titleabbrev or title if available -->
@@ -957,28 +957,26 @@
     </xsl:choose>
   </xsl:variable>
 
-  <dt>
-    <xsl:apply-templates select="." mode="label.markup"/>
-    <xsl:if test="contains($deflabel,'number') and not(label)">
-      <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-    </xsl:if>
-    <xsl:text> </xsl:text>
+  <li>
     <a>
       <xsl:attribute name="href">
         <xsl:call-template name="href.target">
           <xsl:with-param name="object" select=".."/>
         </xsl:call-template>
       </xsl:attribute>
+      <xsl:apply-templates select="." mode="label.markup"/>
+      <xsl:if test="contains($deflabel,'number') and not(label)">
+        <xsl:apply-templates select="." mode="intralabel.punctuation"/>
+      </xsl:if>
+      <xsl:text> </xsl:text>
       <xsl:value-of select="$firstch"/>
     </a>
-  </dt>
-  <dd>
     <!-- * include nested qandaset/qandaentry in TOC if user wants it -->
 
     <xsl:if test="not($qanda.nested.in.toc = 0)">
       <xsl:apply-templates select="following-sibling::answer" mode="qandatoc.mode"/>
     </xsl:if>
-  </dd>
+  </li>
 </xsl:template>
 
 <xsl:template match="answer" mode="qandatoc.mode">
@@ -1418,4 +1416,7 @@
   </xsl:choose>
 </xsl:template>
 
+<!-- HTML5: no body attributes -->
+<xsl:template name="body.attributes"/>
+
 </xsl:stylesheet>