Skip to content

Commit 5c3a018

Browse files
committed
1 parent 546669e commit 5c3a018

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

css3-values/Overview.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,16 +1352,19 @@ <h3 id=calc-notation><span class=secno>8.1. </span> Mathematical
13521352
href="#integer-value"><var>&lt;integer></var></a> values are allowed.
13531353
Components of a ‘<a href="#calc"><code class=css>calc()</code></a>
13541354
expression can be literal values, ‘<a href="#attr"><code
1355-
class=css>attr()</code></a>’ expressions, or <a
1355+
class=css>attr()</code></a>’ or ‘<a href="#calc"><code
1356+
class=css>calc()</code></a>’ expressions, or <a
13561357
href="#percentage-value"><var>&lt;percentage></var></a> values that
13571358
resolve to one of the preceding types.
13581359

1359-
<p> The computed value of a calc() expression is the expression with all
1360+
<p> The computed value of a ‘<a href="#calc"><code
1361+
class=css>calc()</code></a>’ expression is the expression with all
13601362
components computed, with all multiplication/division subexpressions
13611363
resolved, and with all addition/subtraction subexpressions resolved where
13621364
both sides are the same type. <span class=note> Thus, the computed value
1363-
of a calc() expression can be represented as either a number or a tuple of
1364-
a dimension and a percentage. </span>
1365+
of a ‘<a href="#calc"><code class=css>calc()</code></a>’ expression
1366+
can be represented as either a number or a tuple of a dimension and a
1367+
percentage. </span>
13651368
<!-- http://lists.w3.org/Archives/Public/www-style/2010May/0001.html
13661369
This has notes on how we should handle things when calc() is extended to
13671370
handle unit mult/div. Related to this is <unit>mod<unit>, which can return
@@ -1443,7 +1446,7 @@ <h4 id=calc-syntax><span class=secno>8.1.1. </span> Syntax</h4>
14431446
sum : product [ S+ [ "+" | "-" ] S+ product ]*;
14441447
product : unit [ S* [ "*" S* unit | "/" S* NUMBER ] ]*;
14451448
attr : "attr(" S* wqname [ S+ type-keyword ]? S* [ "," [ unit | calc ] S* ]? ")";
1446-
unit : [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" | attr ];</pre>
1449+
unit : [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" | calc | attr ];</pre>
14471450

14481451
<p class=note>Note that the grammar requires spaces around binary ‘<code
14491452
class=css>+</code>’ and ‘<code class=css>-</code>’ operators. The

css3-values/Overview.src.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -899,16 +899,16 @@ <h3 id="calc-notation">
899899
<var>&lt;integer></var>
900900
values are allowed.
901901
Components of a ''calc()'' expression can be literal values,
902-
''attr()'' expressions, or <var>&lt;percentage></var> values
902+
''attr()'' or ''calc()'' expressions, or <var>&lt;percentage></var> values
903903
that resolve to one of the preceding types.
904904

905905
<p>
906-
The computed value of a calc() expression is the expression
906+
The computed value of a ''calc()'' expression is the expression
907907
with all components computed,
908908
with all multiplication/division subexpressions resolved,
909909
and with all addition/subtraction subexpressions resolved where both sides are the same type.
910910
<span class='note'>
911-
Thus, the computed value of a calc() expression can be represented
911+
Thus, the computed value of a ''calc()'' expression can be represented
912912
as either a number
913913
or a tuple of a dimension and a percentage.
914914
</span>
@@ -992,7 +992,7 @@ <h4 id='calc-syntax'>
992992
sum : product [ S+ [ "+" | "-" ] S+ product ]*;
993993
product : unit [ S* [ "*" S* unit | "/" S* NUMBER ] ]*;
994994
attr : "attr(" S* wqname [ S+ type-keyword ]? S* [ "," [ unit | calc ] S* ]? ")";
995-
unit : [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" | attr ];</pre>
995+
unit : [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" | calc | attr ];</pre>
996996

997997
<p class='note'>Note that the grammar requires spaces around binary ''+''
998998
and ''-'' operators. The ''*'' and ''/'' operators do not require

css3-values/issues-lc-2012.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Issue 28.
190190
Summary: Define normalization handling of <author-ident>
191191
From: fantasai
192192
Comment: http://lists.w3.org/Archives/Public/www-style/2012May/0026.html
193-
Response:
193+
Response: http://lists.w3.org/Archives/Public/www-style/2012Jun/0680.html
194194
Open
195195
----
196196
Issue 29.
@@ -217,5 +217,4 @@ Summary: Add vmax
217217
From: Benjamin Lord
218218
Comment: http://lists.w3.org/Archives/Public/www-style/2012May/1198.html
219219
Closed: Accepted
220-
OPEN NEEDS EDITS
221220
----

0 commit comments

Comments
 (0)