# HG changeset patch
# User paulb
# Date 1128469661 0
# Node ID 2cd13aa954972c29ab07371d4a594fad8a0fb9c8
# Parent  9b1f1706bb789979be4da73df9aeafb7350c12b8
[project @ 2005-10-04 23:47:41 by paulb]
Fixed attribute-area (the effect "parameter").
Added attribute-list-button and multiple-choice-list-element.

diff -r 9b1f1706bb78 -r 2cd13aa95497 XSLForms/XSL/Schema.xsl
--- a/XSLForms/XSL/Schema.xsl	Tue Oct 04 23:47:04 2005 +0000
+++ b/XSLForms/XSL/Schema.xsl	Tue Oct 04 23:47:41 2005 +0000
@@ -82,7 +82,7 @@
 
   <!-- Match attributes. -->
 
-  <xsl:template match="*[not(@template:element) and (@template:attribute or @template:attribute-field or @template:attribute-area or @template:attribute-button or @template:selector-field or @template:multiple-choice-field or @template:multiple-choice-list-field or @template:multiple-choice-value or @template:multiple-choice-list-value)]">
+  <xsl:template match="*[not(@template:element) and (@template:attribute or @template:attribute-field or @template:attribute-area or @template:attribute-button or @template:attribute-list-button or @template:selector-field or @template:multiple-choice-field or @template:multiple-choice-list-field or @template:multiple-choice-value or @template:multiple-choice-list-value) or @template:multiple-choice-list-element]">
     <xsl:call-template name="enter-attribute"/>
   </xsl:template>
 
@@ -100,7 +100,15 @@
       </xsl:when>
       <xsl:when test="@template:attribute-area">
         <attribute>
-          <xsl:attribute name="name"><xsl:value-of select="@template:attribute-area"/></xsl:attribute>
+          <xsl:variable name="field-attr" select="substring-before(@template:attribute-area, ',')"/>
+          <xsl:choose>
+            <xsl:when test="$field-attr != ''">
+              <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="name"><xsl:value-of select="@template:attribute-area"/></xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
         </attribute>
       </xsl:when>
       <xsl:when test="@template:attribute-button">
@@ -109,6 +117,12 @@
           <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
         </attribute>
       </xsl:when>
+      <xsl:when test="@template:attribute-list-button">
+        <attribute>
+          <xsl:variable name="field-attr" select="substring-before(@template:attribute-list-button, ',')"/>
+          <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+        </attribute>
+      </xsl:when>
       <xsl:when test="@template:selector-field">
         <xsl:variable name="field-name" select="substring-before(@template:selector-field, ',')"/>
         <xsl:variable name="affected-element" select="substring-after(@template:selector-field, ',')"/>
@@ -170,6 +184,32 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
+      <xsl:when test="@template:multiple-choice-list-element">
+        <xsl:variable name="element" select="substring-before(@template:multiple-choice-list-element, ',')"/>
+        <xsl:variable name="element-list-info" select="substring-after(@template:multiple-choice-list-element, ',')"/>
+        <xsl:variable name="element-list-element" select="substring-before($element-list-info, ',')"/>
+        <xsl:variable name="element-list-attr" select="substring-after($element-list-info, ',')"/>
+        <xsl:choose>
+          <xsl:when test="$element != '-'">
+            <element type="multiple-choice-list">
+              <xsl:attribute name="name"><xsl:value-of select="$element"/></xsl:attribute>
+              <element type="multiple-choice-list-value">
+                <xsl:attribute name="name"><xsl:value-of select="$element-list-element"/></xsl:attribute>
+                <xsl:attribute name="expr-name">value-is-set</xsl:attribute>
+                <xsl:apply-templates select="*"/>
+              </element>
+            </element>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="type">multiple-choice-list</xsl:attribute>
+            <element type="multiple-choice-list-value">
+              <xsl:attribute name="name"><xsl:value-of select="$element-list-element"/></xsl:attribute>
+              <xsl:attribute name="expr-name">value-is-set</xsl:attribute>
+              <xsl:apply-templates select="*"/>
+            </element>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
       <xsl:when test="@template:multiple-choice-value">
         <element type="multiple-choice-value">
           <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-value, ',')"/>