# HG changeset patch
# User paulb
# Date 1121704974 0
# Node ID e0767d12a038218dc1f299eee99e739cf9d6df09
# Parent  5bfdc16d4a915f032db39b8858d7517d97b12e7b
[project @ 2005-07-18 16:42:54 by paulb]
Introduced a modified template preparation scheme which should allow
elements with template:attribute defined to also use the special values and
notations to immediately map to the underlying attribute and to access the
attribute's value.

diff -r 5bfdc16d4a91 -r e0767d12a038 XSLForms/XSL/Prepare.xsl
--- a/XSLForms/XSL/Prepare.xsl	Mon Jul 18 16:41:12 2005 +0000
+++ b/XSLForms/XSL/Prepare.xsl	Mon Jul 18 16:42:54 2005 +0000
@@ -66,7 +66,7 @@
     <axsl:for-each select="{$first-element}">
       <xsl:choose>
         <xsl:when test="$remaining-elements = ''">
-          <xsl:call-template name="special-attributes"/>
+          <xsl:call-template name="enter-attribute"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:call-template name="enter-element">
@@ -82,13 +82,35 @@
   <!-- Match special expression attributes. -->
 
   <xsl:template match="*[not(@template:element) and (@template:attribute or @template:value or @template:expr)]">
-    <xsl:call-template name="special-attributes"/>
+    <xsl:call-template name="enter-attribute"/>
+  </xsl:template>
+
+  <xsl:template name="enter-attribute">
+    <xsl:choose>
+      <xsl:when test="@template:attribute">
+        <axsl:choose>
+          <axsl:when test="@{@template:attribute}">
+            <axsl:variable name="this-name"><xsl:value-of select="@template:attribute"/></axsl:variable>
+            <axsl:variable name="this-value" select="@{@template:attribute}"/>
+            <xsl:call-template name="special-attributes"/>
+          </axsl:when>
+          <axsl:otherwise>
+            <axsl:variable name="this-name"><xsl:value-of select="@template:attribute"/></axsl:variable>
+            <axsl:variable name="this-value"></axsl:variable>
+            <xsl:call-template name="special-attributes"/>
+          </axsl:otherwise>
+        </axsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="special-attributes"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template name="special-attributes">
     <xsl:choose>
       <xsl:when test="@template:effect = 'replace'">
-        <xsl:call-template name="special-values"/>
+        <xsl:call-template name="special-value"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:copy>
@@ -98,34 +120,12 @@
               <axsl:attribute name="{@template:expr-attr}"><xsl:value-of select="@template:expr-attr"/></axsl:attribute>
             </axsl:if>
           </xsl:if>
-          <xsl:call-template name="special-values"/>
+          <xsl:call-template name="special-value"/>
         </xsl:copy>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="special-values">
-    <xsl:choose>
-      <xsl:when test="@template:attribute">
-        <axsl:choose>
-          <axsl:when test="@{@template:attribute}">
-            <axsl:variable name="this-name"><xsl:value-of select="@template:attribute"/></axsl:variable>
-            <axsl:variable name="this-value" select="@{@template:attribute}"/>
-            <xsl:call-template name="special-value"/>
-          </axsl:when>
-          <axsl:otherwise>
-            <axsl:variable name="this-name"><xsl:value-of select="@template:attribute"/></axsl:variable>
-            <axsl:variable name="this-value"></axsl:variable>
-            <xsl:call-template name="special-value"/>
-          </axsl:otherwise>
-        </axsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="special-value"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
   <xsl:template name="special-value">
     <xsl:choose>
       <xsl:when test="@template:value">