Rename xsl:accumulator-rule/@new-value as @select
authorMichael Kay <mike@saxonica.com>
Fri, 01 Aug 2014 22:24:15 +0100
changeset 586 fe0d05b1a577
parent 584 4952aa6482b0
child 587 06fbe545f76b
Rename xsl:accumulator-rule/@new-value as @select
report/all-test-xsl.xml
tests/decl/accumulator/_accumulator-test-set.xml
tests/decl/accumulator/accumulator-001.xsl
tests/decl/accumulator/accumulator-003.xsl
tests/decl/accumulator/accumulator-005.xsl
tests/decl/accumulator/accumulator-007.xsl
tests/decl/accumulator/accumulator-009.xsl
tests/decl/accumulator/accumulator-010.xsl
tests/decl/accumulator/accumulator-012.xsl
tests/decl/accumulator/accumulator-014.xsl
tests/decl/accumulator/accumulator-015.xsl
tests/decl/accumulator/accumulator-020.xsl
tests/decl/accumulator/accumulator-023.xsl
tests/decl/accumulator/accumulator-023a.xsl
tests/decl/accumulator/accumulator-025.xsl
tests/decl/accumulator/accumulator-026.xsl
tests/decl/accumulator/accumulator-027.xsl
tests/decl/accumulator/accumulator-027a.xsl
tests/decl/accumulator/accumulator-028.xsl
tests/decl/accumulator/accumulator-029.xsl
tests/decl/accumulator/accumulator-030.xsl
tests/decl/accumulator/accumulator-031.xsl
tests/decl/accumulator/accumulator-032.xsl
tests/decl/accumulator/accumulator-033.xsl
tests/decl/accumulator/accumulator-034.xsl
tests/decl/accumulator/accumulator-035.xsl
tests/misc/catalog/schema-for-xslt30.xsd
--- a/report/all-test-xsl.xml	Fri Aug 01 15:29:49 2014 +0200
+++ b/report/all-test-xsl.xml	Fri Aug 01 22:24:15 2014 +0100
@@ -37308,8 +37308,8 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -37342,8 +37342,8 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -37376,9 +37376,9 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-            <xsl:accumulator-rule match="diag" new-value="5"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
+            <xsl:accumulator-rule match="diag" select="5"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -37414,9 +37414,9 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-            <xsl:accumulator-rule match="diag" new-value="5"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
+            <xsl:accumulator-rule match="diag" select="5"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -37452,9 +37452,9 @@
                           as="xs:decimal"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-            <xsl:accumulator-rule match="diag" new-value="$value + 0.5"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
+            <xsl:accumulator-rule match="diag" select="$value + 0.5"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -37489,9 +37489,9 @@
                           as="xs:decimal"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-            <xsl:accumulator-rule match="diag" new-value="$value + 0.5"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
+            <xsl:accumulator-rule match="diag" select="$value + 0.5"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -37530,7 +37530,7 @@
                           _initial-value="{$initial-count}"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum"
@@ -37538,7 +37538,7 @@
                           initial-value="0"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -37547,7 +37547,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -37556,7 +37556,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -37592,7 +37592,7 @@
                           _initial-value="{$initial-count}"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum"
@@ -37600,7 +37600,7 @@
                           initial-value="0"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -37609,7 +37609,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -37618,7 +37618,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -37650,11 +37650,11 @@
          <xsl:output method="xml" indent="yes"/>
     
          <xsl:accumulator name="count" as="xs:integer" initial-value="0" streamable="yes">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum" as="xs:double" initial-value="0" streamable="yes">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -37662,7 +37662,7 @@
                           initial-value="999999999999"
                           streamable="yes">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -37670,7 +37670,7 @@
                           initial-value="-999999999999"
                           streamable="yes">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -37703,8 +37703,8 @@
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="section"
                                   phase="start"
-                                  new-value="0, head($value)+1, tail($value)"/>
-            <xsl:accumulator-rule match="section" phase="end" new-value="tail($value) (:pop:)"/>
+                                  select="0, head($value)+1, tail($value)"/>
+            <xsl:accumulator-rule match="section" phase="end" select="tail($value) (:pop:)"/>
          </xsl:accumulator>
 
 
@@ -37745,8 +37745,8 @@
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="section"
                                   phase="start"
-                                  new-value="0, head($value)+1, tail($value)"/>
-            <xsl:accumulator-rule match="section" phase="end" new-value="tail($value) (:pop:)"/>
+                                  select="0, head($value)+1, tail($value)"/>
+            <xsl:accumulator-rule match="section" phase="end" select="tail($value) (:pop:)"/>
          </xsl:accumulator>
 
 
@@ -37785,7 +37785,7 @@
                           as="xs:string"
                           initial-value="''"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="section/p/text()" new-value="string(.)"/>
+            <xsl:accumulator-rule match="section/p/text()" select="string(.)"/>
          </xsl:accumulator>
 
 
@@ -37817,7 +37817,7 @@
                           as="xs:string"
                           initial-value="''"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="section/p/text()" new-value="string(.)"/>
+            <xsl:accumulator-rule match="section/p/text()" select="string(.)"/>
          </xsl:accumulator>
 
 
@@ -37846,9 +37846,9 @@
          <xsl:param name="increment" select="0"/>
 
          <xsl:accumulator name="figNr" as="xs:integer" initial-value="0" streamable="no">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
             <xsl:accumulator-rule match="fig"
-                                  new-value="$value + (let $value := $increment + 1 return $value)"/>
+                                  select="$value + (let $value := $increment + 1 return $value)"/>
          </xsl:accumulator>
 
          <xsl:mode streamable="no" on-no-match="shallow-skip"/>
@@ -37880,7 +37880,7 @@
                           streamable="yes"
                           as="xs:integer"
                           initial-value="0">
-            <xsl:accumulator-rule match="cost/text()" new-value="$value + xs:integer(.)"/>
+            <xsl:accumulator-rule match="cost/text()" select="$value + xs:integer(.)"/>
          </xsl:accumulator>
    
          <!-- The void xsl:for-each in the template below is designed to sow confusion. Although it does nothing useful,
@@ -37918,7 +37918,7 @@
                           _initial-value="{$initial-count}"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum"
@@ -37926,7 +37926,7 @@
                           initial-value="0"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -37935,7 +37935,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -37944,7 +37944,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -37982,7 +37982,7 @@
                           _initial-value="{$initial-count}"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum"
@@ -37990,7 +37990,7 @@
                           initial-value="0"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -37999,7 +37999,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -38008,7 +38008,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -38046,7 +38046,7 @@
                           _initial-value="{$initial-count}"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum"
@@ -38054,7 +38054,7 @@
                           initial-value="0"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -38063,7 +38063,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -38072,7 +38072,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -38110,7 +38110,7 @@
                           _initial-value="{$initial-count}"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="transaction" select="$value + 1"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="sum"
@@ -38118,7 +38118,7 @@
                           initial-value="0"
                           applies-to="transactions"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+            <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="min"
@@ -38127,7 +38127,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &lt; $value) then @amount else $value"/>
+                                  select="if (@amount &lt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
          <xsl:accumulator name="max"
@@ -38136,7 +38136,7 @@
                           _applies-to="{$applies-to}"
                           _streamable="{$streamable}">
             <xsl:accumulator-rule match="transaction"
-                                  new-value="if (@amount &gt; $value) then @amount else $value"/>
+                                  select="if (@amount &gt; $value) then @amount else $value"/>
          </xsl:accumulator>
    
    
@@ -38168,13 +38168,13 @@
          <xsl:param name="two" static="yes" select="'two'"/>
 
          <xsl:accumulator _name="{$one}" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
   
          <xsl:accumulator _name="{$two}" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
 
          <xsl:mode on-no-match="shallow-skip"/>
@@ -38207,13 +38207,13 @@
          <xsl:param name="two" static="yes" select="'two'"/>
 
          <xsl:accumulator _name="{$one}" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
   
          <xsl:accumulator _name="{$two}" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
 
          <xsl:mode on-no-match="shallow-skip"/>
@@ -38248,13 +38248,13 @@
          <xsl:param name="two" static="yes" select="'two'"/>
 
          <xsl:accumulator _name="{$one}" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
   
          <xsl:accumulator _name="{$two}" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
          </xsl:accumulator>
 
          <xsl:mode on-no-match="shallow-skip"/>
@@ -38283,8 +38283,8 @@
          <xsl:import href="accumulator-023a.xsl"/>
 
          <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38339,8 +38339,8 @@
          <xsl:import href="accumulator-023a.xsl"/>
 
          <xsl:accumulator name="a" as="xs:integer">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38371,9 +38371,9 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-            <xsl:accumulator-rule match="@alt" new-value="$value + 100000"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 1"/>
+            <xsl:accumulator-rule match="@alt" select="$value + 100000"/>
          </xsl:accumulator>
 
          <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
@@ -38402,8 +38402,8 @@
          <xsl:import href="accumulator-027a.xsl"/>
 
          <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38436,8 +38436,8 @@
                           initial-value="0"
                           applies-to="doc[chap]"
                           streamable="yes">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38470,8 +38470,8 @@
                           initial-value="0"
                           applies-to="doc[chap]"
                           streamable="yes">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig[caption]" new-value="$value + 2"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig[caption]" select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38504,8 +38504,8 @@
                           initial-value="0"
                           applies-to="doc[chap]"
                           streamable="yes">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + string-length(caption)"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + string-length(caption)"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38570,8 +38570,8 @@
          <xsl:mode streamable="no" on-no-match="shallow-skip"/>
   
          <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
-            <xsl:accumulator-rule match="fig" new-value="$value + $count"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
+            <xsl:accumulator-rule match="fig" select="$value + $count"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38605,9 +38605,9 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap[not(@nr = $seven)]" new-value="0"/>
+            <xsl:accumulator-rule match="chap[not(@nr = $seven)]" select="0"/>
             <xsl:accumulator-rule match="fig[every $n in data(@*) satisfies $n = '83']"
-                                  new-value="$value + 2"/>
+                                  select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38641,9 +38641,9 @@
                           as="xs:integer"
                           initial-value="0"
                           _streamable="{$streamable}">
-            <xsl:accumulator-rule match="chap[not(@nr = $seven)]" new-value="0"/>
+            <xsl:accumulator-rule match="chap[not(@nr = $seven)]" select="0"/>
             <xsl:accumulator-rule match="fig[every $n in data(@*) satisfies $n = '83']"
-                                  new-value="$value + 2"/>
+                                  select="$value + 2"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
@@ -38667,7 +38667,7 @@
                       exclude-result-prefixes="xs"
                       version="3.0">
 
-  <!-- Local variables in initial-value and new-value expressions -->
+  <!-- Local variables in initial-value and select expressions -->
   
          <xsl:mode streamable="yes" on-no-match="shallow-skip"/>
   
@@ -38675,9 +38675,9 @@
                           as="xs:integer"
                           initial-value="min(for $i in $zero to 5 return $i*2)"
                           streamable="yes">
-            <xsl:accumulator-rule match="chap" new-value="0"/>
+            <xsl:accumulator-rule match="chap" select="0"/>
             <xsl:accumulator-rule match="fig"
-                                  new-value="$value + min(for $i in ($zero+1) to 5 return $i*2)"/>
+                                  select="$value + min(for $i in ($zero+1) to 5 return $i*2)"/>
          </xsl:accumulator>
   
          <xsl:template match="fig">
--- a/tests/decl/accumulator/_accumulator-test-set.xml	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/_accumulator-test-set.xml	Fri Aug 01 22:24:15 2014 +0100
@@ -511,7 +511,7 @@
    </test-case>
    
    <test-case name="accumulator-030s">
-      <description>Pattern declared streamable, but accumulator-rule/@new-value is not motionless</description>
+      <description>Pattern declared streamable, but accumulator-rule/@select is not motionless</description>
       <created by="Michael Kay" on="2014-07-07"/>
       <environment ref="accumulator-004s"/>
       <dependencies>
@@ -573,7 +573,7 @@
    </test-case>
    
    <test-case name="accumulator-033s">
-      <description>Accumulator @new-value uses global variable</description>
+      <description>Accumulator @select uses global variable</description>
       <created by="Michael Kay" on="2014-07-07"/>
       <environment>
          <source role="." file="accumulator-001.xml" streaming="true"/>
@@ -623,7 +623,7 @@
    </test-case>
    
    <test-case name="accumulator-035s">
-      <description>Local variables in initial-value and new-value expressions</description>
+      <description>Local variables in initial-value and select expressions</description>
       <created by="Michael Kay" on="2014-07-07"/>
       <environment>
          <source role="." file="accumulator-001.xml" streaming="true"/>
--- a/tests/decl/accumulator/accumulator-001.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-001.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:param name="streamable" static="yes" select="'no'"/>
 
   <xsl:accumulator name="figNr" as="xs:integer" initial-value="0" _streamable="{$streamable}">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
   </xsl:accumulator>
 
   <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-003.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-003.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,9 +8,9 @@
   <xsl:param name="streamable" static="yes" select="'no'"/>
 
   <xsl:accumulator name="figNr" as="xs:integer" initial-value="0" _streamable="{$streamable}">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-    <xsl:accumulator-rule match="diag" new-value="5"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
+    <xsl:accumulator-rule match="diag" select="5"/>
   </xsl:accumulator>
 
   <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-005.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-005.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -9,9 +9,9 @@
 
   <xsl:accumulator name="f:figNr" as="xs:decimal" initial-value="0"
     _streamable="{$streamable}">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-    <xsl:accumulator-rule match="diag" new-value="$value + 0.5"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
+    <xsl:accumulator-rule match="diag" select="$value + 0.5"/>
   </xsl:accumulator>
 
   <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-007.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-007.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -14,22 +14,22 @@
     
    <xsl:accumulator name="count"  as="xs:integer" _initial-value="{$initial-count}" 
    					applies-to="transactions" _streamable="{$streamable}">
-     <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+     <xsl:accumulator-rule match="transaction" select="$value + 1"/>
    </xsl:accumulator>
    
    <xsl:accumulator name="sum"  as="xs:double" initial-value="0" 
    					applies-to="transactions" _streamable="{$streamable}">
-     <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+     <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
    </xsl:accumulator>
    
    <xsl:accumulator name="min"  as="xs:double" initial-value="999999999999" 
    					_applies-to="{$applies-to}" _streamable="{$streamable}">
-     <xsl:accumulator-rule match="transaction" new-value="if (@amount &lt; $value) then @amount else $value"/>
+     <xsl:accumulator-rule match="transaction" select="if (@amount &lt; $value) then @amount else $value"/>
    </xsl:accumulator>
    
    <xsl:accumulator name="max" as="xs:double" initial-value="-999999999999" 
    					_applies-to="{$applies-to}" _streamable="{$streamable}">
-     <xsl:accumulator-rule match="transaction" new-value="if (@amount &gt; $value) then @amount else $value"/>
+     <xsl:accumulator-rule match="transaction" select="if (@amount &gt; $value) then @amount else $value"/>
    </xsl:accumulator>
    
    
--- a/tests/decl/accumulator/accumulator-009.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-009.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -11,19 +11,19 @@
     <xsl:output method="xml" indent="yes"/>
     
    <xsl:accumulator name="count" as="xs:integer" initial-value="0" streamable="yes">
-     <xsl:accumulator-rule match="transaction" new-value="$value + 1"/>
+     <xsl:accumulator-rule match="transaction" select="$value + 1"/>
    </xsl:accumulator>
    
    <xsl:accumulator name="sum" as="xs:double" initial-value="0" streamable="yes">
-     <xsl:accumulator-rule match="transaction" new-value="$value + @amount"/>
+     <xsl:accumulator-rule match="transaction" select="$value + @amount"/>
    </xsl:accumulator>
    
    <xsl:accumulator name="min" as="xs:double" initial-value="999999999999" streamable="yes">
-     <xsl:accumulator-rule match="transaction" new-value="if (@amount &lt; $value) then @amount else $value"/>
+     <xsl:accumulator-rule match="transaction" select="if (@amount &lt; $value) then @amount else $value"/>
    </xsl:accumulator>
    
    <xsl:accumulator name="max" as="xs:double" initial-value="-999999999999" streamable="yes">
-     <xsl:accumulator-rule match="transaction" new-value="if (@amount &gt; $value) then @amount else $value"/>
+     <xsl:accumulator-rule match="transaction" select="if (@amount &gt; $value) then @amount else $value"/>
    </xsl:accumulator>
    
    
--- a/tests/decl/accumulator/accumulator-010.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-010.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:param name="streamable" static="yes" select="'no'"/>
 
   <xsl:accumulator name="f:section-nr" as="xs:integer*" initial-value="0" _streamable="{$streamable}">
-    <xsl:accumulator-rule match="section" phase="start" new-value="0, head($value)+1, tail($value)"/>
-    <xsl:accumulator-rule match="section" phase="end" new-value="tail($value) (:pop:)"/>
+    <xsl:accumulator-rule match="section" phase="start" select="0, head($value)+1, tail($value)"/>
+    <xsl:accumulator-rule match="section" phase="end" select="tail($value) (:pop:)"/>
   </xsl:accumulator>
 
 
--- a/tests/decl/accumulator/accumulator-012.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-012.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -11,7 +11,7 @@
   					as="xs:string" 
   					initial-value="''"
   					_streamable="{$streamable}">
-    <xsl:accumulator-rule match="section/p/text()" new-value="string(.)"/>
+    <xsl:accumulator-rule match="section/p/text()" select="string(.)"/>
   </xsl:accumulator>
 
 
--- a/tests/decl/accumulator/accumulator-014.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-014.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:param name="increment" select="0"/>
 
   <xsl:accumulator name="figNr" as="xs:integer" initial-value="0" streamable="no">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + (let $value := $increment + 1 return $value)"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + (let $value := $increment + 1 return $value)"/>
   </xsl:accumulator>
 
   <xsl:mode streamable="no" on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-015.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-015.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -12,7 +12,7 @@
    <xsl:accumulator name="item-cost" streamable="yes" 
        as="xs:integer" 
        initial-value="0">
-       <xsl:accumulator-rule match="cost/text()" new-value="$value + xs:integer(.)"/>
+       <xsl:accumulator-rule match="cost/text()" select="$value + xs:integer(.)"/>
    </xsl:accumulator>
    
    <!-- The void xsl:for-each in the template below is designed to sow confusion. Although it does nothing useful,
--- a/tests/decl/accumulator/accumulator-020.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-020.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -12,13 +12,13 @@
   <xsl:param name="two" static="yes" select="'two'"/>
 
   <xsl:accumulator _name="{$one}" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
   </xsl:accumulator>
   
   <xsl:accumulator _name="{$two}" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
   </xsl:accumulator>
 
   <xsl:mode on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-023.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-023.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:import href="accumulator-023a.xsl"/>
 
   <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 2"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-023a.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-023a.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -6,8 +6,8 @@
   <!-- Import precedence applied to accumulators -->
 
   <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
   </xsl:accumulator>
 
   <xsl:mode on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-025.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-025.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:import href="accumulator-023a.xsl"/>
 
   <xsl:accumulator name="a" as="xs:integer">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 2"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-026.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-026.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,9 +8,9 @@
   <xsl:param name="streamable" static="yes" select="'no'"/>
 
   <xsl:accumulator name="figNr" as="xs:integer" initial-value="0" _streamable="{$streamable}">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 1"/>
-    <xsl:accumulator-rule match="@alt" new-value="$value + 100000"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 1"/>
+    <xsl:accumulator-rule match="@alt" select="$value + 100000"/>
   </xsl:accumulator>
 
   <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-027.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-027.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:import href="accumulator-027a.xsl"/>
 
   <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 2"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-027a.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-027a.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -6,13 +6,13 @@
   <!-- Import precedence applied to accumulators -->
 
   <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 83"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 83"/>
   </xsl:accumulator>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 86"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 86"/>
   </xsl:accumulator>
 
   <xsl:mode on-no-match="shallow-skip"/>
--- a/tests/decl/accumulator/accumulator-028.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-028.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:mode streamable="yes"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0" applies-to="doc[chap]" streamable="yes">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + 2"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + 2"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-029.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-029.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:mode streamable="yes"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0" applies-to="doc[chap]" streamable="yes">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig[caption]" new-value="$value + 2"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig[caption]" select="$value + 2"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-030.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-030.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:mode streamable="yes"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0" applies-to="doc[chap]" streamable="yes">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + string-length(caption)"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + string-length(caption)"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-031.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-031.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,7 +8,7 @@
   <xsl:mode streamable="yes"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0" streamable="yes">
-    <xsl:accumulator-rule match="*" new-value="$value + $count"/>
+    <xsl:accumulator-rule match="*" select="$value + $count"/>
   </xsl:accumulator>
 
   <xsl:variable name="count">
--- a/tests/decl/accumulator/accumulator-032.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-032.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -10,7 +10,7 @@
   <xsl:mode _streamable="{$streamable}"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0" streamable="yes">
-    <xsl:accumulator-rule match="*" new-value="$value + 1"/>
+    <xsl:accumulator-rule match="*" select="$value + 1"/>
   </xsl:accumulator>
 
   <xsl:variable name="count" use-when="$streamable='yes'">
--- a/tests/decl/accumulator/accumulator-033.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-033.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -8,8 +8,8 @@
   <xsl:mode streamable="no" on-no-match="shallow-skip"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + $count"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + $count"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-034.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-034.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -10,8 +10,8 @@
   <xsl:mode _streamable="{$streamable}" on-no-match="shallow-skip"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="0" _streamable="{$streamable}">
-    <xsl:accumulator-rule match="chap[not(@nr = $seven)]" new-value="0"/>
-    <xsl:accumulator-rule match="fig[every $n in data(@*) satisfies $n = '83']" new-value="$value + 2"/>
+    <xsl:accumulator-rule match="chap[not(@nr = $seven)]" select="0"/>
+    <xsl:accumulator-rule match="fig[every $n in data(@*) satisfies $n = '83']" select="$value + 2"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/decl/accumulator/accumulator-035.xsl	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/decl/accumulator/accumulator-035.xsl	Fri Aug 01 22:24:15 2014 +0100
@@ -3,14 +3,14 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
   exclude-result-prefixes="xs" version="3.0">
 
-  <!-- Local variables in initial-value and new-value expressions -->
+  <!-- Local variables in initial-value and select expressions -->
   
   <xsl:mode streamable="yes" on-no-match="shallow-skip"/>
   
   <xsl:accumulator name="a" as="xs:integer" initial-value="min(for $i in $zero to 5 return $i*2)"
   			streamable="yes">
-    <xsl:accumulator-rule match="chap" new-value="0"/>
-    <xsl:accumulator-rule match="fig" new-value="$value + min(for $i in ($zero+1) to 5 return $i*2)"/>
+    <xsl:accumulator-rule match="chap" select="0"/>
+    <xsl:accumulator-rule match="fig" select="$value + min(for $i in ($zero+1) to 5 return $i*2)"/>
   </xsl:accumulator>
   
   <xsl:template match="fig">
--- a/tests/misc/catalog/schema-for-xslt30.xsd	Fri Aug 01 15:29:49 2014 +0200
+++ b/tests/misc/catalog/schema-for-xslt30.xsd	Fri Aug 01 22:24:15 2014 +0100
@@ -273,12 +273,12 @@
               </xs:restriction>           
             </xs:simpleType>
           </xs:attribute>
-          <xs:attribute name="new-value" type="xsl:expression"/>
+          <xs:attribute name="select" type="xsl:expression"/>
           <xs:attribute name="_match" type="xs:string"/>
           <xs:attribute name="_phase" type="xs:string"/>
-          <xs:attribute name="_new-value" type="xs:string"/>
+          <xs:attribute name="_select" type="xs:string"/>
           <xs:assert test="exists(@match | @_match)"/>
-          <xs:assert test="exists(@new-value | @_new-value)"/>
+          <xs:assert test="exists(@select | @_select)"/>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>