Fix bug #1298 where @rowheader = 'firstcol' incorrectly assigns

<th> to cell that is first in a row but not the first column due
to row span above.

diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index c8969924e2e0616ab6e3dc6f63fe39eac413bbcc..f3df9320cf23e756cecaf0c7eb2394cc4342de22 100644 (file)
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -697,20 +697,6 @@
 
   <xsl:param name="spans"/>
 
-  <xsl:variable name="cellgi">
-    <xsl:choose>
-      <xsl:when test="ancestor::thead">th</xsl:when>
-      <xsl:when test="ancestor::tfoot">th</xsl:when>
-      <xsl:when test="ancestor::tbody and 
-                      (ancestor::table[@rowheader = 'firstcol'] or
-                      ancestor::informaltable[@rowheader = 'firstcol']) and
-                      ancestor-or-self::entry[1][count(preceding-sibling::entry) = 0]">
-        <xsl:text>th</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>td</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
   <xsl:variable name="empty.cell" select="count(node()) = 0"/>
 
   <xsl:variable name="named.colnum">
@@ -744,6 +730,20 @@
     </xsl:call-template>
   </xsl:variable>
 
+  <xsl:variable name="cellgi">
+    <xsl:choose>
+      <xsl:when test="ancestor::thead">th</xsl:when>
+      <xsl:when test="ancestor::tfoot">th</xsl:when>
+      <xsl:when test="ancestor::tbody and 
+                      (ancestor::table[@rowheader = 'firstcol'] or
+                      ancestor::informaltable[@rowheader = 'firstcol']) and
+                      $entry.colnum = 1">
+        <xsl:text>th</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>td</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <xsl:variable name="rowsep">
     <xsl:choose>
       <!-- If this is the last row, rowsep never applies. -->