Skip to content

Commit 069fff0

Browse files
tabatkinstabatkins
committed
cycle=>toggle, per WG resolution.
1 parent 4147bd9 commit 069fff0

2 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎css3-values/Overview.html‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ <h2 class="no-num no-toc" id=status>Status of this document</h2>
149149

150150
<p>The following features are at-risk and may be dropped during the CR
151151
period: ‘<a href="#calc"><code class=css>calc()</code></a>’, ‘<a
152-
href="#cycle"><code class=css>cycle()</code></a>’, ‘<a
152+
href="#toggle"><code class=css>toggle()</code></a>’, ‘<a
153153
href="#attr"><code class=css>attr()</code></a>’.
154154

155155
<h2 class="no-num no-toc" id=contents>Table of contents</h2>
@@ -290,8 +290,8 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
290290
Checking</a>
291291
</ul>
292292

293-
<li><a href="#cycle-notation"><span class=secno>8.2. </span> Cycling
294-
Values: ‘<code class=css>cycle()</code>’</a>
293+
<li><a href="#toggle-notation"><span class=secno>8.2. </span> Cycling
294+
Values: ‘<code class=css>toggle()</code>’</a>
295295

296296
<li><a href="#attr-notation"><span class=secno>8.3. </span> Attribute
297297
References: ‘<code class=css>attr()</code>’</a>
@@ -1519,35 +1519,35 @@ <h4 id=calc-range><span class=secno>8.1.3. </span> Range Checking</h4>
15191519
width: 0px;</pre>
15201520
</div>
15211521

1522-
<h3 id=cycle-notation><span class=secno>8.2. </span> Cycling Values: ‘<a
1523-
href="#cycle"><code class=css>cycle()</code></a>’</h3>
1522+
<h3 id=toggle-notation><span class=secno>8.2. </span> Cycling Values: ‘<a
1523+
href="#toggle"><code class=css>toggle()</code></a>’</h3>
15241524

1525-
<p>The <dfn id=cycle>cycle()</dfn> expression allows descendant elements to
1526-
cycle over a list of values instead of inheriting the same value. The
1527-
syntax of the ‘<a href="#cycle"><code class=css>cycle()</code></a>’
1525+
<p>The <dfn id=toggle>toggle()</dfn> expression allows descendant elements
1526+
to cycle over a list of values instead of inheriting the same value. The
1527+
syntax of the ‘<a href="#toggle"><code class=css>toggle()</code></a>’
15281528
expression is:
15291529

1530-
<pre>cycle( &lt;value&gt;# )</pre>
1530+
<pre>toggle( &lt;value&gt;# )</pre>
15311531

15321532
<p>where <var>&lt;value></var> is a CSS value that is valid where the
15331533
expression is placed. If any of the values inside are not valid, then the
1534-
entire ‘<a href="#cycle"><code class=css>cycle()</code></a>’
1534+
entire ‘<a href="#toggle"><code class=css>toggle()</code></a>’
15351535
expression is invalid.
15361536

1537-
<p>The value returned by ‘<a href="#cycle"><code
1538-
class=css>cycle()</code></a>’ must be determined by comparing the
1537+
<p>The value returned by ‘<a href="#toggle"><code
1538+
class=css>toggle()</code></a>’ must be determined by comparing the
15391539
inherited value <var>I</var> (the computed value on the parent, or, for
15401540
the root, the initial value) to the computed values
15411541
<var>C<sub>n</sub></var> returned by the <var>n</var>-th argument to ‘<a
1542-
href="#cycle"><code class=css>cycle()</code></a>’. For the earliest
1542+
href="#toggle"><code class=css>toggle()</code></a>’. For the earliest
15431543
<var>C<sub>n</sub></var> such that <var>C<sub>n</sub></var> =
1544-
<var>I</var>, the value returned by cycle is <var>C<sub>n+1</sub></var>.
1544+
<var>I</var>, the value returned by toggle is <var>C<sub>n+1</sub></var>.
15451545
However, if this <var>C<sub>n</sub></var> is the last value, or if there
15461546
are no <var>C<sub>n</sub></var> that equal <var>I</var>, the computed
15471547
value of the first value is returned instead.
15481548

1549-
<p class=note>Note that ‘<a href="#cycle"><code
1550-
class=css>cycle()</code></a>’ explicitly looks at the computed value of
1549+
<p class=note>Note that ‘<a href="#toggle"><code
1550+
class=css>toggle()</code></a>’ explicitly looks at the computed value of
15511551
the parent, so it is useful even for non-inherited properties. This is
15521552
similar to the ‘<a href="#inherit"><code class=css>inherit</code></a>’
15531553
keyword, which is useful even for non-inherited properties.
@@ -1556,7 +1556,7 @@ <h3 id=cycle-notation><span class=secno>8.2. </span> Cycling Values: ‘<a
15561556
<pre>
15571557
/* make em elements italic, but make them normal if they're inside
15581558
something that's italic */
1559-
em { font-style: cycle(italic, normal); }</pre>
1559+
em { font-style: toggle(italic, normal); }</pre>
15601560
</div>
15611561

15621562
<div class=example>
@@ -1565,10 +1565,10 @@ <h3 id=cycle-notation><span class=secno>8.2. </span> Cycling Values: ‘<a
15651565
disk markers, but nested lists use circle, square, box, and then
15661566
(for the 5th list deep) repeat */
15671567
ul { list-style-type: disc; }
1568-
ul ul { list-style-type: cycle(disc, circle, square, box); }</pre>
1568+
ul ul { list-style-type: toggle(disc, circle, square, box); }</pre>
15691569
</div>
15701570

1571-
<p>The ‘<a href="#cycle"><code class=css>cycle()</code></a>’ notation
1571+
<p>The ‘<a href="#toggle"><code class=css>toggle()</code></a>’ notation
15721572
is not allowed to be nested; nor may it contain ‘<a href="#attr"><code
15731573
class=css>attr()</code></a>’ or ‘<a href="#calc"><code
15741574
class=css>calc()</code></a>’ notations. Declarations containing such
@@ -2164,8 +2164,6 @@ <h2 class=no-num id=index>Index</h2>
21642164
<li><a href="#color-value"><var>&lt;color></var></a>, <a
21652165
href="#color-value" title="&lt;color>"><strong>7.1.</strong></a>
21662166

2167-
<li>cycle(), <a href="#cycle" title="cycle()"><strong>8.2.</strong></a>
2168-
21692167
<li>deg, <a href="#deg" title=deg><strong>6.1.</strong></a>
21702168

21712169
<li>dimension, <a href="#dimension"
@@ -2263,6 +2261,9 @@ <h2 class=no-num id=index>Index</h2>
22632261
<li>&lt;time&gt;, <a href="#time-value"
22642262
title="&lt;time&gt;"><strong>6.2.</strong></a>
22652263

2264+
<li>toggle(), <a href="#toggle" title="toggle()"><strong>8.2.</strong></a>
2265+
2266+
22662267
<li>turn, <a href="#turn" title=turn><strong>6.1.</strong></a>
22672268

22682269
<li>URL, <a href="#url" title=URL><strong>3.4.</strong></a>

‎css3-values/Overview.src.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ <h2 class="no-num no-toc" id="status">Status of this document</h2>
8181
please inform the editors!
8282

8383
<p>The following features are at-risk and may be dropped during the
84-
CR period: ''calc()'', ''cycle()'', ''attr()''.
84+
CR period: ''calc()'', ''toggle()'', ''attr()''.
8585

8686
<h2 class="no-num no-toc" id="contents">Table of contents</h2>
8787

@@ -1077,32 +1077,32 @@ <h4 id='calc-range'>
10771077
width: 0px;</pre>
10781078
</div>
10791079

1080-
<h3 id="cycle-notation">
1081-
Cycling Values: ''cycle()''</h3>
1080+
<h3 id="toggle-notation">
1081+
Cycling Values: ''toggle()''</h3>
10821082

1083-
<p>The <dfn>cycle()</dfn> expression allows descendant elements
1083+
<p>The <dfn>toggle()</dfn> expression allows descendant elements
10841084
to cycle over a list of values instead of inheriting the same value.
1085-
The syntax of the ''cycle()'' expression is:
1085+
The syntax of the ''toggle()'' expression is:
10861086

1087-
<pre>cycle( &lt;value&gt;# )</pre>
1087+
<pre>toggle( &lt;value&gt;# )</pre>
10881088

10891089
<p>where <var>&lt;value></var> is a CSS value that is valid where
10901090
the expression is placed. If any of the values inside are not valid,
1091-
then the entire ''cycle()'' expression is invalid.
1091+
then the entire ''toggle()'' expression is invalid.
10921092

1093-
<p>The value returned by ''cycle()'' must be determined by comparing
1093+
<p>The value returned by ''toggle()'' must be determined by comparing
10941094
the inherited value <var>I</var> (the computed value on the parent,
10951095
or, for the root, the initial value) to the computed values
10961096
<var>C<sub>n</sub></var> returned by the <var>n</var>-th argument to
1097-
''cycle()''.
1097+
''toggle()''.
10981098
For the earliest <var>C<sub>n</sub></var> such that
1099-
<var>C<sub>n</sub></var> = <var>I</var>, the value returned by cycle
1099+
<var>C<sub>n</sub></var> = <var>I</var>, the value returned by toggle
11001100
is <var>C<sub>n+1</sub></var>. However, if this <var>C<sub>n</sub></var>
11011101
is the last value, or if there are no <var>C<sub>n</sub></var> that
11021102
equal <var>I</var>, the computed value of the first value is returned
11031103
instead.</p>
11041104

1105-
<p class='note'>Note that ''cycle()'' explicitly looks at the computed value
1105+
<p class='note'>Note that ''toggle()'' explicitly looks at the computed value
11061106
of the parent, so it is useful even for non-inherited properties. This
11071107
is similar to the ''inherit'' keyword, which is useful even for non-inherited
11081108
properties.</p>
@@ -1111,7 +1111,7 @@ <h3 id="cycle-notation">
11111111
<pre>
11121112
/* make em elements italic, but make them normal if they're inside
11131113
something that's italic */
1114-
em { font-style: cycle(italic, normal); }</pre>
1114+
em { font-style: toggle(italic, normal); }</pre>
11151115
</div>
11161116

11171117
<div class='example'>
@@ -1120,10 +1120,10 @@ <h3 id="cycle-notation">
11201120
disk markers, but nested lists use circle, square, box, and then
11211121
(for the 5th list deep) repeat */
11221122
ul { list-style-type: disc; }
1123-
ul ul { list-style-type: cycle(disc, circle, square, box); }</pre>
1123+
ul ul { list-style-type: toggle(disc, circle, square, box); }</pre>
11241124
</div>
11251125

1126-
<p>The ''cycle()'' notation is not allowed to be nested; nor may it
1126+
<p>The ''toggle()'' notation is not allowed to be nested; nor may it
11271127
contain ''attr()'' or ''calc()'' notations.
11281128
Declarations containing such constructs are invalid.</p>
11291129

0 commit comments

Comments
 (0)