# HG changeset patch
# User paulb
# Date 1128387370 0
# Node ID 5bb55335f8eea9a57a66f22c66b618b5473ef4f4
# Parent  21b0b060aceef3f06253f8d79769b7880d823346
[project @ 2005-10-04 00:56:10 by paulb]
Added missing placeholder support.
Fixed document parameters.

diff -r 21b0b060acee -r 5bb55335f8ee XSLForms/XSL/Input.xsl
--- a/XSLForms/XSL/Input.xsl	Mon Oct 03 23:06:16 2005 +0000
+++ b/XSLForms/XSL/Input.xsl	Tue Oct 04 00:56:10 2005 +0000
@@ -17,7 +17,7 @@
       <axsl:output indent="yes"/>
 
       <!-- Make document parameters for all elements appearing to use enumerations. -->
-      <xsl:for-each select="//element[*/@expr]">
+      <xsl:for-each select="//element[@type='multiple-choice' or @type='multiple-choice-list']">
         <axsl:param name="{@name}"/>
       </xsl:for-each>
 
@@ -30,7 +30,7 @@
       <xsl:apply-templates select="*"/>
 
       <!-- Replicate unknown elements. -->
-      <axsl:template match="@*|node()">
+      <axsl:template match="@*|placeholder|node()">
         <axsl:copy>
           <axsl:apply-templates select="@*|node()"/>
         </axsl:copy>
@@ -55,16 +55,12 @@
         <axsl:apply-templates select="@*"/>
 
         <!-- Find elements and determine how to process them. -->
-        <xsl:for-each select="element">
-          <xsl:call-template name="process-element"/>
-        </xsl:for-each>
+        <xsl:call-template name="process-elements"/>
       </xsl:element>
     </axsl:template>
 
     <!-- Make rules for nested elements. -->
-    <xsl:for-each select="element">
-      <xsl:call-template name="process-rules"/>
-    </xsl:for-each>
+    <xsl:call-template name="process-rules"/>
 
   </xsl:template>
 
@@ -72,35 +68,35 @@
 
   <!-- Process elements. -->
 
-  <xsl:template name="process-element">
-    <xsl:param name="path" select="@name"/>
+  <xsl:template name="process-elements">
+    <xsl:param name="path">.</xsl:param>
 
-    <!-- Define elements which do not have selectors. -->
-    <xsl:variable name="adding-selectors" select="count(//selector[@element=current()/@name])"/>
+    <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. -->
-      <xsl:when test="@type='multiple-choice-value' or @type='multiple-choice-list-value'">
-        <xsl:call-template name="inside-enumeration">
-          <xsl:with-param name="path" select="$path"/>
-        </xsl:call-template>
-      </xsl:when>
-      <!-- Added elements. -->
-      <xsl:when test="$adding-selectors = 0">
-        <xsl:element name="{@name}">
-          <axsl:apply-templates select="{$path}/@*"/>
-          <xsl:for-each select="element">
-            <xsl:call-template name="process-element">
+      <xsl:choose>
+        <!-- Enumerations. -->
+        <xsl:when test="@type='multiple-choice-value' or @type='multiple-choice-list-value'">
+          <xsl:call-template name="inside-enumeration">
+            <xsl:with-param name="path" select="concat($path, '/', @name)"/>
+          </xsl:call-template>
+        </xsl:when>
+        <!-- Added elements. -->
+        <xsl:when test="$adding-selectors = 0">
+          <xsl:element name="{@name}">
+            <axsl:apply-templates select="{$path}/{@name}/@*"/>
+            <xsl:call-template name="process-elements">
               <xsl:with-param name="path" select="concat($path, '/', @name)"/>
             </xsl:call-template>
-          </xsl:for-each>
-        </xsl:element>
-      </xsl:when>
-      <!-- Other elements are only added if found. -->
-      <xsl:otherwise>
-        <axsl:apply-templates select="{$path}"/>
-      </xsl:otherwise>
-    </xsl:choose>
+          </xsl:element>
+        </xsl:when>
+        <!-- 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:template>
 
 
@@ -108,27 +104,27 @@
   <!-- Process rules. -->
 
   <xsl:template name="process-rules">
-    <xsl:param name="path" select="@name"/>
-
-    <!-- Define elements which do not have selectors. -->
-    <!-- NOTE: Duplicating adding-selectors - see above. -->
-    <xsl:variable name="adding-selectors" select="count(//selector[@element=current()/@name])"/>
+    <xsl:param name="path">.</xsl:param>
 
-    <xsl:choose>
-      <xsl:when test="@type='multiple-choice-value' or @type='multiple-choice-list-value'">
-        <!-- Do not match multiple-choice values. -->
-      </xsl:when>
-      <xsl:when test="$adding-selectors = 0">
-        <xsl:for-each select="element">
+    <xsl:for-each select="element">
+      <!-- Define elements which do not have selectors. -->
+      <!-- NOTE: Duplicating adding-selectors - see above. -->
+      <xsl:variable name="adding-selectors" select="count(//selector[@element=current()/@name])"/>
+
+      <xsl:choose>
+        <xsl:when test="@type='multiple-choice-value' or @type='multiple-choice-list-value'">
+          <!-- Do not match multiple-choice values. -->
+        </xsl:when>
+        <xsl:when test="$adding-selectors = 0">
           <xsl:call-template name="process-rules">
             <xsl:with-param name="path" select="concat($path, '/', @name)"/>
           </xsl:call-template>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="."/>
-      </xsl:otherwise>
-    </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:template>
 
 
@@ -136,7 +132,7 @@
   <!-- Fill in enumerations. -->
 
   <xsl:template name="inside-enumeration">
-    <xsl:param name="path" select="@name"/>
+    <xsl:param name="path"/>
 
     <!-- Store multiple-choice selections, if appropriate. -->
     <xsl:if test="../@type='multiple-choice-list'">