# HG changeset patch
# User paulb
# Date 1129997045 0
# Node ID df3ac15b6303f659b1c155136f6e51c8e4b74850
# Parent  5e889ef4687fd9b957be1b7f71a59cf3ce0cc31d
[project @ 2005-10-22 16:04:05 by paulb]
Added improved support for rowspan attributes with values greater than one.

diff -r 5e889ef4687f -r df3ac15b6303 XSLForms/XSL/QtDesigner.xsl
--- a/XSLForms/XSL/QtDesigner.xsl	Fri Oct 21 17:06:41 2005 +0000
+++ b/XSLForms/XSL/QtDesigner.xsl	Sat Oct 22 16:04:05 2005 +0000
@@ -77,8 +77,21 @@
     <!-- Insert missing cells. -->
     <!-- NOTE: This does not handle rowspan usage. -->
     <xsl:if test="$column != $last-column + $last-colspan">
-      <td colspan="{$column - $last-column - $last-colspan}" xmlns="http://www.w3.org/1999/xhtml">
-      </td>
+      <xsl:variable name="spanned-columns" select="$grid/*[$row > @row and @row + @rowspan > $row and @column > $last-column and $column > @column]/@column"/>
+      <xsl:choose>
+        <xsl:when test="count($spanned-columns) != 0">
+          <xsl:variable name="last-spanned-column" select="math:highest($spanned-columns)"/>
+          <xsl:variable name="last-spanned-colspan" select="$last-spanned-column/../@colspan"/>
+          <xsl:if test="$column != $last-spanned-column + $last-spanned-colspan">
+            <td colspan="{$column - $last-spanned-column - $last-spanned-colspan}" xmlns="http://www.w3.org/1999/xhtml">
+            </td>
+          </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+          <td colspan="{$column - $last-column - $last-colspan}" xmlns="http://www.w3.org/1999/xhtml">
+          </td>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
     <!-- Remember useful information. -->
     <xsl:variable name="this-column" select="$grid/*[@row=$row and @column=$column]"/>