Skip to content

Commit 7b383b7

Browse files
tabatkinstabatkins
committed
[css-syntax] Use variables in some algos rather than referring to steps by number.
1 parent bc011d1 commit 7b383b7

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

‎css-syntax/Overview.html‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</a></p>
1515
<h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
1616
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
17-
<span class=dt-updated><span class=value-title title=20130904>4 September 2013</span></span></span></h2>
17+
<span class=dt-updated><span class=value-title title=20130907>7 September 2013</span></span></span></h2>
1818
<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>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/2003/WD-css3-syntax-20030813/ rel=previous>http://www.w3.org/TR/2003/WD-css3-syntax-20030813/</a>
1919
<dt>Feedback:</dt>
2020
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
@@ -1957,10 +1957,12 @@ <h4 class="heading settled heading" data-level=5.3.3 id=parse-a-rule><span class
19571957

19581958
<p> Otherwise,
19591959
if the <a href=#current-input-token>current input token</a> is an <a class=css-code data-link-type=token href=#tokendef-at-keyword>〈at-keyword〉</a>,
1960-
<a href=#consume-an-at-rule0>consume an at-rule</a>.
1960+
<a href=#consume-an-at-rule0>consume an at-rule</a>
1961+
and let <var>rule</var> be the return value.
19611962

19621963
<p> Otherwise,
1963-
<a href=#consume-a-qualified-rule0>consume a qualified rule</a>.
1964+
<a href=#consume-a-qualified-rule0>consume a qualified rule</a>
1965+
and let <var>rule</var> be the return value.
19641966
If nothing was returned,
19651967
return a syntax error.
19661968

@@ -1970,7 +1972,7 @@ <h4 class="heading settled heading" data-level=5.3.3 id=parse-a-rule><span class
19701972

19711973
<li>
19721974
If the <a href=#current-input-token>current input token</a> is an <a class=css-code data-link-type=token href=#tokendef-eof>〈EOF〉</a>,
1973-
return the rule obtained in step 2.
1975+
return <var>rule</var>.
19741976
Otherwise, return a syntax error.
19751977
</ol>
19761978

@@ -2034,7 +2036,8 @@ <h4 class="heading settled heading" data-level=5.3.6 id=parse-a-component-value>
20342036

20352037
<li>
20362038
<a href=#reconsume-the-current-input-token>Reconsume the current input token</a>.
2037-
<a href=#consume-a-component-value0>Consume a component value</a>.
2039+
<a href=#consume-a-component-value0>Consume a component value</a>
2040+
and let <var>value</var> be the return value.
20382041
If nothing is returned,
20392042
return a syntax error.
20402043

@@ -2044,7 +2047,7 @@ <h4 class="heading settled heading" data-level=5.3.6 id=parse-a-component-value>
20442047

20452048
<li>
20462049
If the <a href=#current-input-token>current input token</a> is an <a class=css-code data-link-type=token href=#tokendef-eof>〈EOF〉</a>,
2047-
return the <a href=#component-value>component value</a> returned in step 3.
2050+
return <var>value</var>.
20482051
Otherwise,
20492052
return a syntax error.
20502053
</ol>
@@ -3164,11 +3167,11 @@ <h2 class="no-num no-ref heading settled heading" id=references><span class=cont
31643167

31653168
<h3 class="no-num no-ref heading settled heading" id=normative><span class=content>
31663169
Normative References</span><a class=self-link href=#normative></a></h3>
3167-
<div data-fill-with=normative-references><dl><dt id=css21 title=CSS21><a class=self-link href=#css21></a>[CSS21]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607/>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607/>http://www.w3.org/TR/2011/REC-CSS2-20110607/</a><dt id=css3cascade title=CSS3CASCADE><a class=self-link href=#css3cascade></a>[CSS3CASCADE]<dd>Håkon Wium Lie; Elika J. Etemad; Tab Atkins Jr.. <a href=http://www.w3.org/TR/2013/WD-css3-cascade-20130103/>CSS Cascading and Inheritance Level 3</a>. 3 January 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-cascade-20130103/>http://www.w3.org/TR/2013/WD-css3-cascade-20130103/</a><dt id=rfc2119 title=RFC2119><a class=self-link href=#rfc2119></a>[RFC2119]<dd>S. Bradner. <a href=http://www.ietf.org/rfc/rfc2119.txt>Key words for use in RFCs to Indicate Requirement Levels</a>. URL: <a href=http://www.ietf.org/rfc/rfc2119.txt>http://www.ietf.org/rfc/rfc2119.txt</a><dt id=select title=SELECT><a class=self-link href=#select></a>[SELECT]<dd>Tantek Çelik; et al. <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>Selectors Level 3</a>. 29 September 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a></dl></div>
3170+
<div data-fill-with=normative-references><dl><dt id=css21 title=CSS21><a class=self-link href=#css21></a>[CSS21]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>http://www.w3.org/TR/2011/REC-CSS2-20110607</a><dt id=css3cascade title=CSS3CASCADE><a class=self-link href=#css3cascade></a>[CSS3CASCADE]<dd>Håkon Wium Lie; Elika J. Etemad; Tab Atkins Jr.. <a href=http://www.w3.org/TR/2013/WD-css3-cascade-20130103/>CSS Cascading and Inheritance Level 3</a>. 3 January 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-cascade-20130103/>http://www.w3.org/TR/2013/WD-css3-cascade-20130103/</a><dt id=rfc2119 title=RFC2119><a class=self-link href=#rfc2119></a>[RFC2119]<dd>S. Bradner. <a href=http://www.ietf.org/rfc/rfc2119.txt>Key words for use in RFCs to Indicate Requirement Levels</a>. URL: <a href=http://www.ietf.org/rfc/rfc2119.txt>http://www.ietf.org/rfc/rfc2119.txt</a><dt id=select title=SELECT><a class=self-link href=#select></a>[SELECT]<dd>Tantek Çelik; et al. <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>Selectors Level 3</a>. 29 September 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a></dl></div>
31683171

31693172
<h3 class="no-num no-ref heading settled heading" id=informative><span class=content>
31703173
Informative References</span><a class=self-link href=#informative></a></h3>
3171-
<div data-fill-with=informative-references><dl><dt id=css-variables title=CSS-VARIABLES><a class=self-link href=#css-variables></a>[CSS-VARIABLES]<dd>Luke Macpherson; Tab Atkins Jr.; Daniel Glazman. <a href=http://www.w3.org/TR/2012/WD-css-variables-20120410/>CSS Variables Module Level 1</a>. 10 April 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css-variables-20120410/>http://www.w3.org/TR/2012/WD-css-variables-20120410/</a><dt id=css3-animations title=CSS3-ANIMATIONS><a class=self-link href=#css3-animations></a>[CSS3-ANIMATIONS]<dd>Dean Jackson; et al. <a href=http://www.w3.org/TR/2012/WD-css3-animations-20120403/>CSS Animations</a>. 3 April 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-animations-20120403/>http://www.w3.org/TR/2012/WD-css3-animations-20120403/</a><dt id=css3-conditional title=CSS3-CONDITIONAL><a class=self-link href=#css3-conditional></a>[CSS3-CONDITIONAL]<dd>L. David Baron. <a href=http://www.w3.org/TR/2012/WD-css3-conditional-20121213/>CSS Conditional Rules Module Level 3</a>. 13 December 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-conditional-20121213/>http://www.w3.org/TR/2012/WD-css3-conditional-20121213/</a><dt id=mediaq title=MEDIAQ><a class=self-link href=#mediaq></a>[MEDIAQ]<dd>Florian Rivoal. <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>Media Queries</a>. 19 June 2012. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/</a></dl></div>
3174+
<div data-fill-with=informative-references><dl><dt id=css-variables title=CSS-VARIABLES><a class=self-link href=#css-variables></a>[CSS-VARIABLES]<dd>Tab Atkins Jr.; Luke Macpherson; Daniel Glazman. <a href=http://www.w3.org/TR/2013/WD-css-variables-20130620/>CSS Custom Properties for Cascading Variables Module Level 1</a>. 20 June 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css-variables-20130620/>http://www.w3.org/TR/2013/WD-css-variables-20130620/</a><dt id=css3-animations title=CSS3-ANIMATIONS><a class=self-link href=#css3-animations></a>[CSS3-ANIMATIONS]<dd>Dean Jackson; et al. <a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/>CSS Animations</a>. 19 February 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/>http://www.w3.org/TR/2013/WD-css3-animations-20130219/</a><dt id=css3-conditional title=CSS3-CONDITIONAL><a class=self-link href=#css3-conditional></a>[CSS3-CONDITIONAL]<dd>L. David Baron. <a href=http://www.w3.org/TR/2013/CR-css3-conditional-20130404/>CSS Conditional Rules Module Level 3</a>. 4 April 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-css3-conditional-20130404/>http://www.w3.org/TR/2013/CR-css3-conditional-20130404/</a><dt id=mediaq title=MEDIAQ><a class=self-link href=#mediaq></a>[MEDIAQ]<dd>Florian Rivoal. <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>Media Queries</a>. 19 June 2012. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/>http://www.w3.org/TR/2012/REC-css3-mediaqueries-20120619/</a></dl></div>
31723175

31733176
<h2 class="no-num no-ref heading settled heading" id=index><span class=content>
31743177
Index</span><a class=self-link href=#index></a></h2>

‎css-syntax/Overview.src.html‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,10 +1841,12 @@ <h4>
18411841

18421842
Otherwise,
18431843
if the <a>current input token</a> is an <<<at-keyword>>>,
1844-
<a>consume an at-rule</a>.
1844+
<a>consume an at-rule</a>
1845+
and let <var>rule</var> be the return value.
18451846

18461847
Otherwise,
1847-
<a>consume a qualified rule</a>.
1848+
<a>consume a qualified rule</a>
1849+
and let <var>rule</var> be the return value.
18481850
If nothing was returned,
18491851
return a syntax error.
18501852

@@ -1854,7 +1856,7 @@ <h4>
18541856

18551857
<li>
18561858
If the <a>current input token</a> is an <<<EOF>>>,
1857-
return the rule obtained in step 2.
1859+
return <var>rule</var>.
18581860
Otherwise, return a syntax error.
18591861
</ol>
18601862

@@ -1918,7 +1920,8 @@ <h4>
19181920

19191921
<li>
19201922
<a>Reconsume the current input token</a>.
1921-
<a>Consume a component value</a>.
1923+
<a>Consume a component value</a>
1924+
and let <var>value</var> be the return value.
19221925
If nothing is returned,
19231926
return a syntax error.
19241927

@@ -1928,7 +1931,7 @@ <h4>
19281931

19291932
<li>
19301933
If the <a>current input token</a> is an <<<EOF>>>,
1931-
return the <a>component value</a> returned in step 3.
1934+
return <var>value</var>.
19321935
Otherwise,
19331936
return a syntax error.
19341937
</ol>

0 commit comments

Comments
 (0)