# HG changeset patch
# User paulb
# Date 1129914372 0
# Node ID f005905d2d59217f3a73885d20244f8940d884df
# Parent  a16a291eea909ad95b506a8971be87e33810950b
[project @ 2005-10-21 17:06:12 by paulb]
Fixed numeric sorting of row numbers.
Added support for the addition of missing cells, although this does not yet
support cells spanning rows.
Added text label support.

diff -r a16a291eea90 -r f005905d2d59 XSLForms/XSL/QtDesigner.xsl
--- a/XSLForms/XSL/QtDesigner.xsl	Mon Oct 17 23:50:33 2005 +0000
+++ b/XSLForms/XSL/QtDesigner.xsl	Fri Oct 21 17:06:12 2005 +0000
@@ -21,6 +21,7 @@
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:set="http://exslt.org/sets"
+  xmlns:math="http://exslt.org/math"
   xmlns:template="http://www.boddie.org.uk/ns/xmltools/template">
 
   <xsl:output indent="yes"/>
@@ -52,24 +53,67 @@
     <table xmlns="http://www.w3.org/1999/xhtml">
       <!-- Get the row numbers in ascending order. -->
       <xsl:for-each select="set:distinct($grid/*/@row)">
-        <xsl:sort select="." order="ascending"/>
+        <xsl:sort select="." data-type="number" order="ascending"/>
         <xsl:variable name="row" select="."/>
         <tr>
           <!-- Get all elements in the row, ordered by column number. -->
-          <xsl:for-each select="$grid/*[@row=$row]">
-            <xsl:sort select="@column" order="ascending"/>
-            <td>
-              <!-- Add colspan and rowspan details. -->
-              <xsl:apply-templates select="@colspan|@rowspan"/>
-              <!-- Transform the element. -->
-              <xsl:apply-templates select="."/>
-            </td>
-          </xsl:for-each>
+          <xsl:call-template name="grid-column">
+            <xsl:with-param name="column" select="math:min($grid/*[@row=$row]/@column)"/>
+            <xsl:with-param name="row" select="$row"/>
+            <xsl:with-param name="grid" select="$grid"/>
+            <xsl:with-param name="last-column">-1</xsl:with-param>
+          </xsl:call-template>
         </tr>
       </xsl:for-each>
     </table>
   </xsl:template>
 
+  <xsl:template name="grid-column">
+    <xsl:param name="column"/>
+    <xsl:param name="row"/>
+    <xsl:param name="grid"/>
+    <xsl:param name="last-column"/>
+    <xsl:param name="last-colspan">1</xsl:param>
+    <!-- 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:if>
+    <!-- Remember useful information. -->
+    <xsl:variable name="this-column" select="$grid/*[@row=$row and @column=$column]"/>
+    <xsl:variable name="this-colspan" select="$this-column/@colspan"/>
+    <!-- Insert this cell. -->
+    <td xmlns="http://www.w3.org/1999/xhtml">
+      <!-- Add colspan and rowspan details. -->
+      <xsl:apply-templates select="$this-colspan|$this-column/@rowspan"/>
+      <!-- Transform the element. -->
+      <xsl:apply-templates select="$this-column"/>
+    </td>
+    <!-- Find remaining cells in this row. -->
+    <xsl:if test="count($grid/*[@row=$row and @column > $column]) > 0">
+      <xsl:choose>
+        <xsl:when test="$this-colspan">
+          <xsl:call-template name="grid-column">
+            <xsl:with-param name="column" select="math:min($grid/*[@row=$row and @column > $column]/@column)"/>
+            <xsl:with-param name="row" select="$row"/>
+            <xsl:with-param name="grid" select="$grid"/>
+            <xsl:with-param name="last-column" select="$column"/>
+            <xsl:with-param name="last-colspan" select="$this-colspan"/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="grid-column">
+            <xsl:with-param name="column" select="math:min($grid/*[@row=$row and @column > $column]/@column)"/>
+            <xsl:with-param name="row" select="$row"/>
+            <xsl:with-param name="grid" select="$grid"/>
+            <xsl:with-param name="last-column" select="$column"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template match="spacer">
   </xsl:template>
 
@@ -112,6 +156,12 @@
     </option>
   </xsl:template>
 
+  <xsl:template match="widget[@class='QLabel']">
+    <xsl:variable name="value-prop" select="property[@name='text']"/>
+    <!-- NOTE: Permitting element generation from the text. -->
+    <xsl:value-of disable-output-escaping="yes" select="$value-prop/string/text()"/>
+  </xsl:template>
+
   <xsl:template match="widget[@class='QPushButton']">
     <input xmlns="http://www.w3.org/1999/xhtml" type="submit">
       <xsl:variable name="name-prop" select="property[@name='name']"/>