# HG changeset patch
# User paulb
# Date 1128354512 0
# Node ID 6f534bceeeaf32a438656b37c2c2b2b916732a91
# Parent  5c65b83d5d31781a76a9c5506e312d3fbf039f31
[project @ 2005-10-03 15:48:32 by paulb]
Added an effect "parameter" to template:attribute-area in order to set the
underlying template:effect and template:value attributes.
Fixed the template:attribute-button expression generation, adding a value
"parameter" to the attribute.
Changed the template:multiple-choice-field and
template:multiple-choice-list-field attributes to support "-" as the
element name, thus keeping the field within the current element.

diff -r 5c65b83d5d31 -r 6f534bceeeaf XSLForms/XSL/PrepareMacro.xsl
--- a/XSLForms/XSL/PrepareMacro.xsl	Mon Oct 03 00:54:19 2005 +0000
+++ b/XSLForms/XSL/PrepareMacro.xsl	Mon Oct 03 15:48:32 2005 +0000
@@ -21,10 +21,23 @@
   <!-- Text areas and other elements without value attributes. -->
 
   <xsl:template match="*[@template:attribute-area]">
+    <xsl:variable name="field-attr" select="substring-before(@template:attribute-area, ',')"/>
+    <xsl:variable name="field-effect" select="substring-after(@template:attribute-area, ',')"/>
     <xsl:copy>
-      <!-- Remove attribute-field and replace name and value. -->
-      <xsl:apply-templates select="@*[local-name() != 'attribute-area' and local-name() != 'name' and local-name() != 'value']"/>
-      <xsl:attribute name="template:attribute"><xsl:value-of select="@template:attribute-area"/></xsl:attribute>
+      <!-- Remove attribute-area and replace name. -->
+      <xsl:apply-templates select="@*[local-name() != 'attribute-area' and local-name() != 'name']"/>
+      <xsl:choose>
+        <xsl:when test="$field-attr != ''">
+          <xsl:attribute name="template:attribute"><xsl:value-of select="$field-attr"/></xsl:attribute>
+          <xsl:if test="$field-effect != ''">
+            <xsl:attribute name="template:effect"><xsl:value-of select="$field-effect"/></xsl:attribute>
+            <xsl:attribute name="template:value">$this-value</xsl:attribute>
+          </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="template:attribute"><xsl:value-of select="@template:attribute-area"/></xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:attribute name="name">{template:this-attribute()}</xsl:attribute>
       <xsl:apply-templates select="*|node()"/>
     </xsl:copy>
@@ -34,14 +47,17 @@
 
   <xsl:template match="*[@template:attribute-button]">
     <xsl:variable name="field-attr" select="substring-before(@template:attribute-button, ',')"/>
-    <xsl:variable name="field-set-attr" select="substring-after(@template:attribute-button, ',')"/>
+    <xsl:variable name="field-info" select="substring-after(@template:attribute-button, ',')"/>
+    <xsl:variable name="field-value" select="substring-before($field-info, ',')"/>
+    <xsl:variable name="field-set-attr" select="substring-after($field-info, ',')"/>
     <xsl:copy>
       <!-- Remove attribute-button and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'attribute-button' and local-name() != 'name']"/>
       <xsl:attribute name="template:attribute"><xsl:value-of select="$field-attr"/></xsl:attribute>
       <xsl:attribute name="template:expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
-      <xsl:attribute name="template:expr">$this-value != ''</xsl:attribute>
+      <xsl:attribute name="template:expr">$this-value = '<xsl:value-of select="$field-value"/>'</xsl:attribute>
       <xsl:attribute name="name">{template:this-attribute()}</xsl:attribute>
+      <xsl:attribute name="value"><xsl:value-of select="$field-value"/></xsl:attribute>
       <xsl:apply-templates select="*|node()"/>
     </xsl:copy>
   </xsl:template>
@@ -74,7 +90,9 @@
     <xsl:copy>
       <!-- Remove multiple-choice-field and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'multiple-choice-field' and local-name() != 'name']"/>
-      <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
+      <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:apply-templates select="*|node()"/>
     </xsl:copy>
@@ -90,7 +108,9 @@
     <xsl:copy>
       <!-- Remove multiple-choice-list-field and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'multiple-choice-list-field' and local-name() != 'name']"/>
-      <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
+      <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:list-attribute('<xsl:value-of select="$field-list-element"/>',
         '<xsl:value-of select="$field-list-attr"/>')}</xsl:attribute>
       <xsl:apply-templates select="*|node()"/>
diff -r 5c65b83d5d31 -r 6f534bceeeaf XSLForms/XSL/Schema.xsl
--- a/XSLForms/XSL/Schema.xsl	Mon Oct 03 00:54:19 2005 +0000
+++ b/XSLForms/XSL/Schema.xsl	Mon Oct 03 15:48:32 2005 +0000
@@ -108,28 +108,50 @@
         </selector>
       </xsl:when>
       <xsl:when test="@template:multiple-choice-field">
-        <element type="multiple-choice">
-          <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:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
-          <attribute>
-            <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
-          </attribute>
-          <xsl:apply-templates select="*"/>
-        </element>
+        <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:choose>
+          <xsl:when test="$field-element != '-'">
+            <element type="multiple-choice">
+              <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
+              <attribute>
+                <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+              </attribute>
+              <xsl:apply-templates select="*"/>
+            </element>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="type">multiple-choice</xsl:attribute>
+            <attribute>
+              <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+            </attribute>
+            <xsl:apply-templates select="*"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:when>
       <xsl:when test="@template:multiple-choice-list-field">
-        <element type="multiple-choice-list">
-          <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-field, ',')"/>
-          <xsl:variable name="field-list-info" select="substring-after(@template:multiple-choice-list-field, ',')"/>
-          <xsl:variable name="field-list-element" select="substring-before($field-list-info, ',')"/>
-          <xsl:variable name="field-list-attr" select="substring-after($field-list-info, ',')"/>
-          <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
-          <attribute>
-            <xsl:attribute name="name"><xsl:value-of select="$field-list-attr"/></xsl:attribute>
-          </attribute>
-          <xsl:apply-templates select="*"/>
-        </element>
+        <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-field, ',')"/>
+        <xsl:variable name="field-list-info" select="substring-after(@template:multiple-choice-list-field, ',')"/>
+        <xsl:variable name="field-list-element" select="substring-before($field-list-info, ',')"/>
+        <xsl:variable name="field-list-attr" select="substring-after($field-list-info, ',')"/>
+        <xsl:choose>
+          <xsl:when test="$field-element != '-'">
+            <element type="multiple-choice-list">
+              <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
+              <attribute>
+                <xsl:attribute name="name"><xsl:value-of select="$field-list-attr"/></xsl:attribute>
+              </attribute>
+              <xsl:apply-templates select="*"/>
+            </element>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="type">multiple-choice-list</xsl:attribute>
+            <attribute>
+              <xsl:attribute name="name"><xsl:value-of select="$field-list-attr"/></xsl:attribute>
+            </attribute>
+            <xsl:apply-templates select="*"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:when>
       <xsl:when test="@template:multiple-choice-value">
         <element type="multiple-choice-value">