- From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 12 Dec 2011 21:52:48 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-values In directory hutz:/tmp/cvs-serv24588 Modified Files: Overview.html Overview.src.html Log Message: Remove min() and max() Index: Overview.html =================================================================== RCS file: /sources/public/csswg/css3-values/Overview.html,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- Overview.html 31 Oct 2011 19:10:23 -0000 1.133 +++ Overview.html 12 Dec 2011 21:52:45 -0000 1.134 @@ -26,19 +26,19 @@ <h1>CSS Values and Units Module Level 3</h1> - <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 31 October + <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 12 December 2011</h2> <dl> <dt>This version: <dd><a - href="http://www.w3.org/TR/2011/ED-css3-values-20111031/">http://www.w3.org/TR/2011/ED-css3-values-20111031/</a> + href="http://www.w3.org/TR/2011/ED-css3-values-20111212/">http://www.w3.org/TR/2011/ED-css3-values-20111212/</a> <dt>Latest version: <dd><a - href="http://www.w3.org/TR/css3-values/">http://www.w3.org/TR/css3-values/</a> + href="http://www.w3.org/TR/css3-values//">http://www.w3.org/TR/css3-values//</a> <dt>Editor's draft: @@ -136,10 +136,8 @@ <p>The following features are at-risk and may be dropped during the CR period: ‘<a href="#calc0"><code class=css>calc()</code></a>’, - ‘<a href="#min"><code class=css>min()</code></a>’, ‘<a - href="#max"><code class=css>max()</code></a>’, ‘<a - href="#cycle-value"><code class=css>cycle()</code></a>’, ‘<a - href="#attr-value"><code class=css>attr()</code></a>’. + ‘<a href="#cycle-value"><code class=css>cycle()</code></a>’, + ‘<a href="#attr-value"><code class=css>attr()</code></a>’. <h2 class="no-num no-toc" id=contents>Table of contents</h2> <!--begin-toc--> @@ -265,9 +263,7 @@ Notations</a> <ul class=toc> <li><a href="#calc"><span class=secno>8.1. </span> Mathematical - Expressions: ‘<code class=css>calc()</code>’, ‘<code - class=css>min()</code>’ and ‘<code - class=css>max()</code>’</a> + Expressions: ‘<code class=css>calc()</code>’</a> <li><a href="#cycle"><span class=secno>8.2. </span> Cycling Values: ‘<code class=css>cycle()</code>’</a> @@ -1226,23 +1222,16 @@ <!-- -->width: calc(50% - 2em);</pre> <h3 id=calc><span class=secno>8.1. </span> Mathematical Expressions: - ‘<a href="#calc0"><code class=css>calc()</code></a>’, - ‘<a href="#min"><code class=css>min()</code></a>’ and - ‘<a href="#max"><code class=css>max()</code></a>’</h3> + ‘<a href="#calc0"><code class=css>calc()</code></a>’</h3> - <p>The <dfn id=calc0>calc()</dfn>, <dfn id=min>min()</dfn>, and <dfn - id=max>max()</dfn> functions allow mathematical expressions with addition - (‘<code class=css>+</code>’), subtraction (‘<code - class=css>-</code>’), multiplication (‘<code + <p>The <dfn id=calc0>calc()</dfn> function allows mathematical expressions + with addition (‘<code class=css>+</code>’), subtraction + (‘<code class=css>-</code>’), multiplication (‘<code class=css>*</code>’), and division (‘<code class=css>/</code>’) to be used as component values. The ‘<a href="#calc0"><code class=css>calc()</code></a>’ expression represents the result of the mathematical calculation it contains, using - standard operator precedence rules. The ‘<a href="#min"><code - class=css>min()</code></a>’ and ‘<a href="#max"><code - class=css>max()</code></a>’ expressions represent the minimum and - maximum, respectively, of their comma-separated arguments. These - expressions can be used wherever <a + standard operator precedence rules. It can be used wherever <a href="#length-value"><code><length></code></a>, <a href="#frequency-value"><code><frequency></code></a>, <a href="#angle-value"><code><angle></code></a>, <a @@ -1269,16 +1258,6 @@ }</pre> </div> - <div class=example> - <pre> -p { font-size: min(10px, 3em) } -blockquote { font-size: max(30px, 3em) }</pre> - </div> - - <div class=example> - <pre>.box { width: min(10% + 20px, 300px) }</pre> - </div> - <p class=issue>Add less trivial examples, particularly involving parens or nesting. @@ -1286,14 +1265,11 @@ and prose below. <pre> -math : [ calc | min | max ] S*; +math : calc S*; calc : "calc(" S* sum S* ")"; -min : "min(" S* sum [ "," S* sum ]* S* ")"; -max : "max(" S* sum [ "," S* sum ]* S* ")"; sum : product [ S+ [ "+" | "-" ] S+ product ]*; product : unit [ S* [ "*" | "/" ] S* unit ]*; -unit : ["+"|"-"]? [ NUMBER | DIMENSION | PERCENTAGE | - min | max | "(" S* sum S* ")" ];</pre> +unit : ["+"|"-"]? [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" ];</pre> <p class=note>Note that the grammar requires spaces around binary ‘<code class=css>+</code>’ and ‘<code @@ -1437,10 +1413,8 @@ <p>The ‘<a href="#cycle-value"><code class=css>cycle()</code></a>’ notation is not allowed to be nested; nor may it contain ‘<a href="#attr-value"><code - class=css>attr()</code></a>’, ‘<a href="#calc0"><code - class=css>calc()</code></a>’, ‘<a href="#min"><code - class=css>min()</code></a>’, or ‘<a href="#max"><code - class=css>max()</code></a>’ notations. Declarations containing such + class=css>attr()</code></a>’ or ‘<a href="#calc0"><code + class=css>calc()</code></a>’ notations. Declarations containing such constructs are invalid. <h3 id=attr><span class=secno>8.3. </span> Attribute References: ‘<a @@ -2232,10 +2206,6 @@ <li><a href="#length-value"><code><length></code></a>, <a href="#length-value" title="<length>"><strong>5.</strong></a> - <li>max(), <a href="#max" title="max()"><strong>8.1.</strong></a> - - <li>min(), <a href="#min" title="min()"><strong>8.1.</strong></a> - <li>ms, <a href="#ms" title=ms><strong>6.2.</strong></a> <li>number, <a href="#number" title=number><strong>4.2.</strong></a> Index: Overview.src.html =================================================================== RCS file: /sources/public/csswg/css3-values/Overview.src.html,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 --- Overview.src.html 31 Oct 2011 19:10:23 -0000 1.136 +++ Overview.src.html 12 Dec 2011 21:52:46 -0000 1.137 @@ -74,7 +74,7 @@ CSS3). <p>The following features are at-risk and may be dropped during the -CR period: ''calc()'', ''min()'', ''max()'', ''cycle()'', ''attr()''. +CR period: ''calc()'', ''cycle()'', ''attr()''. <h2 class="no-num no-toc" id="contents">Table of contents</h2> @@ -815,16 +815,14 @@ <!-- -->width: calc(50% - 2em);</pre> <h3 id="calc"> -Mathematical Expressions: ''calc()'', ''min()'' and ''max()''</h3> +Mathematical Expressions: ''calc()''</h3> - <p>The <dfn>calc()</dfn>, <dfn>min()</dfn>, and <dfn>max()</dfn> functions - allow mathematical expressions with addition (''+''), subtraction (''-''), + <p>The <dfn>calc()</dfn> function + allows mathematical expressions with addition (''+''), subtraction (''-''), multiplication (''*''), and division (''/'') to be used as component values. The ''calc()'' expression represents the result of the mathematical calculation it contains, using standard operator precedence - rules. The ''min()'' and ''max()'' expressions represent the minimum and - maximum, respectively, of their comma-separated arguments. These expressions - can be used wherever + rules. It can be used wherever <code><length></code>, <code><frequency></code>, <code><angle></code>, @@ -853,32 +851,18 @@ }</pre> </div> - <div class="example"> - <pre> -p { font-size: min(10px, 3em) } -blockquote { font-size: max(30px, 3em) }</pre> - </div> - - <div class="example"> - <pre>.box { width: min(10% + 20px, 300px) }</pre> - </div> - <p class='issue'>Add less trivial examples, particularly involving parens or nesting.</p> - <p>The expression language of these functions is described by the grammar and prose below. <pre> -math : [ calc | min | max ] S*; +math : calc S*; calc : "calc(" S* sum S* ")"; -min : "min(" S* sum [ "," S* sum ]* S* ")"; -max : "max(" S* sum [ "," S* sum ]* S* ")"; sum : product [ S+ [ "+" | "-" ] S+ product ]*; product : unit [ S* [ "*" | "/" ] S* unit ]*; -unit : ["+"|"-"]? [ NUMBER | DIMENSION | PERCENTAGE | - min | max | "(" S* sum S* ")" ];</pre> +unit : ["+"|"-"]? [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" ];</pre> <p class='note'>Note that the grammar requires spaces around binary ''+'' and ''-'' operators. The ''*'' and ''/'' operators do not require @@ -1001,7 +985,7 @@ </div> <p>The ''cycle()'' notation is not allowed to be nested; nor may it - contain ''attr()'', ''calc()'', ''min()'', or ''max()'' notations. + contain ''attr()'' or ''calc()'' notations. Declarations containing such constructs are invalid.</p> <h3 id="attr">
Received on Monday, 12 December 2011 21:52:54 UTC