# HG changeset patch
# User paulb
# Date 1128183919 0
# Node ID 0bb446b55d084424143b39cf7726fd4c07865c1d
# Parent  8b1d37dd5dd9793c42b1e2f3e244f624f100c4e0
[project @ 2005-10-01 16:25:19 by paulb]
Introduced attribute replacement so that name and value attributes may be
specified in the template but replaced in the output with the generated
attribute values.

diff -r 8b1d37dd5dd9 -r 0bb446b55d08 XSLForms/XSL/PrepareMacro.xsl
--- a/XSLForms/XSL/PrepareMacro.xsl	Sat Oct 01 16:24:46 2005 +0000
+++ b/XSLForms/XSL/PrepareMacro.xsl	Sat Oct 01 16:25:19 2005 +0000
@@ -7,7 +7,8 @@
 
   <xsl:template match="*[@template:attribute-field]">
     <xsl:copy>
-      <xsl:apply-templates select="@*[local-name() != 'attribute-field']"/>
+      <!-- Remove attribute-field and replace name and value. -->
+      <xsl:apply-templates select="@*[local-name() != 'attribute-field' and local-name() != 'name' and local-name() != 'value']"/>
       <xsl:attribute name="template:attribute"><xsl:value-of select="@template:attribute-field"/></xsl:attribute>
       <xsl:attribute name="name">{template:this-attribute()}</xsl:attribute>
       <xsl:attribute name="value">{$this-value}</xsl:attribute>
@@ -18,7 +19,8 @@
   <xsl:template match="*[@template:selector-field]">
     <xsl:variable name="field-name" select="@template:selector-field"/>
     <xsl:copy>
-      <xsl:apply-templates select="@*[local-name() != 'selector-field']"/>
+      <!-- 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:apply-templates select="*|node()"/>
     </xsl:copy>
@@ -28,7 +30,8 @@
     <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:copy>
-      <xsl:apply-templates select="@*[local-name() != 'multiple-choice-field']"/>
+      <!-- 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:attribute name="name">{template:new-attribute('<xsl:value-of select="$field-attr"/>')}</xsl:attribute>
       <xsl:apply-templates select="*|node()"/>
@@ -41,7 +44,8 @@
     <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>
-      <xsl:apply-templates select="@*[local-name() != 'multiple-choice-value']"/>
+      <!-- Remove multiple-choice-value and replace value. -->
+      <xsl:apply-templates select="@*[local-name() != 'multiple-choice-value' and local-name() != 'value']"/>
       <xsl:attribute name="template:element"><xsl:value-of select="$field-element"/></xsl:attribute>
       <xsl:attribute name="template:expr">@<xsl:value-of select="$field-attr"/> = ../@<xsl:value-of select="$field-attr"/></xsl:attribute>
       <xsl:attribute name="template:expr-attr"><xsl:value-of select="$field-set-attr"/></xsl:attribute>