From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 15 Dec 2005 18:18:59 +0000 (+0000)
Subject: Fixed attribute inheritance when in entrytbl.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f49f9c4efda745aa8c581b360ee3c7adb50608a;p=docbook-dsssl

Fixed attribute inheritance when in entrytbl.
---

diff --git a/xsl/common/table.xsl b/xsl/common/table.xsl
index f9f9931c5..4032543b9 100644
--- a/xsl/common/table.xsl
+++ b/xsl/common/table.xsl
@@ -253,10 +253,11 @@ or 0 (the empty string)</para>
   <xsl:param name="colnum" select="0"/>
   <xsl:param name="attribute" select="'colsep'"/>
 
-  <xsl:variable name="tgroup" select="$row/ancestor::tgroup[1]"/>
+  <xsl:variable name="tgroup" select="$row/parent::*/parent::tgroup[1]"/>
 
   <xsl:variable name="table" select="($tgroup/ancestor::table
-                                     |$tgroup/ancestor::informaltable)[last()]"/>
+                                     |$tgroup/ancestor::informaltable
+				     |$entry/ancestor::entrytbl)[last()]"/>
 
   <xsl:variable name="entry.value">
     <xsl:call-template name="get-attribute">
@@ -397,7 +398,10 @@ or 0 (the empty string)</para>
 <xsl:template name="colnum.colspec">
   <xsl:param name="colnum" select="0"/>
   <xsl:param name="attribute" select="'colname'"/>
-  <xsl:param name="colspecs" select="ancestor::tgroup/colspec"/>
+  <xsl:param name="colspec.ancestor" 
+             select="(ancestor::tgroup|ancestor::entrytbl)
+	             [position() = last()]"/>
+  <xsl:param name="colspecs" select="$colspec.ancestor/colspec"/>
   <xsl:param name="count" select="1"/>
 
   <xsl:choose>