# HG changeset patch
# User paulb
# Date 1128366590 0
# Node ID 52f32e74b0a23af5d38dae94af10946900e0351a
# Parent  6f534bceeeaf32a438656b37c2c2b2b916732a91
[project @ 2005-10-03 19:09:50 by paulb]
Added a type "parameter" to template:multiple-choice-field to distinguish
between new and existing attributes.
Attempted to improve/correct enumeration handling in the Input stylesheet
preparation, adding specially named variables and propagating paths into
template rules and generated enumeration code.

diff -r 6f534bceeeaf -r 52f32e74b0a2 XSLForms/XSL/Input.xsl
--- a/XSLForms/XSL/Input.xsl	Mon Oct 03 15:48:32 2005 +0000
+++ b/XSLForms/XSL/Input.xsl	Mon Oct 03 19:09:50 2005 +0000
@@ -75,18 +75,15 @@
   <xsl:template name="process-element">
     <xsl:param name="path" select="@name"/>
 
-    <!-- Store multiple-choice selections, if appropriate. -->
-    <xsl:if test="@type='multiple-choice-list'">
-      <axsl:variable name="values" select="{@name}/{element[@type='multiple-choice-list-value']/@name}/@{attribute/@name}"/>
-    </xsl:if>
-
     <!-- 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: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">
@@ -111,6 +108,7 @@
   <!-- 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. -->
@@ -122,7 +120,9 @@
       </xsl:when>
       <xsl:when test="$adding-selectors = 0">
         <xsl:for-each select="element">
-          <xsl:call-template name="process-rules"/>
+          <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>
@@ -136,11 +136,18 @@
   <!-- Fill in enumerations. -->
 
   <xsl:template name="inside-enumeration">
+    <xsl:param name="path" select="@name"/>
+
+    <!-- Store multiple-choice selections, if appropriate. -->
+    <xsl:if test="../@type='multiple-choice-list'">
+      <axsl:variable name="values-{@name}" select="{$path}/@{../attribute/@name}"/>
+    </xsl:if>
+
     <axsl:for-each select="${../@name}/{../@name}/{@name}">
       <axsl:copy>
         <axsl:apply-templates select="@*"/>
         <xsl:if test="@type='multiple-choice-list-value'">
-          <axsl:if test="$values[string() = current()/@{attribute/@name}]">
+          <axsl:if test="$values-{@name}[string() = current()/@{attribute/@name}]">
             <axsl:attribute name="{@expr-name}">1</axsl:attribute>
           </axsl:if>
         </xsl:if>
diff -r 6f534bceeeaf -r 52f32e74b0a2 XSLForms/XSL/PrepareMacro.xsl
--- a/XSLForms/XSL/PrepareMacro.xsl	Mon Oct 03 15:48:32 2005 +0000
+++ b/XSLForms/XSL/PrepareMacro.xsl	Mon Oct 03 19:09:50 2005 +0000
@@ -86,14 +86,28 @@
 
   <xsl:template match="*[@template:multiple-choice-field]">
     <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-field, ',')"/>
-    <xsl:variable name="field-attr" select="substring-after(@template:multiple-choice-field, ',')"/>
+    <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-field, ',')"/>
+    <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
+    <xsl:variable name="field-attr-type" select="substring-after($field-attr-info, ',')"/>
     <xsl:copy>
       <!-- Remove multiple-choice-field and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'multiple-choice-field' and local-name() != 'name']"/>
       <xsl:if test="$field-element != '-'">
         <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
       </xsl:if>
-      <xsl:attribute name="name">{template:new-attribute('<xsl:value-of select="$field-attr"/>')}</xsl:attribute>
+      <xsl:choose>
+        <xsl:when test="$field-attr-type = 'new'">
+          <xsl:attribute name="name">{template:new-attribute('<xsl:value-of select="$field-attr"/>')}</xsl:attribute>
+        </xsl:when>
+        <xsl:when test="$field-attr = ''">
+          <xsl:attribute name="template:attribute"><xsl:value-of select="$field-attr-info"/></xsl:attribute>
+          <xsl:attribute name="name">{template:this-attribute()}</xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="template:attribute"><xsl:value-of select="$field-attr"/></xsl:attribute>
+          <xsl:attribute name="name">{template:this-attribute()}</xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:apply-templates select="*|node()"/>
     </xsl:copy>
   </xsl:template>