Restore programlisting to use <pre> instead of <div> and instead

wrap callout img elements in <span> to make valid HTML.

diff --git a/xsl/html/callout.xsl b/xsl/html/callout.xsl
index 702087bd9cfd78beb0fb695bfc88e615de5572c0..556fe8465ac197932035e2759a8b30eb9fcae40d 100644 (file)
--- a/xsl/html/callout.xsl
+++ b/xsl/html/callout.xsl
@@ -158,8 +158,9 @@
   <xsl:choose>
     <xsl:when test="$callout.graphics != 0
                     and $conum &lt;= $callout.graphics.number.limit">
-      <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"
-           alt="{$conum}" border="0"/>
+      <!-- Added span to make valid in XHTML 1 -->
+      <span><img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}"
+           alt="{$conum}" border="0"/></span>
     </xsl:when>
     <xsl:when test="$callout.unicode != 0
                     and $conum &lt;= $callout.unicode.number.limit">

diff --git a/xsl/html/verbatim.xsl b/xsl/html/verbatim.xsl
index 82cdbd1d315c06034771f3d2c337904b65ec54bb..00547b8706bb9996797e6bf194c13fff3d9a53cb 100644 (file)
--- a/xsl/html/verbatim.xsl
+++ b/xsl/html/verbatim.xsl
@@ -34,12 +34,7 @@
 
   <xsl:call-template name="anchor"/>
 
-  <xsl:variable name="div.element">
-    <xsl:choose>
-      <xsl:when test="$make.clean.html != 0">div</xsl:when>
-      <xsl:otherwise>pre</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
+  <xsl:variable name="div.element">pre</xsl:variable>
 
   <xsl:if test="$shade.verbatim != 0">
     <xsl:message>