forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r123894 - /forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl
Date Sun, 02 Jan 2005 17:50:29 GMT
Author: rick
Date: Sun Jan  2 09:50:29 2005
New Revision: 123894

URL: http://svn.apache.org/viewcvs?view=rev&rev=123894
Log:
The number of columns in a table was determined simply by counting the
number of TD & TH elements in the first row.

Changed this so that the number of columns is determined by the number
of TD & TH as well as including any @colspan attributes defined in those
TD and TH elements.


Modified:
   forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl
Url: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl?view=diff&rev=123894&p1=forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl&r1=123893&p2=forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl&r2=123894
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.text-output/resources/stylesheets/common/text-templates.xsl
Sun Jan  2 09:50:29 2005
@@ -307,7 +307,8 @@
     <xsl:param name="mincolwidth">10</xsl:param>
     <xsl:param name="width" select="$document-width"/>
     <xsl:variable name="cols">
-      <xsl:value-of select="count(tr[1]/th|tr[1]/td)"/>
+      <xsl:value-of select="count(tr[1]/th|tr[1]/td) - count(tr[1]/th[@colspan]|tr[1]/td[@colspan])
+ sum(tr[1]/th/@colspan) + sum(tr[1]/td/@colspan)"/>
+
     </xsl:variable>
 
     <xsl:variable name="indent" select="$level * $indent-per-level"/>

Mime
View raw message