From 73b908d97953f7f1e7c264d2c1435dbccb26c4ea Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 23 Apr 2012 10:03:37 +0000
Subject: [PATCH] Fix missing id on section elements.

---
 xsl/xhtml5/html5-element-mods.xsl | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/xsl/xhtml5/html5-element-mods.xsl b/xsl/xhtml5/html5-element-mods.xsl
index e1b047395..9636f20d5 100644
--- a/xsl/xhtml5/html5-element-mods.xsl
+++ b/xsl/xhtml5/html5-element-mods.xsl
@@ -584,8 +584,18 @@
 
 <!-- HTML5: @type not permitted on lists -->
 <xsl:template match="itemizedlist">
+  <!-- Handle spacing="compact" as multiple class attribute instead
+       of the deprecated HTML compact attribute -->
+  <xsl:variable name="default.class">
+    <xsl:value-of select="local-name()"/>
+    <xsl:if test="@spacing = 'compact'">
+      <xsl:text> compact</xsl:text>
+    </xsl:if>
+  </xsl:variable>
+  
   <div>
     <xsl:call-template name="common.html.attributes"/>
+    <xsl:call-template name="id.attribute"/>
     <xsl:call-template name="anchor"/>
     <xsl:if test="title">
       <xsl:call-template name="formal.object.heading"/>
@@ -611,7 +621,9 @@
                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
 
     <ul>
-      <xsl:call-template name="generate.class.attribute"/>
+      <xsl:call-template name="generate.class.attribute">
+        <xsl:with-param name="class" select="$default.class"/>
+      </xsl:call-template>
 
       <xsl:apply-templates 
             select="listitem
@@ -661,11 +673,9 @@
     <xsl:call-template name="common.html.attributes">
       <xsl:with-param name="inherit" select="1"/>
     </xsl:call-template>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="id.attribute">
+      <xsl:with-param name="conditional" select="0"/>
+    </xsl:call-template>
 
     <xsl:call-template name="component.separator"/>
     <xsl:call-template name="chapter.titlepage"/>
@@ -751,6 +761,9 @@
     <xsl:call-template name="common.html.attributes">
       <xsl:with-param name="inherit" select="1"/>
     </xsl:call-template>
+    <xsl:call-template name="id.attribute">
+      <xsl:with-param name="conditional" select="0"/>
+    </xsl:call-template>
     <xsl:call-template name="section.titlepage"/>
 
     <xsl:variable name="toc.params">
-- 
2.50.1