Skip to content

Commit 750e81a

Browse files
tabatkinstabatkins
committed
[css-syntax] Move the tokenizer algorithms under a new section.
--HG-- extra : rebase_source : b7ef1ff08611e486f162fb6ca646771c3b798265
1 parent 96a07d5 commit 750e81a

2 files changed

Lines changed: 77 additions & 59 deletions

File tree

‎css-syntax/Overview.html‎

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<meta content="CSS Syntax Module Level 3 (CSS3 Syntax)" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2013-05-08 name=dcterms.date>
14+
<meta content=2013-05-09 name=dcterms.date>
1515
<meta content="Tab Atkins Jr." name=dcterms.creator>
1616
<meta content=W3C name=dcterms.publisher>
1717
<meta content="http://dev.w3.org/csswg/css3-syntax/"
@@ -32,7 +32,7 @@
3232
<h1 class=p-name>CSS Syntax Module Level 3</h1>
3333

3434
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft <time
35-
class=dt-updated datetime=20130508> 8 May 2013</time></h2>
35+
class=dt-updated datetime=20130509> 9 May 2013</time></h2>
3636

3737
<dl>
3838
<dt>This version:
@@ -251,28 +251,33 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
251251
Unicode-range state</a>
252252
</ul>
253253

254-
<li><a href="#consume-an-escaped-character"><span class=secno>4.5.
255-
</span> Consume an escaped character</a>
254+
<li><a href="#tokenizer-algorithms"><span class=secno>4.5. </span>
255+
Tokenizer Algorithms</a>
256+
<ul class=toc>
257+
<li><a href="#consume-an-escaped-character"><span class=secno>4.5.1.
258+
</span> Consume an escaped character</a>
256259

257-
<li><a href="#set-the-unicode-range-tokens-range"><span class=secno>4.6.
258-
</span> Set the unicode-range token's range</a>
260+
<li><a href="#set-the-unicode-range-tokens-range"><span
261+
class=secno>4.5.2. </span> Set the unicode-range token's range</a>
259262

260-
<li><a href="#convert-a-sci-notation-representation-in"><span
261-
class=secno>4.7. </span> Convert a sci-notation representation into a
262-
value</a>
263+
<li><a href="#convert-a-sci-notation-representation-in"><span
264+
class=secno>4.5.3. </span> Convert a sci-notation representation into
265+
a value</a>
263266

264-
<li><a href="#check-if-two-characters-are-a-valid-esca"><span
265-
class=secno>4.8. </span> Check if two characters are a valid escape</a>
267+
<li><a href="#check-if-two-characters-are-a-valid-esca"><span
268+
class=secno>4.5.4. </span> Check if two characters are a valid
269+
escape</a>
266270

267-
<li><a href="#check-if-three-characters-would-start-an"><span
268-
class=secno>4.9. </span> Check if three characters would start an
269-
identifier</a>
271+
<li><a href="#check-if-three-characters-would-start-an"><span
272+
class=secno>4.5.5. </span> Check if three characters would start an
273+
identifier</a>
270274

271-
<li><a href="#check-if-three-characters-would-start-a-"><span
272-
class=secno>4.10. </span> Check if three characters would start a
273-
number</a>
275+
<li><a href="#check-if-three-characters-would-start-a-"><span
276+
class=secno>4.5.6. </span> Check if three characters would start a
277+
number</a>
278+
</ul>
274279

275-
<li><a href="#changes-from-css-2.1-tokenizer"><span class=secno>4.11.
280+
<li><a href="#changes-from-css-2.1-tokenizer"><span class=secno>4.6.
276281
</span> Changes from CSS 2.1 Tokenizer</a>
277282
</ul>
278283

@@ -2533,8 +2538,14 @@ <h4 id=unicode-range-state><span class=secno>4.4.20. </span> <dfn
25332538
input character</i></a>.
25342539
</dl>
25352540

2536-
<h3 id=consume-an-escaped-character><span class=secno>4.5. </span> <dfn
2537-
id=consume-an-escaped-character0>Consume an escaped character</dfn></h3>
2541+
<h3 id=tokenizer-algorithms><span class=secno>4.5. </span> Tokenizer
2542+
Algorithms</h3>
2543+
2544+
<p> This section defines a number of specialized spec algorithms used by
2545+
the tokenizer.
2546+
2547+
<h4 id=consume-an-escaped-character><span class=secno>4.5.1. </span> <dfn
2548+
id=consume-an-escaped-character0>Consume an escaped character</dfn></h4>
25382549

25392550
<p> This section describes how to <a
25402551
href="#consume-an-escaped-character0"><i>consume an escaped
@@ -2566,9 +2577,9 @@ <h3 id=consume-an-escaped-character><span class=secno>4.5. </span> <dfn
25662577
character</i></a>.
25672578
</dl>
25682579

2569-
<h3 id=set-the-unicode-range-tokens-range><span class=secno>4.6. </span>
2580+
<h4 id=set-the-unicode-range-tokens-range><span class=secno>4.5.2. </span>
25702581
<dfn id=set-the-unicode-range-tokens-range0>Set the unicode-range token's
2571-
range</dfn></h3>
2582+
range</dfn></h4>
25722583

25732584
<p> This section describes how to set a unicode-range token's range so that
25742585
the range it describes is within the supported range of unicode
@@ -2601,10 +2612,10 @@ <h3 id=set-the-unicode-range-tokens-range><span class=secno>4.6. </span>
26012612
whose codepoint is the <a href="#end-of-the-range"><i>end of the
26022613
range</i></a>.
26032614

2604-
<h3 id=convert-a-sci-notation-representation-in><span class=secno>4.7.
2615+
<h4 id=convert-a-sci-notation-representation-in><span class=secno>4.5.3.
26052616
</span> <dfn id=convert-a-sci-notation-representation-in0
26062617
title="convert a sci-notation representation into a value|sci-not-to-value">Convert
2607-
a sci-notation representation into a value</dfn></h3>
2618+
a sci-notation representation into a value</dfn></h4>
26082619

26092620
<p> This section describes how to turn a sci-notation representation into a
26102621
numeric value.
@@ -2619,10 +2630,10 @@ <h3 id=convert-a-sci-notation-representation-in><span class=secno>4.7.
26192630

26202631
<p> Return <code><var>base</var> * 10<sup><var>power</var></sup></code>.
26212632

2622-
<h3 id=check-if-two-characters-are-a-valid-esca><span class=secno>4.8.
2633+
<h4 id=check-if-two-characters-are-a-valid-esca><span class=secno>4.5.4.
26232634
</span> <dfn id=check-if-two-characters-are-a-valid-esca0
26242635
title="check if two characters are a valid escape|are a valid escape|starts with a valid escape">Check
2625-
if two characters are a valid escape</dfn></h3>
2636+
if two characters are a valid escape</dfn></h4>
26262637

26272638
<p> This section describes how to <a
26282639
href="#check-if-two-characters-are-a-valid-esca0"><i>check if two
@@ -2642,10 +2653,10 @@ <h3 id=check-if-two-characters-are-a-valid-esca><span class=secno>4.8.
26422653

26432654
<p> Otherwise, return true.
26442655

2645-
<h3 id=check-if-three-characters-would-start-an><span class=secno>4.9.
2656+
<h4 id=check-if-three-characters-would-start-an><span class=secno>4.5.5.
26462657
</span> <dfn id=check-if-three-characters-would-start-an0
26472658
title="check if three characters would start an identifier|starts with an identifier|start with an identifier|would start an identifier">Check
2648-
if three characters would start an identifier</dfn></h3>
2659+
if three characters would start an identifier</dfn></h4>
26492660

26502661
<p> This section describes how to <a
26512662
href="#check-if-three-characters-would-start-an0"><i>check if three
@@ -2681,10 +2692,10 @@ <h3 id=check-if-three-characters-would-start-an><span class=secno>4.9.
26812692
escape</i></a>, return true. Otherwise, return false.
26822693
</dl>
26832694

2684-
<h3 id=check-if-three-characters-would-start-a-><span class=secno>4.10.
2695+
<h4 id=check-if-three-characters-would-start-a-><span class=secno>4.5.6.
26852696
</span> <dfn id=check-if-three-characters-would-start-a-0
26862697
title="check if three characters would start a number|starts with a number|start with a number|would start a number">Check
2687-
if three characters would start a number</dfn></h3>
2698+
if three characters would start a number</dfn></h4>
26882699

26892700
<p> This section describes how to <a
26902701
href="#check-if-three-characters-would-start-a-0"><i>check if three
@@ -2726,7 +2737,7 @@ <h3 id=check-if-three-characters-would-start-a-><span class=secno>4.10.
27262737
<dd> Return false.
27272738
</dl>
27282739

2729-
<h3 id=changes-from-css-2.1-tokenizer><span class=secno>4.11. </span>
2740+
<h3 id=changes-from-css-2.1-tokenizer><span class=secno>4.6. </span>
27302741
Changes from CSS 2.1 Tokenizer</h3>
27312742

27322743
<p> <em>This section is non-normative.</em>
@@ -4187,7 +4198,7 @@ <h2 class=no-num id=index> Index</h2>
41874198
<ul class=indexlist>
41884199
<li>are a valid escape, <a
41894200
href="#check-if-two-characters-are-a-valid-esca0"
4190-
title="section 4.8."><strong>4.8.</strong></a>
4201+
title="section 4.5.4."><strong>4.5.4.</strong></a>
41914202

41924203
<li>ASCII case-insensitive, <a href="#ascii-case-insensitive"
41934204
title="section 5.3."><strong>5.3.</strong></a>
@@ -4207,15 +4218,15 @@ <h2 class=no-num id=index> Index</h2>
42074218

42084219
<li>check if three characters would start an identifier, <a
42094220
href="#check-if-three-characters-would-start-an0"
4210-
title="section 4.9."><strong>4.9.</strong></a>
4221+
title="section 4.5.5."><strong>4.5.5.</strong></a>
42114222

42124223
<li>check if three characters would start a number, <a
42134224
href="#check-if-three-characters-would-start-a-0"
4214-
title="section 4.10."><strong>4.10.</strong></a>
4225+
title="section 4.5.6."><strong>4.5.6.</strong></a>
42154226

42164227
<li>check if two characters are a valid escape, <a
42174228
href="#check-if-two-characters-are-a-valid-esca0"
4218-
title="section 4.8."><strong>4.8.</strong></a>
4229+
title="section 4.5.4."><strong>4.5.4.</strong></a>
42194230

42204231
<li>Comment state, <a href="#comment-state0"
42214232
title="section 4.4.5."><strong>4.4.5.</strong></a>
@@ -4243,7 +4254,7 @@ <h2 class=no-num id=index> Index</h2>
42434254
title="section 5.5.2."><strong>5.5.2.</strong></a>
42444255

42454256
<li>Consume an escaped character, <a href="#consume-an-escaped-character0"
4246-
title="section 4.5."><strong>4.5.</strong></a>
4257+
title="section 4.5.1."><strong>4.5.1.</strong></a>
42474258

42484259
<li>Consume a qualified rule, <a href="#consume-a-qualified-rule0"
42494260
title="section 5.5.3."><strong>5.5.3.</strong></a>
@@ -4253,7 +4264,7 @@ <h2 class=no-num id=index> Index</h2>
42534264

42544265
<li>convert a sci-notation representation into a value, <a
42554266
href="#convert-a-sci-notation-representation-in0"
4256-
title="section 4.7."><strong>4.7.</strong></a>
4267+
title="section 4.5.3."><strong>4.5.3.</strong></a>
42574268

42584269
<li>current input character, <a href="#current-input-character"
42594270
title="section 4.3."><strong>4.3.</strong></a>
@@ -4282,7 +4293,7 @@ <h2 class=no-num id=index> Index</h2>
42824293
title="section 5.5.7."><strong>5.5.7.</strong></a>
42834294

42844295
<li>end of the range, <a href="#end-of-the-range"
4285-
title="section 4.6."><strong>4.6.</strong></a>
4296+
title="section 4.5.2."><strong>4.5.2.</strong></a>
42864297

42874298
<li>EOF character, <a href="#eof-character"
42884299
title="section 4.3."><strong>4.3.</strong></a>
@@ -4395,11 +4406,11 @@ <h2 class=no-num id=index> Index</h2>
43954406
title="section 4.4.11."><strong>4.4.11.</strong></a>
43964407

43974408
<li>sci-not-to-value, <a href="#convert-a-sci-notation-representation-in0"
4398-
title="section 4.7."><strong>4.7.</strong></a>
4409+
title="section 4.5.3."><strong>4.5.3.</strong></a>
43994410

44004411
<li>Set the unicode-range token's range, <a
44014412
href="#set-the-unicode-range-tokens-range0"
4402-
title="section 4.6."><strong>4.6.</strong></a>
4413+
title="section 4.5.2."><strong>4.5.2.</strong></a>
44034414

44044415
<li>simple block, <a href="#simple-block"
44054416
title="section 5."><strong>5.</strong></a>
@@ -4408,27 +4419,27 @@ <h2 class=no-num id=index> Index</h2>
44084419
title="section 4.4.3."><strong>4.4.3.</strong></a>
44094420

44104421
<li>start of the range, <a href="#start-of-the-range"
4411-
title="section 4.6."><strong>4.6.</strong></a>
4422+
title="section 4.5.2."><strong>4.5.2.</strong></a>
44124423

44134424
<li>starts with an identifier, <a
44144425
href="#check-if-three-characters-would-start-an0"
4415-
title="section 4.9."><strong>4.9.</strong></a>
4426+
title="section 4.5.5."><strong>4.5.5.</strong></a>
44164427

44174428
<li>starts with a number, <a
44184429
href="#check-if-three-characters-would-start-a-0"
4419-
title="section 4.10."><strong>4.10.</strong></a>
4430+
title="section 4.5.6."><strong>4.5.6.</strong></a>
44204431

44214432
<li>starts with a valid escape, <a
44224433
href="#check-if-two-characters-are-a-valid-esca0"
4423-
title="section 4.8."><strong>4.8.</strong></a>
4434+
title="section 4.5.4."><strong>4.5.4.</strong></a>
44244435

44254436
<li>start with an identifier, <a
44264437
href="#check-if-three-characters-would-start-an0"
4427-
title="section 4.9."><strong>4.9.</strong></a>
4438+
title="section 4.5.5."><strong>4.5.5.</strong></a>
44284439

44294440
<li>start with a number, <a
44304441
href="#check-if-three-characters-would-start-a-0"
4431-
title="section 4.10."><strong>4.10.</strong></a>
4442+
title="section 4.5.6."><strong>4.5.6.</strong></a>
44324443

44334444
<li>style sheet
44344445
<ul>
@@ -4470,11 +4481,11 @@ <h2 class=no-num id=index> Index</h2>
44704481

44714482
<li>would start an identifier, <a
44724483
href="#check-if-three-characters-would-start-an0"
4473-
title="section 4.9."><strong>4.9.</strong></a>
4484+
title="section 4.5.5."><strong>4.5.5.</strong></a>
44744485

44754486
<li>would start a number, <a
44764487
href="#check-if-three-characters-would-start-a-0"
4477-
title="section 4.10."><strong>4.10.</strong></a>
4488+
title="section 4.5.6."><strong>4.5.6.</strong></a>
44784489
</ul>
44794490
<!--end-index-->
44804491

‎css-syntax/Overview.src.html‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,8 +1822,15 @@ <h4>
18221822
<i>Reconsume the current input character</i>.
18231823
</dl>
18241824

1825+
18251826
<h3>
1826-
<dfn>Consume an escaped character</dfn></h3>
1827+
Tokenizer Algorithms</h3>
1828+
1829+
<p>
1830+
This section defines a number of specialized spec algorithms used by the tokenizer.
1831+
1832+
<h4>
1833+
<dfn>Consume an escaped character</dfn></h4>
18271834

18281835
<p>
18291836
This section describes how to <i>consume an escaped character</i>.
@@ -1854,8 +1861,8 @@ <h3>
18541861
Return the <i>current input character</i>.
18551862
</dl>
18561863

1857-
<h3>
1858-
<dfn>Set the unicode-range token's range</dfn></h3>
1864+
<h4>
1865+
<dfn>Set the unicode-range token's range</dfn></h4>
18591866

18601867
<p>
18611868
This section describes how to set a unicode-range token's range
@@ -1892,8 +1899,8 @@ <h3>
18921899
the character whose codepoint is the <i>start of the range</i>
18931900
and the character whose codepoint is the <i>end of the range</i>.
18941901

1895-
<h3>
1896-
<dfn title="convert a sci-notation representation into a value|sci-not-to-value">Convert a sci-notation representation into a value</dfn></h3>
1902+
<h4>
1903+
<dfn title="convert a sci-notation representation into a value|sci-not-to-value">Convert a sci-notation representation into a value</dfn></h4>
18971904

18981905
<p>
18991906
This section describes how to turn a sci-notation representation
@@ -1913,8 +1920,8 @@ <h3>
19131920
Return <code><var>base</var> * 10<sup><var>power</var></sup></code>.
19141921

19151922

1916-
<h3>
1917-
<dfn title="check if two characters are a valid escape|are a valid escape|starts with a valid escape">Check if two characters are a valid escape</dfn></h3>
1923+
<h4>
1924+
<dfn title="check if two characters are a valid escape|are a valid escape|starts with a valid escape">Check if two characters are a valid escape</dfn></h4>
19181925

19191926
<p>
19201927
This section describes how to <i>check if two characters are a valid escape</i>.
@@ -1942,8 +1949,8 @@ <h3>
19421949
Otherwise, return true.
19431950

19441951

1945-
<h3>
1946-
<dfn title="check if three characters would start an identifier|starts with an identifier|start with an identifier|would start an identifier">Check if three characters would start an identifier</dfn></h3>
1952+
<h4>
1953+
<dfn title="check if three characters would start an identifier|starts with an identifier|start with an identifier|would start an identifier">Check if three characters would start an identifier</dfn></h4>
19471954

19481955
<p>
19491956
This section describes how to <i>check if three characters would start an identifier</i>.
@@ -1979,8 +1986,8 @@ <h3>
19791986
Otherwise, return false.
19801987
</dl>
19811988

1982-
<h3>
1983-
<dfn title="check if three characters would start a number|starts with a number|start with a number|would start a number">Check if three characters would start a number</dfn></h3>
1989+
<h4>
1990+
<dfn title="check if three characters would start a number|starts with a number|start with a number|would start a number">Check if three characters would start a number</dfn></h4>
19841991

19851992
<p>
19861993
This section describes how to <i>check if three characters would start a number</i>.

0 commit comments

Comments
 (0)