# HG changeset patch
# User paulb
# Date 1121962610 0
# Node ID 7957676261c6037dcb0ca4b8bab7b65011c58a43
# Parent  cab7e42843628716cfa1b6c0bad87752f5834923
[project @ 2005-07-21 16:16:50 by paulb]
Changed the usage of list-attribute, updating the types transformation
accordingly. Simplified the single-valued types transformation, too.

diff -r cab7e4284362 -r 7957676261c6 examples/Common/VerySimple/Resources/structure_multivalue_template.xhtml
--- a/examples/Common/VerySimple/Resources/structure_multivalue_template.xhtml	Thu Jul 21 16:16:07 2005 +0000
+++ b/examples/Common/VerySimple/Resources/structure_multivalue_template.xhtml	Thu Jul 21 16:16:50 2005 +0000
@@ -16,9 +16,9 @@
     Some item: <input template:attribute="value" name="{template:this-attribute()}" type="text" value="{$this-value}" />
     <input name="remove={template:this-element()}" type="submit" value="Remove" />
   </p>
-  <p template:element="types">
+  <p>
     Item type:
-    <select template:element="type" name="{template:list-attribute('value')}" multiple="multiple">
+    <select template:element="type" name="{template:list-attribute('type-enum', 'value')}" multiple="multiple">
       <option template:element="type-enum" template:expr="@value-is-set" template:expr-attr="selected"
         template:value="@value" value="{@value}" />
     </select>
diff -r cab7e4284362 -r 7957676261c6 examples/Common/VerySimple/Resources/structure_multivalue_types.xsl
--- a/examples/Common/VerySimple/Resources/structure_multivalue_types.xsl	Thu Jul 21 16:16:07 2005 +0000
+++ b/examples/Common/VerySimple/Resources/structure_multivalue_types.xsl	Thu Jul 21 16:16:50 2005 +0000
@@ -11,25 +11,23 @@
     <!-- Copy the element and its contents. -->
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
-      <!-- Look for a types element. -->
-      <xsl:call-template name="types"/>
-      <xsl:apply-templates select="*[local-name() != 'types']"/>
+      <!-- Look for a type element. -->
+      <xsl:call-template name="type"/>
+      <xsl:apply-templates select="*[local-name() != 'type']"/>
     </xsl:copy>
   </xsl:template>
 
-  <!-- Investigate types elements. -->
+  <!-- Investigate type elements. -->
 
-  <xsl:template name="types">
-    <!-- Make the elements. -->
-    <types>
-      <type>
-        <!-- Look for type element values. -->
-        <xsl:call-template name="type-enum">
-          <!-- Supply the existing type values. -->
-          <xsl:with-param name="values" select="types/type/@value"/>
-        </xsl:call-template>
-      </type>
-    </types>
+  <xsl:template name="type">
+    <!-- Make the element. -->
+    <type>
+      <!-- Look for type element values. -->
+      <xsl:call-template name="type-enum">
+        <!-- Supply the existing type-enum values. -->
+        <xsl:with-param name="values" select="type/type-enum/@value"/>
+      </xsl:call-template>
+    </type>
   </xsl:template>
 
   <!-- Add to type elements the range of acceptable values. -->
diff -r cab7e4284362 -r 7957676261c6 examples/Common/VerySimple/Resources/structure_types.xsl
--- a/examples/Common/VerySimple/Resources/structure_types.xsl	Thu Jul 21 16:16:07 2005 +0000
+++ b/examples/Common/VerySimple/Resources/structure_types.xsl	Thu Jul 21 16:16:50 2005 +0000
@@ -11,16 +11,7 @@
     <xsl:copy>
       <xsl:apply-templates select="@*"/>
       <!-- Look for a type element. -->
-      <xsl:choose>
-        <xsl:when test="type">
-          <!-- Use the existing type element. -->
-          <xsl:apply-templates select="type"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- Add a type element if none was found. -->
-          <xsl:call-template name="type"/>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="type"/>
       <xsl:apply-templates select="*[local-name() != 'type']"/>
     </xsl:copy>
   </xsl:template>
@@ -30,25 +21,14 @@
   <xsl:template name="type">
     <!-- Make the element. -->
     <type>
+      <xsl:apply-templates select="type/@*"/>
       <xsl:call-template name="type-enum"/>
     </type>
   </xsl:template>
 
-  <xsl:template match="type">
-    <!-- Copy the element. -->
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:call-template name="type-enum">
-        <!-- Use the value of the element. -->
-        <xsl:with-param name="value" select="@value"/>
-      </xsl:call-template>
-    </xsl:copy>
-  </xsl:template>
-
   <!-- Add to type elements the range of acceptable values. -->
 
   <xsl:template name="type-enum">
-    <xsl:param name="value"/>
     <!-- Find all values in the range and add them. -->
     <xsl:for-each select="$types/types/type-enum">
       <xsl:copy>