# HG changeset patch
# User paulb
# Date 1129508091 0
# Node ID 6afca08c7bf74d33b7f9edf46a7d5df9cf260853
# Parent  6cd6887e003fb02c301734fdd070c35e97c690fb
[project @ 2005-10-17 00:14:51 by paulb]
Fixed the production of instructions selecting collection/dynamic elements
so that the ordering of such elements is exactly preserved. (Instead of
emitting an apply-templates instruction for each found element, a single
instruction encompassing all qualifying elements is emitted.)

diff -r 6cd6887e003f -r 6afca08c7bf7 XSLForms/XSL/Input.xsl
--- a/XSLForms/XSL/Input.xsl	Sun Oct 16 22:39:02 2005 +0000
+++ b/XSLForms/XSL/Input.xsl	Mon Oct 17 00:14:51 2005 +0000
@@ -123,21 +123,59 @@
          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:call-template name="produce-selection">
+      <xsl:with-param name="path" select="$path"/>
+      <xsl:with-param name="selection" select="concat($path, '/placeholder')"/>
+      <xsl:with-param name="element" select="element[1]"/>
+    </xsl:call-template>
+
+  </xsl:template>
+
+
+
+  <!-- Produce a selection of collection/dynamic elements.
+       This should produce an apply-templates instruction selecting dynamic elements.
+       For example:
+       ./placeholder|./some-element|./some-other-element -->
+
+  <xsl:template name="produce-selection">
+    <xsl:param name="path"/>
+    <xsl:param name="selection"/>
+    <xsl:param name="element"/>
 
-      <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"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
+    <xsl:choose>
+      <!-- After processing all elements, produce the selection instruction. -->
+      <xsl:when test="not($element)">
+        <axsl:apply-templates select="{$selection}"/>
+      </xsl:when>
+      <!-- Otherwise, process the remaining elements. -->
+      <xsl:otherwise>
+
+        <!-- Define elements which do not have selectors. -->
+        <xsl:variable name="adding-selectors" select="count(//selector[@element=$element/@name])"/>
+
+        <xsl:choose>
+          <!-- Do not select added elements or enumerations - see process-elements. -->
+          <xsl:when test="((not($element/@init) or $element/@init = 'auto') and $adding-selectors = 0 or $element/@init = 'yes')
+                          or (@type='multiple-choice-value' or @type='multiple-choice-list-value')">
+            <xsl:call-template name="produce-selection">
+              <xsl:with-param name="path" select="$path"/>
+              <xsl:with-param name="selection" select="$selection"/>
+              <xsl:with-param name="element" select="$element/following-sibling::element[1]"/>
+            </xsl:call-template>
+          </xsl:when>
+          <!-- Other elements are only added if found. -->
+          <xsl:otherwise>
+            <xsl:call-template name="produce-selection">
+              <xsl:with-param name="path" select="$path"/>
+              <xsl:with-param name="selection" select="concat($selection, '|', $path, '/', $element/@name)"/>
+              <xsl:with-param name="element" select="$element/following-sibling::element[1]"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>