Make sure row-level colsep and rowsep values are 'inherited' onto missing cells

diff --git a/xsl/common/table.xsl b/xsl/common/table.xsl
index 515d8857a287c401a160f3b156aedb9a76d160ee..2566171904c9cc1a3454e933e4b72417838954c6 100644 (file)
--- a/xsl/common/table.xsl
+++ b/xsl/common/table.xsl
@@ -230,10 +230,12 @@ or 0 (the empty string)</para>
 
 <xsl:template name="inherited.table.attribute">
   <xsl:param name="entry" select="."/>
-  <xsl:param name="tgroup" select="$entry/ancestor::tgroup[1]"/>
+  <xsl:param name="row" select="$entry/ancestor-or-self::row[1]"/>
   <xsl:param name="colnum" select="0"/>
   <xsl:param name="attribute" select="'colsep'"/>
 
+  <xsl:variable name="tgroup" select="$row/ancestor::tgroup[1]"/>
+
   <xsl:variable name="entry.value">
     <xsl:call-template name="get-attribute">
       <xsl:with-param name="element" select="$entry"/>
@@ -243,7 +245,7 @@ or 0 (the empty string)</para>
 
   <xsl:variable name="row.value">
     <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$entry/ancestor::row[1]"/>
+      <xsl:with-param name="element" select="$row"/>
       <xsl:with-param name="attribute" select="$attribute"/>
     </xsl:call-template>
   </xsl:variable>

diff --git a/xsl/fo/table.xsl b/xsl/fo/table.xsl
index 0adc1462f3f24bb0946efb26dfd18593588fab70..fc4a021e130196d6ade61e68442aaf44dd0b2163 100644 (file)
--- a/xsl/fo/table.xsl
+++ b/xsl/fo/table.xsl
@@ -64,7 +64,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
   <xsl:variable name="rowsep">
     <xsl:call-template name="inherited.table.attribute">
       <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-      <xsl:with-param name="tgroup" select="ancestor::tgroup"/>
+      <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
       <xsl:with-param name="colnum" select="$colnum"/>
       <xsl:with-param name="attribute" select="'rowsep'"/>
     </xsl:call-template>
@@ -73,7 +73,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
   <xsl:variable name="colsep">
     <xsl:call-template name="inherited.table.attribute">
       <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-      <xsl:with-param name="tgroup" select="ancestor::tgroup"/>
+      <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
       <xsl:with-param name="colnum" select="$colnum"/>
       <xsl:with-param name="attribute" select="'colsep'"/>
     </xsl:call-template>

diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index 7b1d2d666d9e24d3568095f270a4d301df54ed6f..082c8a3cbd33f308a95bd7849facb041d59e9be7 100644 (file)
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -29,7 +29,7 @@
   <xsl:variable name="rowsep">
     <xsl:call-template name="inherited.table.attribute">
       <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-      <xsl:with-param name="tgroup" select="ancestor::tgroup"/>
+      <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
       <xsl:with-param name="colnum" select="$colnum"/>
       <xsl:with-param name="attribute" select="'rowsep'"/>
     </xsl:call-template>
@@ -38,7 +38,7 @@
   <xsl:variable name="colsep">
     <xsl:call-template name="inherited.table.attribute">
       <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-      <xsl:with-param name="tgroup" select="ancestor::tgroup"/>
+      <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
       <xsl:with-param name="colnum" select="$colnum"/>
       <xsl:with-param name="attribute" select="'colsep'"/>
     </xsl:call-template>