Fixed bug #1005990. Column spans are now working also in entrytbl element, not only...

diff --git a/xsl/common/table.xsl b/xsl/common/table.xsl
index c26d52397ce71e6b0b588ca06d64b9134e589619..e8380fed7300d20b66712b22a6e49b5bf7cca87f 100644 (file)
--- a/xsl/common/table.xsl
+++ b/xsl/common/table.xsl
@@ -89,9 +89,11 @@
     <xsl:when test="$entry/@spanname">
       <xsl:variable name="spanname" select="$entry/@spanname"/>
       <xsl:variable name="spanspec"
-                    select="$entry/ancestor::tgroup/spanspec[@spanname=$spanname]"/>
+                    select="($entry/ancestor::tgroup/spanspec[@spanname=$spanname]
+                             |$entry/ancestor::entrytbl/spanspec[@spanname=$spanname])[last()]"/>
       <xsl:variable name="colspec"
-                    select="$entry/ancestor::tgroup/colspec[@colname=$spanspec/@namest]"/>
+                    select="($entry/ancestor::tgroup/colspec[@colname=$spanspec/@namest]
+                             |$entry/ancestor::entrytbl/colspec[@colname=$spanspec/@namest])[last()]"/>
       <xsl:call-template name="colspec.colnum">
         <xsl:with-param name="colspec" select="$colspec"/>
       </xsl:call-template>
@@ -99,7 +101,8 @@
     <xsl:when test="$entry/@colname">
       <xsl:variable name="colname" select="$entry/@colname"/>
       <xsl:variable name="colspec"
-                    select="$entry/ancestor::tgroup/colspec[@colname=$colname]"/>
+                    select="($entry/ancestor::tgroup/colspec[@colname=$colname]
+                             |$entry/ancestor::entrytbl/colspec[@colname=$colname])[last()]"/>
       <xsl:call-template name="colspec.colnum">
         <xsl:with-param name="colspec" select="$colspec"/>
       </xsl:call-template>
@@ -107,7 +110,8 @@
     <xsl:when test="$entry/@namest">
       <xsl:variable name="namest" select="$entry/@namest"/>
       <xsl:variable name="colspec"
-                    select="$entry/ancestor::tgroup/colspec[@colname=$namest]"/>
+                    select="($entry/ancestor::tgroup/colspec[@colname=$namest]
+                             |$entry/ancestor::entrytbl/colspec[@colname=$namest])[last()]"/>
       <xsl:call-template name="colspec.colnum">
         <xsl:with-param name="colspec" select="$colspec"/>
       </xsl:call-template>
@@ -165,7 +169,8 @@ or 0 (the empty string)</para>
   <xsl:param name="entry" select="."/>
   <xsl:variable name="spanname" select="$entry/@spanname"/>
   <xsl:variable name="spanspec"
-                select="$entry/ancestor::tgroup/spanspec[@spanname=$spanname]"/>
+                select="($entry/ancestor::tgroup/spanspec[@spanname=$spanname]
+                         |$entry/ancestor::entrytbl/spanspec[@spanname=$spanname])[last()]"/>
 
   <xsl:variable name="namest">
     <xsl:choose>
@@ -192,14 +197,16 @@ or 0 (the empty string)</para>
   <xsl:variable name="scol">
     <xsl:call-template name="colspec.colnum">
       <xsl:with-param name="colspec"
-                      select="$entry/ancestor::tgroup/colspec[@colname=$namest]"/>
+                      select="($entry/ancestor::tgroup/colspec[@colname=$namest]
+                               |$entry/ancestor::entrytbl/colspec[@colname=$namest])[last()]"/>
     </xsl:call-template>
   </xsl:variable>
 
   <xsl:variable name="ecol">
     <xsl:call-template name="colspec.colnum">
       <xsl:with-param name="colspec"
-                      select="$entry/ancestor::tgroup/colspec[@colname=$nameend]"/>
+                      select="($entry/ancestor::tgroup/colspec[@colname=$nameend]
+                               |$entry/ancestor::entrytbl/colspec[@colname=$nameend])[last()]"/>
     </xsl:call-template>
   </xsl:variable>