Skip to content

Commit 4db7a7a

Browse files
committed
[css-syntax] Merged two changes sections both talking about the Feb2014 CR.
1 parent afd3e86 commit 4db7a7a

File tree

2 files changed

+59
-82
lines changed

2 files changed

+59
-82
lines changed

css-syntax/Overview.bs

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3259,11 +3259,25 @@ Changes</h2>
32593259
<h3 id="changes-CR-20140220">
32603260
Changes from the 20 February 2014 Candidate Recommendation</h3>
32613261

3262-
<ul>
3263-
<li>Fix several bugs in the tokenization and parsing algorithms.
3264-
<li>Change the definition of ident-like tokens to allow "--" to start an ident.
3265-
<li>Minor editorial restructuring of algorithms.
3266-
</ul>
3262+
The following substantive changes were made:
3263+
3264+
* Fixed a bug in the "Consume a URL token" algorithm,
3265+
where it didn't consume the quote character starting a string before attempting to consume the string.
3266+
3267+
* Fixed a bug in several of the parser algorithms
3268+
related to the current/next input token and things getting consumed early/late.
3269+
3270+
* Fix several bugs in the tokenization and parsing algorithms.
3271+
3272+
* Change the definition of ident-like tokens to allow "--" to start an ident.
3273+
3274+
The following editorial changes were made:
3275+
3276+
* The "Consume a string token" algorithm was changed to allow calling it without specifying an explicit ending token,
3277+
so that it uses the current input token instead.
3278+
The three call-sites of the algorithm were changed to use that form.
3279+
3280+
* Minor editorial restructuring of algorithms.
32673281

32683282
<h3 id="changes-WD-20131105">
32693283
Changes from the 5 November 2013 Last Call Working Draft</h3>
@@ -3449,38 +3463,13 @@ Changes from CSS 2.1 and Selectors Level 3</h3>
34493463
<h2 class=no-num id="acknowledgments">
34503464
Acknowledgments</h2>
34513465

3452-
<p>
3453-
Thanks for feedback and contributions from
3454-
Anne van Kesteren,
3455-
David Baron,
3456-
Henri Sivonen,
3457-
Johannes Koch,
3458-
呂康豪 (Kang-Hao Lu),
3459-
Marc O'Morain,
3460-
Raffaello Giulietti,
3461-
Simon Pieter,
3462-
and Zack Weinberg.
3463-
3464-
<h2 class="no-num" id="changes">
3465-
Changes Since the 20 Feb 2014 CR Publication</h2>
3466-
3467-
The following substantive changes were made:
3468-
3469-
<ul>
3470-
<li>
3471-
Fixed a bug in the "Consume a URL token" algorithm,
3472-
where it didn't consume the quote character starting a string before attempting to consume the string.
3473-
3474-
<li>
3475-
Fixed a bug in several of the parser algorithms
3476-
related to the current/next input token and things getting consumed early/late.
3477-
</ul>
3478-
3479-
The following editorial changes were made:
3480-
3481-
<ul>
3482-
<li>
3483-
The "Consume a string token" algorithm was changed to allow calling it without specifying an explicit ending token,
3484-
so that it uses the current input token instead.
3485-
The three call-sites of the algorithm were changed to use that form.
3486-
</ul>
3466+
Thanks for feedback and contributions from
3467+
Anne van Kesteren,
3468+
David Baron,
3469+
Henri Sivonen,
3470+
Johannes Koch,
3471+
呂康豪 (Kang-Hao Lu),
3472+
Marc O'Morain,
3473+
Raffaello Giulietti,
3474+
Simon Pieter,
3475+
and Zack Weinberg.

css-syntax/Overview.html

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ <h2 class="no-num no-toc no-ref heading settled" id=contents><span class=content
175175
Changes from the 5 November 2013 Last Call Working Draft</span></a><li><a href=#changes-WD-20130919><span class=secno>10.3</span> <span class=content>
176176
Changes from the 19 September 2013 Working Draft</span></a><li><a href=#changes-css21><span class=secno>10.4</span> <span class=content>
177177
Changes from CSS 2.1 and Selectors Level 3</span></a></ul><li><a href=#acknowledgments><span class=secno></span> <span class=content>
178-
Acknowledgments</span></a><li><a href=#changes0><span class=secno></span> <span class=content>
179-
Changes Since the 20 Feb 2014 CR Publication</span></a><li><a href=#conformance><span class=secno></span> <span class=content>
178+
Acknowledgments</span></a><li><a href=#conformance><span class=secno></span> <span class=content>
180179
Conformance</span></a><ul class=toc><li><a href=#conventions><span class=secno></span> <span class=content>
181180
Document conventions</span></a><li><a href=#conformance-classes><span class=secno></span> <span class=content>
182181
Conformance classes</span></a><li><a href=#partial><span class=secno></span> <span class=content>
@@ -4780,12 +4779,26 @@ <h2 class="heading settled" data-level=10 id=changes><span class=secno>10. </spa
47804779
<h3 class="heading settled" data-level=10.1 id=changes-CR-20140220><span class=secno>10.1. </span><span class=content>
47814780
Changes from the 20 February 2014 Candidate Recommendation</span><a class=self-link href=#changes-CR-20140220></a></h3>
47824781

4783-
<ul>
4784-
<li>Fix several bugs in the tokenization and parsing algorithms.
4785-
<li>Change the definition of ident-like tokens to allow "--" to start an ident.
4786-
<li>Minor editorial restructuring of algorithms.
4787-
</ul>
4782+
<p>The following substantive changes were made:</p>
4783+
4784+
<ul><li data-md=""><p>Fixed a bug in the "Consume a URL token" algorithm,
4785+
where it didn’t consume the quote character starting a string before attempting to consume the string.</p>
4786+
4787+
<li data-md=""><p>Fixed a bug in several of the parser algorithms
4788+
related to the current/next input token and things getting consumed early/late.</p>
4789+
4790+
<li data-md=""><p>Fix several bugs in the tokenization and parsing algorithms.</p>
47884791

4792+
<li data-md=""><p>Change the definition of ident-like tokens to allow "--" to start an ident.</p>
4793+
</ul>
4794+
<p>The following editorial changes were made:</p>
4795+
4796+
<ul><li data-md=""><p>The "Consume a string token" algorithm was changed to allow calling it without specifying an explicit ending token,
4797+
so that it uses the current input token instead.
4798+
The three call-sites of the algorithm were changed to use that form.</p>
4799+
4800+
<li data-md=""><p>Minor editorial restructuring of algorithms.</p>
4801+
</ul>
47894802
<h3 class="heading settled" data-level=10.2 id=changes-WD-20131105><span class=secno>10.2. </span><span class=content>
47904803
Changes from the 5 November 2013 Last Call Working Draft</span><a class=self-link href=#changes-WD-20131105></a></h3>
47914804

@@ -4967,41 +4980,16 @@ <h3 class="heading settled" data-level=10.4 id=changes-css21><span class=secno>1
49674980
<h2 class="no-num heading settled" id=acknowledgments><span class=content>
49684981
Acknowledgments</span><a class=self-link href=#acknowledgments></a></h2>
49694982

4970-
<p>
4971-
Thanks for feedback and contributions from
4972-
Anne van Kesteren,
4973-
David Baron,
4974-
Henri Sivonen,
4975-
Johannes Koch,
4976-
呂康豪 (Kang-Hao Lu),
4977-
Marc O’Morain,
4978-
Raffaello Giulietti,
4979-
Simon Pieter,
4980-
and Zack Weinberg.
4981-
4982-
<h2 class="no-num heading settled" id=changes0><span class=content>
4983-
Changes Since the 20 Feb 2014 CR Publication</span><a class=self-link href=#changes0></a></h2>
4984-
4985-
<p>The following substantive changes were made:</p>
4986-
4987-
<ul>
4988-
<li>
4989-
Fixed a bug in the "Consume a URL token" algorithm,
4990-
where it didn’t consume the quote character starting a string before attempting to consume the string.
4991-
4992-
<li>
4993-
Fixed a bug in several of the parser algorithms
4994-
related to the current/next input token and things getting consumed early/late.
4995-
</ul>
4996-
4997-
<p>The following editorial changes were made:</p>
4998-
4999-
<ul>
5000-
<li>
5001-
The "Consume a string token" algorithm was changed to allow calling it without specifying an explicit ending token,
5002-
so that it uses the current input token instead.
5003-
The three call-sites of the algorithm were changed to use that form.
5004-
</ul>
4983+
<p>Thanks for feedback and contributions from
4984+
Anne van Kesteren,
4985+
David Baron,
4986+
Henri Sivonen,
4987+
Johannes Koch,
4988+
呂康豪 (Kang-Hao Lu),
4989+
Marc O’Morain,
4990+
Raffaello Giulietti,
4991+
Simon Pieter,
4992+
and Zack Weinberg.</p>
50054993

50064994
<h2 class="no-ref no-num heading settled" id=conformance><span class=content>
50074995
Conformance</span><a class=self-link href=#conformance></a></h2>

0 commit comments

Comments
 (0)