# HG changeset patch
# User paulb
# Date 1103571785 0
# Node ID 6e4c5349853e4070cecc357665554a3b20266dbb
# Parent  3538ac58ecce2e65250d58375892b82539c027db
[project @ 2004-12-20 19:42:59 by paulb]
Changed the "this-position" extension function so that only paths to
elements are returned.
Introduced special variables for attributes ("this-name" and "this-value").

diff -r 3538ac58ecce -r 6e4c5349853e XSLForms/XSL/Prepare.xsl
--- a/XSLForms/XSL/Prepare.xsl	Mon Dec 20 19:42:37 2004 +0000
+++ b/XSLForms/XSL/Prepare.xsl	Mon Dec 20 19:43:05 2004 +0000
@@ -100,9 +100,18 @@
   <xsl:template name="special-values">
     <xsl:choose>
       <xsl:when test="@template:attribute">
-        <axsl:for-each select="@{@template:attribute}">
-          <xsl:call-template name="special-value"/>
-        </axsl:for-each>
+        <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"/>
diff -r 3538ac58ecce -r 6e4c5349853e examples/Common/PEP241/Resources/pep241_template.xhtml
--- a/examples/Common/PEP241/Resources/pep241_template.xhtml	Mon Dec 20 19:42:37 2004 +0000
+++ b/examples/Common/PEP241/Resources/pep241_template.xhtml	Mon Dec 20 19:43:05 2004 +0000
@@ -22,38 +22,38 @@
       </tr>
       <tr>
         <th>Package name</th>
-        <td template:attribute="name">
-          <input name="{template:this-position()}" type="text" value="{string(.)}"/>
-        </td>
+        <td template:attribute="name"><input type="text" size="20"
+          name="{template:this-position()}/{$this-name}" value="{$this-value}" /></td>
       </tr>
     </tbody>
     <tbody template:element="details">
       <tr>
         <th>Package version</th>
-        <td template:attribute="version"><span template:value="string(.)">0.2</span></td>
+        <td template:attribute="version"><input type="text" size="10"
+          name="{template:this-position()}/{$this-name}" value="{$this-value}" /></td>
       </tr>
       <tr>
         <th>Summary</th>
-        <td template:attribute="summary"><span template:value="string(.)" template:effect="replace">An XML-based
-          Web forms processing package.</span></td>
+        <td template:attribute="summary"><span template:value="$this-value" template:effect="replace">An
+          XML-based Web forms processing package.</span></td>
       </tr>
       <tr>
         <th>Description</th>
-        <td template:attribute="description" template:value="string(.)">Insert
+        <td template:attribute="description" template:value="$this-value">Insert
           longer description here!</td>
       </tr>
       <tr template:element="error">
         <th></th>
-        <td template:attribute="size" class="error">Only {size} characters can be used in a
-        description.</td>
+        <td template:attribute="size" class="error">Only {size} characters
+          can be used in a description.</td>
       </tr>
       <tr>
         <th>Home page</th>
-        <td template:attribute="home-page" template:value="string(.)">http://www.boddie.org.uk/python/XMLForms2/index.html</td>
+        <td template:attribute="home-page" template:value="$this-value">http://www.boddie.org.uk/python/XMLForms2/index.html</td>
       </tr>
       <tr>
         <th>Licence</th>
-        <td template:attribute="licence" template:value="string(.)">LGPL</td>
+        <td template:attribute="licence" template:value="$this-value">LGPL</td>
       </tr>
     </tbody>
     <tbody template:element="discriminators">
@@ -64,14 +64,19 @@
         <th>Discriminator</th>
         <td template:element="category">
           <select name="{template:this-position()}">
-            <option template:element="category-enum" value="{@value}"
-              template:expr-attr="selected" template:expr="@value = ../@value" template:value="@value"/>
+            <option template:element="category-enum" template:expr-attr="selected" template:expr="@value = ../@value" template:value="@value"
+            value="{@value}"></option>
           </select>
-          <input type="submit" value="Remove!" name="_action_remove_discriminator={template:this-position()}" /></td>
+           
+          <input type="submit" value="Remove!"
+          name="_action_remove_discriminator={template:this-position()}"
+        /></td>
       </tr>
       <tr>
         <th></th>
-        <td><input type="submit" value="Add discriminator!" name="_action_add_discriminator={template:this-position()}" /></td>
+        <td>
+          <input type="submit" value="Add discriminator!"
+          name="_action_add_discriminator={template:this-position()}" /></td>
       </tr>
     </tbody>
     <tbody template:element="platforms">
@@ -80,13 +85,16 @@
       </tr>
       <tr template:element="platform">
         <th>Platform name</th>
-        <td><span template:attribute="name" template:value=".">Linux (with more listed below)</span>
-          <input type="submit" value="Remove!" name="_action_remove_platform={template:this-position()}" /></td>
+        <td><span template:attribute="name" template:value=".">Linux (with
+          more listed below)</span> 
+          <input type="submit" value="Remove!"
+          name="_action_remove_platform={template:this-position()}" /></td>
       </tr>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add platform!" name="_action_add_platform={template:this-position()}" /></td>
+          <input type="submit" value="Add platform!"
+          name="_action_add_platform={template:this-position()}" /></td>
       </tr>
     </tbody>
     <tbody template:element="supported-platforms">
@@ -95,13 +103,18 @@
       </tr>
       <tr template:element="supported-platform">
         <th>Platform name</th>
-        <td><span template:attribute="name" template:value="string(.)">Linux (with more listed below)</span>
-          <input type="submit" value="Remove!" name="_action_remove_supported_platform={template:this-position()}" /></td>
+        <td><span template:attribute="name" template:value="$this-value">Linux
+          (with more listed below)</span> 
+          <input type="submit" value="Remove!"
+          name="_action_remove_supported_platform={template:this-position()}"
+          /></td>
       </tr>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add platform!" name="_action_add_supported_platform={template:this-position()}" /></td>
+          <input type="submit" value="Add platform!"
+          name="_action_add_supported_platform={template:this-position()}"
+        /></td>
       </tr>
     </tbody>
     <tbody template:element="keywords">
@@ -110,12 +123,16 @@
       </tr>
       <tr template:element="keyword">
         <th>Keyword</th>
-        <td><span template:attribute="name" template:value="string(.)">Web programming</span>
-          <input type="submit" value="Remove!" name="_action_remove_keyword={template:this-position()}" /></td>
+        <td><span template:attribute="name" template:value="$this-value">Web
+          programming</span> 
+          <input type="submit" value="Remove!"
+          name="_action_remove_keyword={template:this-position()}" /></td>
       </tr>
       <tr>
         <th></th>
-        <td><input type="submit" value="Add keyword!" name="_action_add_keyword={template:this-position()}" /></td>
+        <td>
+          <input type="submit" value="Add keyword!"
+          name="_action_add_keyword={template:this-position()}" /></td>
       </tr>
     </tbody>
     <tbody>
@@ -126,22 +143,27 @@
     <tbody template:element="authors,author">
       <tr>
         <th>Author name</th>
-        <td><span template:attribute="name" template:value="string(.)">Paul Boddie</span>
-          <input type="submit" value="Remove!" name="_action_remove_author={template:this-position()}" /></td>
+        <td><span template:attribute="name" template:value="$this-value">Paul
+          Boddie</span> 
+          <input type="submit" value="Remove!"
+          name="_action_remove_author={template:this-position()}" /></td>
       </tr>
       <tr>
         <th>Author contact</th>
-        <td template:attribute="contact" template:value="string(.)">Oslo, Norway</td>
+        <td template:attribute="contact" template:value="$this-value">Oslo,
+          Norway</td>
       </tr>
       <tr>
         <th>Author e-mail</th>
-        <td template:attribute="e-mail" template:value="string(.)">paul@boddie.org.uk</td>
+        <td template:attribute="e-mail" template:value="$this-value">paul@boddie.org.uk</td>
       </tr>
     </tbody>
     <tbody>
       <tr>
         <th></th>
-        <td><input type="submit" value="Add author!" name="_action_add_author={template:this-position()}" /></td>
+        <td>
+          <input type="submit" value="Add author!"
+          name="_action_add_author={template:this-position()}" /></td>
       </tr>
     </tbody>
     <tbody>
@@ -152,19 +174,21 @@
     <tbody template:element="dependencies,dependency">
       <tr>
         <th>Package name</th>
-        <td><span template:attribute="name" template:value="string(.)">XMLTools2</span>
-          <input type="submit" value="Remove!" name="_action_remove_dependency={template:this-position()}" /></td>
+        <td><span template:attribute="name" template:value="$this-value">XMLTools2</span> 
+          <input type="submit" value="Remove!"
+          name="_action_remove_dependency={template:this-position()}" /></td>
       </tr>
       <tr>
         <th>Package version</th>
-        <td template:attribute="version" template:value="string(.)">0.2</td>
+        <td template:attribute="version" template:value="$this-value">0.2</td>
       </tr>
     </tbody>
     <tbody>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add dependency!" name="_action_add_dependency={template:this-position()}" /></td>
+          <input type="submit" value="Add dependency!"
+          name="_action_add_dependency={template:this-position()}" /></td>
       </tr>
     </tbody>
     <tbody>