# HG changeset patch
# User paulb
# Date 1128300859 0
# Node ID 5c65b83d5d31781a76a9c5506e312d3fbf039f31
# Parent  03cee0e46a02574b5314b20dbc3b4352403730b5
[project @ 2005-10-03 00:54:19 by paulb]
Introduced "macro" attributes to provide support for the input/initialiser
stylesheets now in use.
Changed the root element of the types document.
Removed the old types stylesheets.

diff -r 03cee0e46a02 -r 5c65b83d5d31 examples/Common/VerySimple/Resources/structure_multivalue_template.xhtml
--- a/examples/Common/VerySimple/Resources/structure_multivalue_template.xhtml	Mon Oct 03 00:53:24 2005 +0000
+++ b/examples/Common/VerySimple/Resources/structure_multivalue_template.xhtml	Mon Oct 03 00:54:19 2005 +0000
@@ -15,25 +15,24 @@
 
 <div template:element="item">
   <p>
-    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" />
+    Some item: <input template:attribute-field="value" name="..." type="text" value="..." />
+    <input template:selector-field="remove" name="..." type="submit" value="Remove" />
   </p>
   <p>
     Item type:
-    <select template:element="type" name="{template:list-attribute('type-enum', 'value')}" multiple="multiple"
+    <select template:multiple-choice-list-field="type,type-enum,value" name="..." multiple="multiple"
       onchange="requestUpdate(
         'comments',
         '{template:list-attribute('type-enum', 'value')}',
         '{template:other-elements(../options)}',
         '{template:child-attribute('value', template:child-element('comment', 1, template:other-elements(../options)))}',
         '/structure/item/options')">
-      <option template:element="type-enum" template:expr="@value-is-set" template:expr-attr="selected"
-        template:value="@value" value="{@value}" />
+      <option template:multiple-choice-list-value="type-enum,value,selected" />
     </select>
   </p>
   <p template:element="options" template:id="comment-node" id="{template:this-element()}">
     <span template:element="comment">Comment:
-      <textarea template:attribute="value" name="{template:this-attribute()}" cols="40" rows="3">
+      <textarea template:attribute-area="value" name="..." cols="40" rows="3">
         <span template:value="$this-value" template:effect="replace">Some comment</span>
       </textarea>
     </span>
@@ -42,15 +41,15 @@
     Itself containing more items:
   </p>
   <p template:element="subitem">
-    Sub-item: <input template:attribute="subvalue" name="{template:this-attribute()}" type="text" value="{$this-value}" />
-    <input name="remove2={template:this-element()}" type="submit" value="Remove" />
+    Sub-item: <input template:attribute-field="subvalue" name="..." type="text" value="..." />
+    <input template:selector-field="remove2" name="..." type="submit" value="Remove" />
   </p>
   <p>
-    <input name="add2={template:this-element()}" type="submit" value="Add subitem" />
+    <input template:selector-field="add2,subitem" name="..." type="submit" value="Add subitem" />
   </p>
 </div>
 <p>
-  <input name="add={template:this-element()}" type="submit" value="Add item" />
+  <input template:selector-field="add,item" name="..." type="submit" value="Add item" />
 </p>
 <p>
   <input name="update" type="submit" value="Update" />
diff -r 03cee0e46a02 -r 5c65b83d5d31 examples/Common/VerySimple/Resources/structure_multivalue_types.xsl
--- a/examples/Common/VerySimple/Resources/structure_multivalue_types.xsl	Mon Oct 03 00:53:24 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:template="http://www.boddie.org.uk/ns/xmltools/template"
-                version="1.0">
-
-  <xsl:param name="types"/>
-
-  <!-- Add or process type elements inside item elements. -->
-
-  <xsl:template match="item">
-    <!-- Copy the element and its contents. -->
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <!-- Look for a type element. -->
-      <xsl:call-template name="type"/>
-      <xsl:apply-templates select="*[local-name() != 'type']"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- Investigate type elements. -->
-
-  <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. -->
-
-  <xsl:template name="type-enum">
-    <xsl:param name="values"/>
-    <!-- Find all values in the range and add them. -->
-    <xsl:for-each select="$types/types/type-enum">
-      <xsl:copy>
-        <xsl:apply-templates select="@*"/>
-        <!-- Mark those whose value are the same as that found on the element. -->
-        <xsl:if test="$values[string() = current()/@value]">
-          <xsl:attribute name="value-is-set">true</xsl:attribute>
-        </xsl:if>
-      </xsl:copy>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Replicate unknown elements. -->
-
-  <xsl:template match="@*|*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff -r 03cee0e46a02 -r 5c65b83d5d31 examples/Common/VerySimple/Resources/structure_template.xhtml
--- a/examples/Common/VerySimple/Resources/structure_template.xhtml	Mon Oct 03 00:53:24 2005 +0000
+++ b/examples/Common/VerySimple/Resources/structure_template.xhtml	Mon Oct 03 00:54:19 2005 +0000
@@ -13,29 +13,28 @@
 
 <div template:element="item">
   <p>
-    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" />
+    Some item: <input template:attribute-field="value" name="..." type="text" value="..." />
+    <input template:selector-field="remove" name="..." type="submit" value="Remove" />
   </p>
   <p>
     Item type:
-    <select template:element="type" name="{template:new-attribute('value')}">
-      <option template:element="type-enum" template:expr="@value = ../@value" template:expr-attr="selected"
-        template:value="@value" value="{@value}" />
+    <select template:multiple-choice-field="type,value" name="...">
+      <option template:multiple-choice-value="type-enum,value,selected" value="..." />
     </select>
   </p>
   <p>
     Itself containing more items:
   </p>
   <p template:element="subitem">
-    Sub-item: <input template:attribute="subvalue" name="{template:this-attribute()}" type="text" value="{$this-value}" />
-    <input name="remove2={template:this-element()}" type="submit" value="Remove" />
+    Sub-item: <input template:attribute-field="subvalue" name="..." type="text" value="..." />
+    <input template:selector-field="remove2" name="..." type="submit" value="Remove" />
   </p>
   <p>
-    <input name="add2={template:this-element()}" type="submit" value="Add subitem" />
+    <input template:selector-field="add2,subitem" name="..." type="submit" value="Add subitem" />
   </p>
 </div>
 <p>
-  <input name="add={template:this-element()}" type="submit" value="Add item" />
+  <input template:selector-field="add,item" name="..." type="submit" value="Add item" />
 </p>
 
 <!-- Template text between the interesting part and the end. -->
diff -r 03cee0e46a02 -r 5c65b83d5d31 examples/Common/VerySimple/Resources/structure_types.xml
--- a/examples/Common/VerySimple/Resources/structure_types.xml	Mon Oct 03 00:53:24 2005 +0000
+++ b/examples/Common/VerySimple/Resources/structure_types.xml	Mon Oct 03 00:54:19 2005 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<types>
+<type>
   <type-enum value="(Not selected)"/>
   <type-enum value="Important"/>
   <type-enum value="Not important"/>
   <type-enum value="Personal"/>
-</types>
+</type>
diff -r 03cee0e46a02 -r 5c65b83d5d31 examples/Common/VerySimple/Resources/structure_types.xsl
--- a/examples/Common/VerySimple/Resources/structure_types.xsl	Mon Oct 03 00:53:24 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:param name="types"/>
-
-  <!-- Add or process type elements inside item elements. -->
-
-  <xsl:template match="item">
-    <!-- Copy the element and its contents. -->
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <!-- Look for a type element. -->
-      <xsl:call-template name="type"/>
-      <xsl:apply-templates select="*[local-name() != 'type']"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- Investigate type elements. -->
-
-  <xsl:template name="type">
-    <!-- Make the element. -->
-    <type>
-      <xsl:apply-templates select="type/@*"/>
-      <xsl:call-template name="type-enum"/>
-    </type>
-  </xsl:template>
-
-  <!-- Add to type elements the range of acceptable values. -->
-
-  <xsl:template name="type-enum">
-    <!-- Find all values in the range and add them. -->
-    <xsl:for-each select="$types/types/type-enum">
-      <xsl:copy>
-        <xsl:apply-templates select="@*"/>
-      </xsl:copy>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Replicate unknown elements. -->
-
-  <xsl:template match="@*|*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>