From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 9 Oct 2011 21:39:38 +0000 (+0000)
Subject: The spacing="compact" attribute on lists in HTML no longer outputs compact="compact"
X-Git-Tag: release/1.79.1~6^2~644
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64839c2189f8a21efb370eab8d9c07f7d950c1f8;p=docbook-dsssl

The spacing="compact" attribute on lists in HTML no longer outputs compact="compact"
(or just "compact" in the case of Saxon 6), since that attribute is
deprecated and improperly supported.  Instead, the output uses a
multiple class attribute such as class="orderedlist compact".
Use CSS to style such lists without margin above.
---

diff --git a/xsl/html/lists.xsl b/xsl/html/lists.xsl
index 81558a916..0afbee302 100644
--- a/xsl/html/lists.xsl
+++ b/xsl/html/lists.xsl
@@ -15,6 +15,15 @@
 <!-- ==================================================================== -->
 
 <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="anchor"/>
@@ -31,18 +40,15 @@
                 |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:if test="$css.decoration != 0">
         <xsl:attribute name="type">
           <xsl:call-template name="list.itemsymbol"/>
         </xsl:attribute>
       </xsl:if>
 
-      <xsl:if test="@spacing='compact'">
-        <xsl:attribute name="compact">
-          <xsl:value-of select="@spacing"/>
-        </xsl:attribute>
-      </xsl:if>
       <xsl:apply-templates 
             select="listitem
                     |comment()[preceding-sibling::listitem]
@@ -112,6 +118,15 @@
 </xsl:template>
 
 <xsl:template match="orderedlist">
+  <!-- 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>
+  
   <xsl:variable name="start">
     <xsl:call-template name="orderedlist-starting-number"/>
   </xsl:variable>
@@ -157,7 +172,9 @@
     <xsl:choose>
       <xsl:when test="@inheritnum='inherit' and ancestor::listitem[parent::orderedlist]">
         <table border="0">
-          <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>
           <col align="{$direction.align.start}" valign="top"/>
           <tbody>
             <xsl:apply-templates 
@@ -170,7 +187,9 @@
       </xsl:when>
       <xsl:otherwise>
         <ol>
-          <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:if test="$start != '1'">
             <xsl:attribute name="start">
               <xsl:value-of select="$start"/>
@@ -181,11 +200,6 @@
               <xsl:value-of select="$type"/>
             </xsl:attribute>
           </xsl:if>
-          <xsl:if test="@spacing='compact'">
-            <xsl:attribute name="compact">
-              <xsl:value-of select="@spacing"/>
-            </xsl:attribute>
-          </xsl:if>
           <xsl:apply-templates 
                 select="listitem
                         |comment()[preceding-sibling::listitem]
@@ -258,6 +272,15 @@
   <xsl:variable name="pi-presentation">
     <xsl:call-template name="pi.dbhtml_list-presentation"/>
   </xsl:variable>
+  <!-- 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>
+  
 
   <xsl:variable name="presentation">
     <xsl:choose>
@@ -302,6 +325,9 @@
                   |comment()[not(preceding-sibling::varlistentry)]
                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
         <table border="0">
+          <xsl:call-template name="generate.class.attribute">
+            <xsl:with-param name="class" select="$default.class"/>
+          </xsl:call-template>
           <xsl:if test="$list-width != ''">
             <xsl:attribute name="width">
               <xsl:value-of select="$list-width"/>
@@ -336,6 +362,9 @@
                   |comment()[not(preceding-sibling::varlistentry)]
                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
         <dl>
+          <xsl:call-template name="generate.class.attribute">
+            <xsl:with-param name="class" select="$default.class"/>
+          </xsl:call-template>
           <xsl:apply-templates 
               select="varlistentry
                       |comment()[preceding-sibling::varlistentry]
@@ -1007,7 +1036,8 @@
         </table>
       </xsl:when>
       <xsl:otherwise>
-        <dl compact="compact">
+        <dl>
+          <xsl:apply-templates select="." mode="class.attribute"/>
           <xsl:apply-templates select="callout
                                 |comment()[preceding-sibling::callout]
                                 |processing-instruction()[preceding-sibling::callout]"/>