1.1 --- a/XSLForms/XSL/QtDesigner.xsl Fri Oct 21 17:06:41 2005 +0000
1.2 +++ b/XSLForms/XSL/QtDesigner.xsl Sat Oct 22 16:04:05 2005 +0000
1.3 @@ -77,8 +77,21 @@
1.4 <!-- Insert missing cells. -->
1.5 <!-- NOTE: This does not handle rowspan usage. -->
1.6 <xsl:if test="$column != $last-column + $last-colspan">
1.7 - <td colspan="{$column - $last-column - $last-colspan}" xmlns="http://www.w3.org/1999/xhtml">
1.8 - </td>
1.9 + <xsl:variable name="spanned-columns" select="$grid/*[$row > @row and @row + @rowspan > $row and @column > $last-column and $column > @column]/@column"/>
1.10 + <xsl:choose>
1.11 + <xsl:when test="count($spanned-columns) != 0">
1.12 + <xsl:variable name="last-spanned-column" select="math:highest($spanned-columns)"/>
1.13 + <xsl:variable name="last-spanned-colspan" select="$last-spanned-column/../@colspan"/>
1.14 + <xsl:if test="$column != $last-spanned-column + $last-spanned-colspan">
1.15 + <td colspan="{$column - $last-spanned-column - $last-spanned-colspan}" xmlns="http://www.w3.org/1999/xhtml">
1.16 + </td>
1.17 + </xsl:if>
1.18 + </xsl:when>
1.19 + <xsl:otherwise>
1.20 + <td colspan="{$column - $last-column - $last-colspan}" xmlns="http://www.w3.org/1999/xhtml">
1.21 + </td>
1.22 + </xsl:otherwise>
1.23 + </xsl:choose>
1.24 </xsl:if>
1.25 <!-- Remember useful information. -->
1.26 <xsl:variable name="this-column" select="$grid/*[@row=$row and @column=$column]"/>