From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 3 Sep 2002 13:24:57 +0000 (+0000)
Subject: Make sure row-level colsep and rowsep values are 'inherited' onto missing cells
X-Git-Tag: release/1.79.1~6^2~5315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45e69fec995ee23f645db3f29400f851b751a6fa;p=docbook-dsssl

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 515d8857a..256617190 100644
--- 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 0adc1462f..fc4a021e1 100644
--- 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 7b1d2d666..082c8a3cb 100644
--- 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>