Skip to content

Commit 79a763e

Browse files
tabatkinstabatkins
committed
[css-syntax] Whoops, actually commit the changes.
1 parent 0d3c77a commit 79a763e

2 files changed

Lines changed: 60 additions & 12 deletions

File tree

‎css-syntax/Overview.bs‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Status: ED
77
Group: csswg
88
ED: http://dev.w3.org/csswg/css-syntax/
99
TR: http://www.w3.org/TR/css-syntax-3/
10+
Previous Version: http://www.w3.org/TR/2014/CR-css-syntax-3-20140220/
1011
Previous Version: http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/
1112
Previous Version: http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/
1213
Editor: Tab Atkins Jr., Google, http://xanthir.com/contact/
@@ -889,7 +890,7 @@ Consume a token</h4>
889890

890891
<dt>U+0022 QUOTATION MARK (")
891892
<dd>
892-
<a>Consume a string token</a> with the ending <a>code point</a> U+0022 QUOTATION MARK (")
893+
<a>Consume a string token</a>
893894
and return it.
894895

895896
<dt>U+0023 NUMBER SIGN (#)
@@ -932,7 +933,7 @@ Consume a token</h4>
932933

933934
<dt>U+0027 APOSTROPHE (&apos;)
934935
<dd>
935-
<a>Consume a string token</a> with the ending <a>code point</a> U+0027 APOSTROPHE (&apos;)
936+
<a>Consume a string token</a>
936937
and return it.
937938

938939
<dt>U+0028 LEFT PARENTHESIS (()
@@ -1227,8 +1228,10 @@ Consume a string token</h4>
12271228
This section describes how to <dfn>consume a string token</dfn> from a stream of <a>code points</a>.
12281229
It returns either a <<string-token>> or <<bad-string-token>>.
12291230

1230-
This algorithm must be called with an <var>ending code point</var>,
1231+
This algorithm may be called with an <var>ending code point</var>,
12311232
which denotes the <a>code point</a> that ends the string.
1233+
If an <var>ending code point</var> is not specified,
1234+
the <a>current input code point</a> is used.
12321235

12331236
Initially create a <<string-token>> with its value set to the empty string.
12341237

@@ -1293,7 +1296,8 @@ Consume a url token</h4>
12931296

12941297
<ol>
12951298
<li>
1296-
<a>Consume a string token</a> with the <a>current input code point</a> as the ending code point.
1299+
Consume the <a>next input code point</a>,
1300+
then <a>consume a string token</a>.
12971301

12981302
<li>
12991303
If a <<bad-string-token>> was returned,
@@ -3400,3 +3404,23 @@ Acknowledgments</h2>
34003404
Marc O'Morain,
34013405
Simon Pieter,
34023406
and Zack Weinberg.
3407+
3408+
<h2 class="no-num" id="changes">
3409+
Changes Since the 20 Feb 2014 CR Publication</h2>
3410+
3411+
The following substantive changes were made:
3412+
3413+
<ul>
3414+
<li>
3415+
Fixed a bug in the "Consume a URL token" algorithm,
3416+
where it didn't consume the quote character starting a string before attempting to consume the string.
3417+
</ul>
3418+
3419+
The following editorial changes were made:
3420+
3421+
<ul>
3422+
<li>
3423+
The "Consume a string token" algorithm was changed to allow calling it without specifying an explicit ending token,
3424+
so that it uses the current input token instead.
3425+
The three call-sites of the algorithm were changed to use that form.
3426+
</ul>

‎css-syntax/Overview.html‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
6060
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
6161
<span class=dt-updated><span class=value-title title=20140303>3 March 2014</span></span></span></h2>
62-
<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/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>
62+
<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>
6363
<dt>Feedback:</dt>
6464
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
6565
with subject line
@@ -179,12 +179,13 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
179179
<li><a href=#serialization><span class=secno>9</span> Serialization</a>
180180
<ul class=toc>
181181
<li><a href=#serializing-anb><span class=secno>9.1</span> Serializing <var>&lt;an+b&gt;</var></a></ul>
182-
<li><a href=#changes><span class=secno>10</span> Changes</a>
182+
<li><a href=#changes0><span class=secno>10</span> Changes</a>
183183
<ul class=toc>
184184
<li><a href=#changes-WD-20131105><span class=secno>10.1</span> Changes from the 5 November 2013 Last Call Working Draft</a>
185185
<li><a href=#changes-WD-20130919><span class=secno>10.2</span> Changes from the 19 September 2013 Working Draft</a>
186186
<li><a href=#changes-css21><span class=secno>10.3</span> Changes from CSS 2.1 and Selectors Level 3</a></ul>
187187
<li><a href=#acknowledgments><span class=secno></span> Acknowledgments</a>
188+
<li><a href=#changes><span class=secno></span> Changes Since the 20 Feb 2014 CR Publication</a>
188189
<li><a href=#conformance><span class=secno></span> Conformance</a>
189190
<ul class=toc>
190191
<li><a href=#conventions><span class=secno></span> Document conventions</a>
@@ -1940,7 +1941,7 @@ <h4 class="heading settled heading" data-level=4.3.1 id=consume-a-token><span cl
19401941

19411942
<dt>U+0022 QUOTATION MARK (")
19421943
<dd>
1943-
<a data-link-type=dfn href=#consume-a-string-token0 title="consume a string token">Consume a string token</a> with the ending <a data-link-type=dfn href=#code-point title="code point">code point</a> U+0022 QUOTATION MARK (")
1944+
<a data-link-type=dfn href=#consume-a-string-token0 title="consume a string token">Consume a string token</a>
19441945
and return it.
19451946

19461947
<dt>U+0023 NUMBER SIGN (#)
@@ -1983,7 +1984,7 @@ <h4 class="heading settled heading" data-level=4.3.1 id=consume-a-token><span cl
19831984

19841985
<dt>U+0027 APOSTROPHE (')
19851986
<dd>
1986-
<a data-link-type=dfn href=#consume-a-string-token0 title="consume a string token">Consume a string token</a> with the ending <a data-link-type=dfn href=#code-point title="code point">code point</a> U+0027 APOSTROPHE (')
1987+
<a data-link-type=dfn href=#consume-a-string-token0 title="consume a string token">Consume a string token</a>
19871988
and return it.
19881989

19891990
<dt>U+0028 LEFT PARENTHESIS (()
@@ -2278,8 +2279,10 @@ <h4 class="heading settled heading" data-level=4.3.4 id=consume-a-string-token><
22782279
<p> This section describes how to <dfn data-dfn-type=dfn data-noexport="" id=consume-a-string-token0>consume a string token<a class=self-link href=#consume-a-string-token0></a></dfn> from a stream of <a data-link-type=dfn href=#code-point title="code points">code points</a>.
22792280
It returns either a <a class="production css-code" data-link-type=type href=#typedef-string-token title="<string-token>">&lt;string-token&gt;</a> or <a class="production css-code" data-link-type=type href=#typedef-bad-string-token title="<bad-string-token>">&lt;bad-string-token&gt;</a>.
22802281

2281-
<p> This algorithm must be called with an <var>ending code point</var>,
2282+
<p> This algorithm may be called with an <var>ending code point</var>,
22822283
which denotes the <a data-link-type=dfn href=#code-point title="code point">code point</a> that ends the string.
2284+
If an <var>ending code point</var> is not specified,
2285+
the <a data-link-type=dfn href=#current-input-code-point title="current input code point">current input code point</a> is used.
22832286

22842287
<p> Initially create a <a class="production css-code" data-link-type=type href=#typedef-string-token title="<string-token>">&lt;string-token&gt;</a> with its value set to the empty string.
22852288

@@ -2344,7 +2347,8 @@ <h4 class="heading settled heading" data-level=4.3.5 id=consume-a-url-token><spa
23442347

23452348
<ol>
23462349
<li>
2347-
<a data-link-type=dfn href=#consume-a-string-token0 title="consume a string token">Consume a string token</a> with the <a data-link-type=dfn href=#current-input-code-point title="current input code point">current input code point</a> as the ending code point.
2350+
Consume the <a data-link-type=dfn href=#next-input-code-point title="next input code point">next input code point</a>,
2351+
then <a data-link-type=dfn href=#consume-a-string-token0 title="consume a string token">consume a string token</a>.
23482352

23492353
<li>
23502354
If a <a class="production css-code" data-link-type=type href=#typedef-bad-string-token title="<bad-string-token>">&lt;bad-string-token&gt;</a> was returned,
@@ -4686,8 +4690,8 @@ <h3 class="heading settled heading" data-level=9.1 id=serializing-anb><span clas
46864690

46874691
<p> Return <var>s</var>.
46884692

4689-
<h2 class="heading settled heading" data-level=10 id=changes><span class=secno>10 </span><span class=content>
4690-
Changes</span><a class=self-link href=#changes></a></h2>
4693+
<h2 class="heading settled heading" data-level=10 id=changes0><span class=secno>10 </span><span class=content>
4694+
Changes</span><a class=self-link href=#changes0></a></h2>
46914695

46924696
<p> <em>This section is non-normative.</em>
46934697

@@ -4881,6 +4885,26 @@ <h2 class="no-num heading settled heading" id=acknowledgments><span class=conten
48814885
Simon Pieter,
48824886
and Zack Weinberg.
48834887

4888+
<h2 class="no-num heading settled heading" id=changes><span class=content>
4889+
Changes Since the 20 Feb 2014 CR Publication</span><a class=self-link href=#changes></a></h2>
4890+
4891+
<p> The following substantive changes were made:
4892+
4893+
<p> <ul>
4894+
<li>
4895+
Fixed a bug in the "Consume a URL token" algorithm,
4896+
where it didn’t consume the quote character starting a string before attempting to consume the string.
4897+
</ul>
4898+
4899+
<p> The following editorial changes were made:
4900+
4901+
<p> <ul>
4902+
<li>
4903+
The "Consume a string token" algorithm was changed to allow calling it without specifying an explicit ending token,
4904+
so that it uses the current input token instead.
4905+
The three call-sites of the algorithm were changed to use that form.
4906+
</ul>
4907+
48844908
<h2 class="no-ref no-num heading settled heading" id=conformance><span class=content>
48854909
Conformance</span><a class=self-link href=#conformance></a></h2>
48864910

0 commit comments

Comments
 (0)