Skip to content

Commit e11e51d

Browse files
committed
Minor editorial tweaks. Switch reference to CSS3-cascade to CSS21
1 parent b26379c commit e11e51d

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

css3-values/Overview.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ <h2 class="no-num no-toc" id=status>Status of this document</h2>
134134
href="#vm-unit"><code class=css>vm</code></a>&rsquo;, &lsquo;<a
135135
href="#fr-unit"><code class=css>fr</code></a>&rsquo;, &lsquo;<a
136136
href="#gr-unit"><code class=css>gr</code></a>&rsquo;, &lsquo;<code
137-
class=css>cycle()</code>&rsquo;.
137+
class=css>cycle()</code>&rsquo;, &lsquo;<code
138+
class=css>attr()</code>&rsquo;.
138139

139140
<h2 class="no-num no-toc" id=contents>Table of contents</h2>
140141
<!--begin-toc-->

css3-values/Overview.src.html

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -934,14 +934,14 @@ <h3 id="calc">
934934
of length, frequency, angle, time, or number. NUMBER tokens are of
935935
type number. DIMENSION tokens have types of their units ('cm' is
936936
length, 'deg' is angle etc.); any DIMENSION whose type does not match
937-
the target type is not allowed and must be a parse error. If
937+
the target type causes the ''calc()'' expression to be invalid. If
938938
percentages are accepted in that context and convertible to the target
939939
type, a PERCENTAGE token in the expression has the target type;
940-
otherwise percentages are not allowed and must be a parse error.
940+
otherwise percentages are likewise invalid.
941941

942942
<p>To make expressions simpler, operators have restrictions on the
943943
types they accept. At each operator, the types of the left and right
944-
side have to be checked for these restrictions. If compatible, they
944+
side are be checked for these restrictions. If compatible, they
945945
return roughly as follows (the following ignores precedence rules on
946946
the operators for simplicity):
947947

@@ -979,7 +979,7 @@ <h3 id="calc">
979979

980980

981981
<p>Given the complexities of 'width' and 'height' on table cells and
982-
table elements, calc() expressions for 'width' and 'height' on table
982+
table elements, calc() expressions for widths and heights on table
983983
columns, table column groups, table rows, table row groups, and
984984
table cells in both auto and fixed layout tables may be treated as if
985985
'auto' had been specified.
@@ -993,7 +993,7 @@ <h3 id="cycle">
993993

994994
<pre>cycle( &lt;value&gt;# )</pre>
995995

996-
<p>where <code>&lt;value&lt;</code> is a CSS value that is valid where
996+
<p>where <code>&lt;value&gt;</code> is a CSS value that is valid where
997997
the expression is placed. If any of the values inside are not valid,
998998
then the entire ''cycle()'' expression is invalid.
999999

@@ -1003,7 +1003,7 @@ <h3 id="cycle">
10031003
<var>C<sub>n</sub></var> returned by the <var>n</var>-th argument to
10041004
''cycle()''.
10051005
For the earliest <var>C<sub>n</sub></var> such that
1006-
<var>C<sub>n</sub></var> == <var>I</var>, the value returned by cycle
1006+
<var>C<sub>n</sub></var> = <var>I</var>, the value returned by cycle
10071007
is <var>C<sub>n+1</sub></var>. However, if this <var>C<sub>n</sub></var>
10081008
is the last value, or if there are no <var>C<sub>n</sub></var> that
10091009
equal <var>I</var>, the computed value of the first value is returned
@@ -1300,13 +1300,13 @@ <h2>Specified, computed, used, and actual values</h2>
13001300
formatting the document, thereby yielding the <em>computed value</em>.
13011301
The computed value is transformed into the <em>used value</em> in the
13021302
formatting process. Finally, the computed value is transformed to
1303-
the <em>actual value</em> based on constraints in the user agent.</p>
1303+
the <em>actual value</em> based on constraints in the device and user agent.</p>
13041304

13051305
<h3>Finding the <dfn>specified value</dfn></h3>
13061306

1307-
<p>The <em>specified value</em> is the output of the cascading and
1308-
inheritance process [[!CSS3CASCADE]].
1309-
1307+
<p>The <em>specified value</em> is the output of the
1308+
<a href="http://www.w3.org/TR/CSS21/cascade.html">cascading and inheritance
1309+
process</a>. [[!CSS21]]
13101310

13111311
<h3>Finding the <dfn>computed value</dfn></h3>
13121312

@@ -1319,9 +1319,8 @@ <h3>Finding the <dfn>computed value</dfn></h3>
13191319
<p>For relative values, on the other hand, computation is necessary to
13201320
find the computed values: percentages must be multiplied by a
13211321
reference value (each property defines which value that is), values
1322-
with relative units (em, ex, px) must be made absolute by multiplying
1323-
with the appropriate font or pixel size, 'auto' values must be
1324-
computed by the formulas given with each property, certain keywords
1322+
with relative units (em, ex, vh, vw) must be made absolute by multiplying
1323+
with the appropriate reference size, certain keywords
13251324
(e.g., 'smaller', 'bolder') must be replaced according to their
13261325
definitions. See example (f), (g) and (h) in the table below.</p>
13271326

0 commit comments

Comments
 (0)