From 1dbbfa2b18daf72db6d8fa12b27fad6d32a58450 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 24 Nov 2011 00:12:16 +0000
Subject: [PATCH] Fix bug 3441149 where mode="class.value" does not work for
 para or entry when the element does not have a role attribute.

---
 xsl/html/block.xsl |  4 +++-
 xsl/html/html.xsl  | 10 ++++++++--
 xsl/html/table.xsl | 17 ++++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/xsl/html/block.xsl b/xsl/html/block.xsl
index 3d755b611..41aef8641 100644
--- a/xsl/html/block.xsl
+++ b/xsl/html/block.xsl
@@ -64,7 +64,9 @@
           </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:call-template name="locale.html.attributes"/>
+          <xsl:call-template name="common.html.attributes">
+            <xsl:with-param name="class" select="''"/>
+          </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:copy-of select="$content"/>
diff --git a/xsl/html/html.xsl b/xsl/html/html.xsl
index df14f43dd..541424ade 100644
--- a/xsl/html/html.xsl
+++ b/xsl/html/html.xsl
@@ -296,11 +296,17 @@
   <xsl:param name="class" select="local-name(.)"/>
   <!-- permit customization of class attributes -->
   <!-- Use element name by default -->
-  <xsl:attribute name="class">
+  <xsl:variable name="class.value">
     <xsl:apply-templates select="." mode="class.value">
       <xsl:with-param name="class" select="$class"/>
     </xsl:apply-templates>
-  </xsl:attribute>
+  </xsl:variable>
+
+  <xsl:if test="string-length(normalize-space($class.value)) != 0">
+    <xsl:attribute name="class">
+      <xsl:value-of select="$class.value"/>
+    </xsl:attribute>
+  </xsl:if> 
 </xsl:template>
 
 <xsl:template match="*" mode="class.value">
diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index 6e47b55ec..82b38fc31 100644
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -847,11 +847,18 @@
         </xsl:if>
 
         <xsl:call-template name="locale.html.attributes"/>
-        <xsl:if test="$entry.propagates.style != 0 and @role">
-          <xsl:apply-templates select="." mode="class.attribute">
-            <xsl:with-param name="class" select="@role"/>
-          </xsl:apply-templates>
-        </xsl:if>
+        <xsl:choose>
+          <xsl:when test="$entry.propagates.style != 0 and @role">
+            <xsl:apply-templates select="." mode="class.attribute">
+              <xsl:with-param name="class" select="@role"/>
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates select="." mode="class.attribute">
+              <xsl:with-param name="class" select="''"/>
+            </xsl:apply-templates>
+          </xsl:otherwise>
+        </xsl:choose>
 
         <xsl:if test="$show.revisionflag and @revisionflag">
           <xsl:attribute name="class">
-- 
2.40.0