# HG changeset patch
# User paulb
# Date 1129502313 0
# Node ID 4d3031c1a674bc276bc49af94cf384dc89cd479e
# Parent  8639cb85bec680b2fe69e32113f8db2735d7b8f5
[project @ 2005-10-16 22:38:33 by paulb]
Fixed element processing in an attempt to provide "stable ordering", with
collection elements appearing at the end of any given parent element's
list of child elements.

diff -r 8639cb85bec6 -r 4d3031c1a674 XSLForms/XSL/Input.xsl
--- a/XSLForms/XSL/Input.xsl	Fri Oct 14 16:05:16 2005 +0000
+++ b/XSLForms/XSL/Input.xsl	Sun Oct 16 22:38:33 2005 +0000
@@ -88,6 +88,10 @@
   <xsl:template name="process-elements">
     <xsl:param name="path">.</xsl:param>
 
+    <!-- To ensure "stable ordering" of elements, the initialised/static elements are
+         added first; the collection/dynamic elements are added afterwards. This may not
+         necessarily match the schema, however. -->
+
     <xsl:for-each select="element">
       <!-- Define elements which do not have selectors. -->
       <xsl:variable name="adding-selectors" select="count(//selector[@element=current()/@name])"/>
@@ -108,6 +112,26 @@
             </xsl:call-template>
           </xsl:element>
         </xsl:when>
+        <!-- Other elements are only added if found and must appear last - see below. -->
+        <xsl:otherwise/>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <!-- Add the collection/dynamic elements at the end. This includes placeholder
+         elements which may have represented the static elements.
+         NOTE: We may wish to exclude placeholder elements in any situation where static
+         NOTE: elements are employed, since the only place where keeping them around is
+         NOTE: necessary/meaningful is in dynamic element collections. -->
+
+    <xsl:for-each select="element">
+      <!-- Define elements which do not have selectors. -->
+      <xsl:variable name="adding-selectors" select="count(//selector[@element=current()/@name])"/>
+
+      <xsl:choose>
+        <!-- Enumerations added first - see above. -->
+        <xsl:when test="@type='multiple-choice-value' or @type='multiple-choice-list-value'"/>
+        <!-- Added elements added first - see above. -->
+        <xsl:when test="(not(@init) or @init = 'auto') and $adding-selectors = 0 or @init = 'yes'"/>
         <!-- Other elements are only added if found. -->
         <xsl:otherwise>
           <axsl:apply-templates select="{$path}/{@name}|{$path}/placeholder"/>