[css-syntax] Fix an off-by-one-token bug in "Consume a simple block" and "Consume a function".

http://lists.w3.org/Archives/Public/www-style/2014Mar/0247.html

Author: SimonSapin

css-syntax/Overview.bs

@@ -2355,7 +2355,6 @@ Consume an at-rule</h4>
 
 		<dt><a href="#tokendef-open-curly">&lt;{-token></a>
 		<dd>
-			<a>Reconsume the current input token</a>.
 			<a>Consume a simple block</a>
 			and assign it to the at-rule's block.
 			Return the at-rule.
@@ -2392,7 +2391,6 @@ Consume a qualified rule</h4>
 
 		<dt><a href="#tokendef-open-curly">&lt;{-token></a>
 		<dd>
-			<a>Reconsume the current input token</a>.
 			<a>Consume a simple block</a>
 			and assign it to the qualified rule's block.
 			Return the qualified rule.
@@ -2518,11 +2516,10 @@ Consume a component value</h4>
 <h4 id="consume-a-simple-block">
 Consume a simple block</h4>
 
-	Note: This algorithm assumes that the <a>next input token</a> has already been checked to be an <a href="#tokendef-open-curly">&lt;{-token></a>, <a href="#tokendef-open-square">&lt;[-token></a>, or <a href="#tokendef-open-paren">&lt;(-token></a>.
+	Note: This algorithm assumes that the <a>current input token</a> has already been checked to be an <a href="#tokendef-open-curly">&lt;{-token></a>, <a href="#tokendef-open-square">&lt;[-token></a>, or <a href="#tokendef-open-paren">&lt;(-token></a>.
 
 	To <dfn>consume a simple block</dfn>:
 
-	<a>Consume the next input token</a>.
 	The <dfn>ending token</dfn> is the mirror variant of the <a>current input token</a>.
 	(E.g. if it was called with <a href="#tokendef-open-square">&lt;[-token></a>, the <a>ending token</a> is <a href="#tokendef-close-square">&lt;]-token></a>.)
 
@@ -2548,11 +2545,10 @@ Consume a simple block</h4>
 <h4 id="consume-a-function">
 Consume a function</h4>
 
-	Note: This algorithm assumes that the <a>next input token</a> has already been checked to be a <<function-token>>.
+	Note: This algorithm assumes that the <a>current input token</a> has already been checked to be a <<function-token>>.
 
 	To <dfn>consume a function</dfn>:
 
-	<a>Consume the next input token</a>.
 	Create a function with a name equal to the value of the <a>current input token</a>,
 	and with a value which is initially an empty list.
 
@@ -3212,6 +3208,13 @@ Changes</h2>
 
 	<em>This section is non-normative.</em>
 
+<h3 id="changes-CR-20140220">
+Changes from the 20 February 2014 Candidate Recommendation</h3>
+
+	<ul>
+		<li>Fix several bugs in the tokenization and parsing algorithms.
+	</ul>
+
 <h3 id="changes-WD-20131105">
 Changes from the 5 November 2013 Last Call Working Draft</h3>
 
@@ -3401,6 +3404,7 @@ Acknowledgments</h2>
 		Anne van Kesteren,
 		David Baron,
 		Henri Sivonen,
+		Johannes Koch,
 		呂康豪 (Kang-Hao Lu),
 		Marc O'Morain,
 		Simon Pieter,

css-syntax/Overview.html

@@ -58,7 +58,7 @@
 </p>
   <h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
   <h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
-    <span class=dt-updated><span class=value-title title=20140305>5 March 2014</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20140313>13 March 2014</span></span></span></h2>
   <div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-syntax-3/>http://www.w3.org/TR/css-syntax-3/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2014/CR-css-syntax-3-20140220/ rel=previous>http://www.w3.org/TR/2014/CR-css-syntax-3-20140220/</a><dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/</a><dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/</a>
     <dt>Feedback:</dt>
         <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
@@ -181,9 +181,10 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
 		<li><a href=#serializing-anb><span class=secno>9.1</span> Serializing <var>&lt;an+b&gt;</var></a></ul>
 	<li><a href=#changes0><span class=secno>10</span> Changes</a>
 		<ul class=toc>
-		<li><a href=#changes-WD-20131105><span class=secno>10.1</span> Changes from the 5 November 2013 Last Call Working Draft</a>
-		<li><a href=#changes-WD-20130919><span class=secno>10.2</span> Changes from the 19 September 2013 Working Draft</a>
-		<li><a href=#changes-css21><span class=secno>10.3</span> Changes from CSS 2.1 and Selectors Level 3</a></ul>
+		<li><a href=#changes-CR-20140220><span class=secno>10.1</span> Changes from the 20 February 2014 Candidate Recommendation</a>
+		<li><a href=#changes-WD-20131105><span class=secno>10.2</span> Changes from the 5 November 2013 Last Call Working Draft</a>
+		<li><a href=#changes-WD-20130919><span class=secno>10.3</span> Changes from the 19 September 2013 Working Draft</a>
+		<li><a href=#changes-css21><span class=secno>10.4</span> Changes from CSS 2.1 and Selectors Level 3</a></ul>
 	<li><a href=#acknowledgments><span class=secno></span> Acknowledgments</a>
 	<li><a href=#changes><span class=secno></span> Changes Since the 20 Feb 2014 CR Publication</a>
 	<li><a href=#conformance><span class=secno></span> Conformance</a>
@@ -3868,7 +3869,6 @@ <h4 class="heading settled heading" data-level=5.4.2 id=consume-an-at-rule><span
 
 		<dt><a href=#tokendef-open-curly>&lt;{-token&gt;</a>
 		<dd>
-			<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
 			<a data-link-type=dfn href=#consume-a-simple-block0 title="consume a simple block">Consume a simple block</a>
 			and assign it to the at-rule’s block.
 			Return the at-rule.
@@ -3905,7 +3905,6 @@ <h4 class="heading settled heading" data-level=5.4.3 id=consume-a-qualified-rule
 
 		<dt><a href=#tokendef-open-curly>&lt;{-token&gt;</a>
 		<dd>
-			<a data-link-type=dfn href=#reconsume-the-current-input-token title="reconsume the current input token">Reconsume the current input token</a>.
 			<a data-link-type=dfn href=#consume-a-simple-block0 title="consume a simple block">Consume a simple block</a>
 			and assign it to the qualified rule’s block.
 			Return the qualified rule.
@@ -4031,12 +4030,11 @@ <h4 class="heading settled heading" data-level=5.4.6 id=consume-a-component-valu
 <h4 class="heading settled heading" data-level=5.4.7 id=consume-a-simple-block><span class=secno>5.4.7 </span><span class=content>
 Consume a simple block</span><a class=self-link href=#consume-a-simple-block></a></h4>
 
-<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> has already been checked to be an <a href=#tokendef-open-curly>&lt;{-token&gt;</a>, <a href=#tokendef-open-square>&lt;[-token&gt;</a>, or <a href=#tokendef-open-paren>&lt;(-token&gt;</a>.
+<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> has already been checked to be an <a href=#tokendef-open-curly>&lt;{-token&gt;</a>, <a href=#tokendef-open-square>&lt;[-token&gt;</a>, or <a href=#tokendef-open-paren>&lt;(-token&gt;</a>.
 
 <p>	To <dfn data-dfn-type=dfn data-noexport="" id=consume-a-simple-block0>consume a simple block<a class=self-link href=#consume-a-simple-block0></a></dfn>:
 
-<p>	<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
-	The <dfn data-dfn-type=dfn data-noexport="" id=ending-token>ending token<a class=self-link href=#ending-token></a></dfn> is the mirror variant of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>.
+<p>	The <dfn data-dfn-type=dfn data-noexport="" id=ending-token>ending token<a class=self-link href=#ending-token></a></dfn> is the mirror variant of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>.
 	(E.g. if it was called with <a href=#tokendef-open-square>&lt;[-token&gt;</a>, the <a data-link-type=dfn href=#ending-token title="ending token">ending token</a> is <a href=#tokendef-close-square>&lt;]-token&gt;</a>.)
 
 <p>	Create a <a data-link-type=dfn href=#simple-block title="simple block">simple block</a> with its associated token set to the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>
@@ -4061,12 +4059,11 @@ <h4 class="heading settled heading" data-level=5.4.7 id=consume-a-simple-block><
 <h4 class="heading settled heading" data-level=5.4.8 id=consume-a-function><span class=secno>5.4.8 </span><span class=content>
 Consume a function</span><a class=self-link href=#consume-a-function></a></h4>
 
-<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> has already been checked to be a <a class="production css-code" data-link-type=type href=#typedef-function-token title="<function-token>">&lt;function-token&gt;</a>.
+<p class=note>	Note: This algorithm assumes that the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a> has already been checked to be a <a class="production css-code" data-link-type=type href=#typedef-function-token title="<function-token>">&lt;function-token&gt;</a>.
 
 <p>	To <dfn data-dfn-type=dfn data-noexport="" id=consume-a-function0>consume a function<a class=self-link href=#consume-a-function0></a></dfn>:
 
-<p>	<a data-link-type=dfn href=#consume-the-next-input-token title="consume the next input token">Consume the next input token</a>.
-	Create a function with a name equal to the value of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>,
+<p>	Create a function with a name equal to the value of the <a data-link-type=dfn href=#current-input-token title="current input token">current input token</a>,
 	and with a value which is initially an empty list.
 
 <p>	Repeatedly consume the <a data-link-type=dfn href=#next-input-token title="next input token">next input token</a> and process it as follows:
@@ -4696,7 +4693,14 @@ <h2 class="heading settled heading" data-level=10 id=changes0><span class=secno>
 
 <p>	<em>This section is non-normative.</em>
 
-<h3 class="heading settled heading" data-level=10.1 id=changes-WD-20131105><span class=secno>10.1 </span><span class=content>
+<h3 class="heading settled heading" data-level=10.1 id=changes-CR-20140220><span class=secno>10.1 </span><span class=content>
+Changes from the 20 February 2014 Candidate Recommendation</span><a class=self-link href=#changes-CR-20140220></a></h3>
+
+<p>	<ul>
+		<li>Fix several bugs in the tokenization and parsing algorithms.
+	</ul>
+
+<h3 class="heading settled heading" data-level=10.2 id=changes-WD-20131105><span class=secno>10.2 </span><span class=content>
 Changes from the 5 November 2013 Last Call Working Draft</span><a class=self-link href=#changes-WD-20131105></a></h3>
 
 <p>	<ul>
@@ -4719,7 +4723,7 @@ <h3 class="heading settled heading" data-level=10.1 id=changes-WD-20131105><span
 
 <pre>@charset "   <em>(lots of whitespace)</em>   utf-8";</pre>	</ul>
 
-<h3 class="heading settled heading" data-level=10.2 id=changes-WD-20130919><span class=secno>10.2 </span><span class=content>
+<h3 class="heading settled heading" data-level=10.3 id=changes-WD-20130919><span class=secno>10.3 </span><span class=content>
 Changes from the 19 September 2013 Working Draft</span><a class=self-link href=#changes-WD-20130919></a></h3>
 
 <p>	<ul>
@@ -4729,7 +4733,7 @@ <h3 class="heading settled heading" data-level=10.2 id=changes-WD-20130919><span
 			but some of the definitions should be moved to the relevant specs.
 	</ul>
 
-<h3 class="heading settled heading" data-level=10.3 id=changes-css21><span class=secno>10.3 </span><span class=content>
+<h3 class="heading settled heading" data-level=10.4 id=changes-css21><span class=secno>10.4 </span><span class=content>
 Changes from CSS 2.1 and Selectors Level 3</span><a class=self-link href=#changes-css21></a></h3>
 
 <p class=note>	Note: The point of this spec is to match reality;
@@ -4881,6 +4885,7 @@ <h2 class="no-num heading settled heading" id=acknowledgments><span class=conten
 		Anne van Kesteren,
 		David Baron,
 		Henri Sivonen,
+		Johannes Koch,
 		呂康豪 (Kang-Hao Lu),
 		Marc O’Morain,
 		Simon Pieter,