# HG changeset patch
# User paulb
# Date 1128300737 0
# Node ID f902076fa4d790f93b9443b20cff501b63c9a578
# Parent  7f8662a8c821607d0c9b3a6bb3b0d9379a03a157
[project @ 2005-10-03 00:52:17 by paulb]
Changed schema and input stylesheet preparation to use the "macro"
attributes, rather than the lower-level attributes - this means that
non-collection elements can be detected and added in the initialisation
process more easily, although this relies on template:selector-field
attributes specifying added elements through a newly added additional
parameter (eg. "add,item").
Introduced better multiple-choice element support.

diff -r 7f8662a8c821 -r f902076fa4d7 XSLForms/XSL/Input.xsl
--- a/XSLForms/XSL/Input.xsl	Mon Oct 03 00:49:15 2005 +0000
+++ b/XSLForms/XSL/Input.xsl	Mon Oct 03 00:52:17 2005 +0000
@@ -44,7 +44,6 @@
   <!-- Match element references. -->
 
   <xsl:template match="element">
-    <xsl:param name="nested">false</xsl:param>
 
     <!-- Make a rule for the element. -->
     <axsl:template match="{@name}">
@@ -57,64 +56,77 @@
 
         <!-- Find elements and determine how to process them. -->
         <xsl:for-each select="element">
-          <xsl:choose>
-            <!-- Enumerations. -->
-            <xsl:when test="@expr">
-              <xsl:call-template name="inside-element"/>
-            </xsl:when>
-            <!-- Top-level or "section" elements are added. -->
-            <xsl:when test="count(attribute) = 0 or $nested = 'false'">
-              <xsl:element name="{@name}">
-                <xsl:call-template name="inside-element"/>
-              </xsl:element>
-            </xsl:when>
-            <!-- Other elements are only added if found. -->
-            <xsl:otherwise>
-              <axsl:apply-templates select="{@name}"/>
-            </xsl:otherwise>
-          </xsl:choose>
+          <xsl:call-template name="process-element"/>
         </xsl:for-each>
-
       </xsl:element>
-
     </axsl:template>
 
     <!-- Make rules for nested elements. -->
-    <xsl:choose>
-      <xsl:when test="$nested = 'true'">
-        <xsl:apply-templates select="*[not(@expr)]">
-          <xsl:with-param name="nested">true</xsl:with-param>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="*/*[not(@expr)]">
-          <xsl:with-param name="nested">true</xsl:with-param>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:for-each select="element">
+      <xsl:call-template name="process-rules"/>
+    </xsl:for-each>
 
   </xsl:template>
 
 
 
-  <!-- Fill in elements. -->
+  <!-- Process elements. -->
+
+  <xsl:template name="process-element">
+    <xsl:param name="path" select="@name"/>
 
-  <xsl:template name="inside-element">
-    <axsl:apply-templates 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="@expr">
+      <xsl:when test="@type='multiple-choice-value' or @type='multiple-choice-list-value'">
         <xsl:call-template name="inside-enumeration"/>
       </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: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>
-        <!-- Enumeration containers. -->
-        <xsl:for-each select="*[@expr]">
-          <xsl:call-template name="inside-element"/>
+        <axsl:apply-templates select="{$path}"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+
+
+  <!-- Process rules. -->
+
+  <xsl:template name="process-rules">
+
+    <!-- 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:for-each select="element">
+          <xsl:call-template name="process-rules"/>
         </xsl:for-each>
-        <!-- Normal elements. -->
-        <xsl:if test="count(element[not(@expr)]) != 0">
-          <axsl:apply-templates select="{@name}/*"/>
-        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="."/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -127,6 +139,11 @@
     <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:attribute name="{@expr-name}">1</axsl:attribute>
+          </axsl:if>
+        </xsl:if>
       </axsl:copy>
     </axsl:for-each>
   </xsl:template>
diff -r 7f8662a8c821 -r f902076fa4d7 XSLForms/XSL/PrepareMacro.xsl
--- a/XSLForms/XSL/PrepareMacro.xsl	Mon Oct 03 00:49:15 2005 +0000
+++ b/XSLForms/XSL/PrepareMacro.xsl	Mon Oct 03 00:52:17 2005 +0000
@@ -5,6 +5,8 @@
 
   <xsl:output indent="yes"/>
 
+  <!-- Input fields. -->
+
   <xsl:template match="*[@template:attribute-field]">
     <xsl:copy>
       <!-- Remove attribute-field and replace name and value. -->
@@ -16,6 +18,20 @@
     </xsl:copy>
   </xsl:template>
 
+  <!-- Text areas and other elements without value attributes. -->
+
+  <xsl:template match="*[@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>
+      <xsl:attribute name="name">{template:this-attribute()}</xsl:attribute>
+      <xsl:apply-templates select="*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Buttons whose state varies according to an attribute. -->
+
   <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, ',')"/>
@@ -30,16 +46,28 @@
     </xsl:copy>
   </xsl:template>
 
+  <!-- Selectors. -->
+
   <xsl:template match="*[@template:selector-field]">
-    <xsl:variable name="field-name" select="@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, ',')"/>
     <xsl:copy>
       <!-- Remove selector-field and replace name. -->
       <xsl:apply-templates select="@*[local-name() != 'selector-field' and local-name() != 'name']"/>
-      <xsl:attribute name="name"><xsl:value-of select="$field-name"/>={template:this-element()}</xsl:attribute>
+      <xsl:choose>
+        <xsl:when test="$field-name != ''">
+          <xsl:attribute name="name"><xsl:value-of select="$field-name"/>={template:this-element()}</xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="name"><xsl:value-of select="@template:selector-field"/>={template:this-element()}</xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:apply-templates select="*|node()"/>
     </xsl:copy>
   </xsl:template>
 
+  <!-- Multiple choice fields, represented by menus and listboxes. -->
+
   <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, ',')"/>
@@ -52,6 +80,25 @@
     </xsl:copy>
   </xsl:template>
 
+  <!-- Multiple choice list fields, represented by menus and listboxes with multiple values. -->
+
+  <xsl:template match="*[@template:multiple-choice-list-field]">
+    <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: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: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()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Multiple choice values, represented by option elements. -->
+
   <xsl:template match="*[@template:multiple-choice-value]">
     <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-value, ',')"/>
     <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-value, ',')"/>
@@ -69,6 +116,25 @@
     </xsl:copy>
   </xsl:template>
 
+  <!-- Multiple choice list values, represented by option elements. -->
+
+  <xsl:template match="*[@template:multiple-choice-list-value]">
+    <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-value, ',')"/>
+    <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-list-value, ',')"/>
+    <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
+    <xsl:variable name="field-set-attr" select="substring-after($field-attr-info, ',')"/>
+    <xsl:copy>
+      <!-- Remove multiple-choice-value and replace value. -->
+      <xsl:apply-templates select="@*[local-name() != 'multiple-choice-list-value' and local-name() != 'value']"/>
+      <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
+      <xsl:attribute name="template:expr">@value-is-set</xsl:attribute>
+      <xsl:attribute name="template:expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+      <xsl:attribute name="template:value">@<xsl:value-of select="$field-attr"/></xsl:attribute>
+      <xsl:attribute name="value">{@<xsl:value-of select="$field-attr"/>}</xsl:attribute>
+      <xsl:apply-templates select="*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
   <!-- Replicate unknown elements. -->
 
   <xsl:template match="@*|node()">
diff -r 7f8662a8c821 -r f902076fa4d7 XSLForms/XSL/Schema.xsl
--- a/XSLForms/XSL/Schema.xsl	Mon Oct 03 00:49:15 2005 +0000
+++ b/XSLForms/XSL/Schema.xsl	Mon Oct 03 00:52:17 2005 +0000
@@ -10,10 +10,8 @@
   <!-- Match the document itself. -->
 
   <xsl:template match="/">
-
     <!-- Process the elements. -->
     <xsl:apply-templates select="*"/>
-
   </xsl:template>
 
 
@@ -50,9 +48,6 @@
     <xsl:param name="remaining-elements"/>
     <element>
       <xsl:attribute name="name"><xsl:value-of select="$first-element"/></xsl:attribute>
-      <xsl:if test="@template:expr">
-        <xsl:attribute name="expr"><xsl:value-of select="@template:expr"/></xsl:attribute>
-      </xsl:if>
       <xsl:choose>
         <xsl:when test="$remaining-elements = ''">
           <xsl:call-template name="enter-attribute"/>
@@ -70,7 +65,7 @@
 
   <!-- Match attributes. -->
 
-  <xsl:template match="*[not(@template:element) and (@template:attribute or @template:expr-attr)]">
+  <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:call-template name="enter-attribute"/>
   </xsl:template>
 
@@ -81,16 +76,92 @@
           <xsl:attribute name="name"><xsl:value-of select="@template:attribute"/></xsl:attribute>
         </attribute>
       </xsl:when>
+      <xsl:when test="@template:attribute-field">
+        <attribute>
+          <xsl:attribute name="name"><xsl:value-of select="@template:attribute-field"/></xsl:attribute>
+        </attribute>
+      </xsl:when>
+      <xsl:when test="@template:attribute-area">
+        <attribute>
+          <xsl:attribute name="name"><xsl:value-of select="@template:attribute-area"/></xsl:attribute>
+        </attribute>
+      </xsl:when>
+      <xsl:when test="@template:attribute-button">
+        <attribute>
+          <xsl:variable name="field-attr" select="substring-before(@template:attribute-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, ',')"/>
+        <selector>
+          <xsl:choose>
+            <xsl:when test="$field-name != ''">
+              <xsl:attribute name="name"><xsl:value-of select="$field-name"/></xsl:attribute>
+              <xsl:attribute name="element"><xsl:value-of select="$affected-element"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="name"><xsl:value-of select="@template:selector-field"/></xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
+        </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: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: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, ',')"/>
+          <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-value, ',')"/>
+          <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
+          <xsl:variable name="field-set-attr" select="substring-after($field-attr-info, ',')"/>
+          <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
+          <xsl:attribute name="expr">@<xsl:value-of select="$field-attr"/> = ../@<xsl:value-of select="$field-attr"/></xsl:attribute>
+          <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+          <attribute>
+            <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+          </attribute>
+        </element>
+      </xsl:when>
+      <xsl:when test="@template:multiple-choice-list-value">
+        <element type="multiple-choice-list-value">
+          <xsl:variable name="field-element" select="substring-before(@template:multiple-choice-list-value, ',')"/>
+          <xsl:variable name="field-attr-info" select="substring-after(@template:multiple-choice-list-value, ',')"/>
+          <xsl:variable name="field-attr" select="substring-before($field-attr-info, ',')"/>
+          <xsl:variable name="field-set-attr" select="substring-after($field-attr-info, ',')"/>
+          <xsl:attribute name="name"><xsl:value-of select="$field-element"/></xsl:attribute>
+          <xsl:attribute name="expr">@value-is-set</xsl:attribute>
+          <!-- Special attribute corresponding with the expression. -->
+          <xsl:attribute name="expr-name">value-is-set</xsl:attribute>
+          <xsl:attribute name="expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>
+          <attribute>
+            <xsl:attribute name="name"><xsl:value-of select="$field-attr"/></xsl:attribute>
+          </attribute>
+        </element>
+      </xsl:when>
       <xsl:otherwise>
-        <xsl:if test="@template:expr-attr">
-          <xsl:attribute name="expr-attr"><xsl:value-of select="@template:expr-attr"/></xsl:attribute>
-        </xsl:if>
-        <xsl:if test="@template:expr">
-          <xsl:attribute name="expr"><xsl:value-of select="@template:expr"/></xsl:attribute>
-        </xsl:if>
-        <xsl:if test="@template:value">
-          <xsl:attribute name="value"><xsl:value-of select="@template:value"/></xsl:attribute>
-        </xsl:if>
         <xsl:apply-templates select="*"/>
       </xsl:otherwise>
     </xsl:choose>