Work to make HTML and XHTML targets more valid

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index ab745b07e534eb4c5e7fe33456ca54438a5f18b7..f218c17992fa56bb57448c9ace7e3584400f715b 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -738,7 +738,10 @@
 <xsl:template match="emphasis">
   <span>
     <xsl:choose>
-      <xsl:when test="@role and $emphasis.propagates.style != 0">
+      <!-- We don't want empty @class values, so do not propagate empty @roles -->
+      <xsl:when test="@role  and
+                      normalize-space(@role) != '' and
+                      $emphasis.propagates.style != 0">
         <xsl:apply-templates select="." mode="class.attribute">
           <xsl:with-param name="class" select="@role"/>
         </xsl:apply-templates>
@@ -799,7 +802,10 @@
     <xsl:if test="@lang or @xml:lang">
       <xsl:call-template name="language.attribute"/>
     </xsl:if>
-    <xsl:if test="@role and $phrase.propagates.style != 0">
+    <!-- We don't want empty @class values, so do not propagate empty @roles -->
+    <xsl:if test="@role and 
+                  normalize-space(@role) != '' and
+                  $phrase.propagates.style != 0">
       <xsl:apply-templates select="." mode="class.attribute">
         <xsl:with-param name="class" select="@role"/>
       </xsl:apply-templates>

diff --git a/xsl/html/synop.xsl b/xsl/html/synop.xsl
index caa3129bbcf126c73abed4b7afb4e1792d29e324..1ac6f88d532a565e287616506249d6ad1470712c 100644 (file)
--- a/xsl/html/synop.xsl
+++ b/xsl/html/synop.xsl
@@ -150,7 +150,9 @@
   <xsl:variable name="snum">
     <xsl:apply-templates select="." mode="synopfragment.number"/>
   </xsl:variable>
-  <p>
+  <!-- You can't introduce another <p> here, because you're 
+       already in a <p> from cmdsynopsis-->
+  <span>
     <xsl:variable name="id">
       <xsl:call-template name="object.id"/>
     </xsl:variable>
@@ -161,7 +163,7 @@
     </a>
     <xsl:text> </xsl:text>
     <xsl:apply-templates/>
-  </p>
+  </span>
 </xsl:template>
 
 <xsl:template match="funcsynopsis">
@@ -365,9 +367,9 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
     </xsl:for-each>
   </table>
   <xsl:if test="paramdef">
-    <blockquote class="paramdef-list">
+    <div class="paramdef-list">
       <xsl:apply-templates select="paramdef" mode="kr-funcsynopsis-mode"/>
-    </blockquote>
+    </div>
   </xsl:if>
   <div class="funcprototype-spacer">&#160;</div> <!-- hACk: blank div for vertical spacing -->
 </xsl:template>