Skip to content

Commit 718ffea

Browse files
committed
[css-values] Break apart a calc() paragraph for readability.
1 parent 66b4e80 commit 718ffea

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

css-values/Overview.bs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,7 @@ Type Checking</h4>
10561056
A <<dimension-token>>’s type is given by its unit
10571057
(''cm'' is <<length>>, ''deg'' is <<angle>>, etc.).
10581058
An ''attr()'' expression's type is given by its <<type-or-unit>> argument.
1059+
10591060
If percentages are accepted in the context in which the expression is placed,
10601061
a <<percentage-token>> has the type of the value that percentages are relative to;
10611062
otherwise, a math expression containing percentages is invalid.

css-values/Overview.html

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</p>
6565
<h1 class="p-name no-ref" id=title>CSS Values and Units Module Level 3</h1>
6666
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
67-
<span class=dt-updated><span class=value-title title=20140412>12 April 2014</span></span></span></h2>
67+
<span class=dt-updated><span class=value-title title=20140415>15 April 2014</span></span></span></h2>
6868
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-values/>http://dev.w3.org/csswg/css-values/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-values/>http://www.w3.org/TR/css-values/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-values/>http://dev.w3.org/csswg/css-values/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2013/CR-css3-values-20130730/ rel=previous>http://www.w3.org/TR/2013/CR-css3-values-20130730/</a><dd><a href=http://www.w3.org/TR/2013/CR-css3-values-20130404/ rel=previous>http://www.w3.org/TR/2013/CR-css3-values-20130404/</a><dd><a href=http://www.w3.org/TR/2012/CR-css3-values-20120828/ rel=previous>http://www.w3.org/TR/2012/CR-css3-values-20120828/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-values-20120308/ rel=previous>http://www.w3.org/TR/2012/WD-css3-values-20120308/</a><dd><a href=http://www.w3.org/TR/2011/WD-css3-values-20110906/ rel=previous>http://www.w3.org/TR/2011/WD-css3-values-20110906/</a><dd><a href=http://www.w3.org/TR/2006/WD-css3-values-20060919 rel=previous>http://www.w3.org/TR/2006/WD-css3-values-20060919</a><dd><a href=http://www.w3.org/TR/2005/WD-css3-values-20050726 rel=previous>http://www.w3.org/TR/2005/WD-css3-values-20050726</a><dd><a href=http://www.w3.org/TR/2001/WD-css3-values-20010713/ rel=previous>http://www.w3.org/TR/2001/WD-css3-values-20010713/</a>
6969
<dt>Feedback:</dt>
7070
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-values%5D%20feedback">www-style@w3.org</a>
@@ -146,30 +146,30 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
146146
<ul class=toc>
147147
<li><a href=#relative-lengths><span class=secno>5.1</span> Relative lengths</a>
148148
<ul class=toc>
149-
<li><a href=#font-relative-lengths><span class=secno>5.1.1</span> Font-relative lengths: the <a class=css data-link-type=maybe href=#em title=em>em</a>, <a class=css data-link-type=maybe href=#ex title=ex>ex</a>, <a class=css data-link-type=maybe href=#ch title=ch>ch</a>, <a class=css data-link-type=maybe href=#rem title=rem>rem</a> units</a>
150-
<li><a href=#viewport-relative-lengths><span class=secno>5.1.2</span> Viewport-percentage lengths: the <a class=css data-link-type=maybe href=#vw title=vw>vw</a>, <a class=css data-link-type=maybe href=#vh title=vh>vh</a>, <a class=css data-link-type=maybe href=#vmin title=vmin>vmin</a>, <a class=css data-link-type=maybe href=#vmax title=vmax>vmax</a> units</a></ul>
151-
<li><a href=#absolute-lengths><span class=secno>5.2</span> Absolute lengths: the <a class=css data-link-type=maybe href=#cm title=cm>cm</a>, <a class=css data-link-type=maybe href=#mm title=mm>mm</a>, <a class=css data-link-type=maybe href=#q title=q>q</a>, <a class=css data-link-type=maybe href=#in title=in>in</a>, <a class=css data-link-type=maybe href=#pt title=pt>pt</a>, <a class=css data-link-type=maybe href=#pc title=pc>pc</a>, <a class=css data-link-type=maybe href=#px title=px>px</a> units</a></ul>
149+
<li><a href=#font-relative-lengths><span class=secno>5.1.1</span> Font-relative lengths: the <span class=css data-link-type=maybe title=em>em</span>, <span class=css data-link-type=maybe title=ex>ex</span>, <span class=css data-link-type=maybe title=ch>ch</span>, <span class=css data-link-type=maybe title=rem>rem</span> units</a>
150+
<li><a href=#viewport-relative-lengths><span class=secno>5.1.2</span> Viewport-percentage lengths: the <span class=css data-link-type=maybe title=vw>vw</span>, <span class=css data-link-type=maybe title=vh>vh</span>, <span class=css data-link-type=maybe title=vmin>vmin</span>, <span class=css data-link-type=maybe title=vmax>vmax</span> units</a></ul>
151+
<li><a href=#absolute-lengths><span class=secno>5.2</span> Absolute lengths: the <span class=css data-link-type=maybe title=cm>cm</span>, <span class=css data-link-type=maybe title=mm>mm</span>, <span class=css data-link-type=maybe title=q>q</span>, <span class=css data-link-type=maybe title=in>in</span>, <span class=css data-link-type=maybe title=pt>pt</span>, <span class=css data-link-type=maybe title=pc>pc</span>, <span class=css data-link-type=maybe title=px>px</span> units</a></ul>
152152
<li><a href=#other-units><span class=secno>6</span> Other Quantities</a>
153153
<ul class=toc>
154-
<li><a href=#angles><span class=secno>6.1</span> Angle Units: the <span class=production data-link-type=type title="<angle>">&lt;angle&gt;</span> type and <a class=css data-link-type=maybe href=#deg title=deg>deg</a>, <a class=css data-link-type=maybe href=#grad title=grad>grad</a>, <a class=css data-link-type=maybe href=#rad title=rad>rad</a>, <a class=css data-link-type=maybe href=#turn title=turn>turn</a> units</a>
155-
<li><a href=#time><span class=secno>6.2</span> Duration Units: the <span class=production data-link-type=type title="<time>">&lt;time&gt;</span> type and <a class=css data-link-type=maybe href=#s title=s>s</a>, <a class=css data-link-type=maybe href=#ms title=ms>ms</a> units</a>
156-
<li><a href=#frequency><span class=secno>6.3</span> Frequency Units: the <span class=production data-link-type=type title="<frequency>">&lt;frequency&gt;</span> type and <a class=css data-link-type=maybe href=#hz title=hz>Hz</a>, <a class=css data-link-type=maybe href=#khz title=khz>kHz</a> units</a>
157-
<li><a href=#resolution><span class=secno>6.4</span> Resolution Units: the <span class=production data-link-type=type title="<resolution>">&lt;resolution&gt;</span> type and <a class=css data-link-type=maybe href=#dpi title=dpi>dpi</a>, <a class=css data-link-type=maybe href=#dpcm title=dpcm>dpcm</a>, <a class=css data-link-type=maybe href=#dppx title=dppx>dppx</a> units</a></ul>
154+
<li><a href=#angles><span class=secno>6.1</span> Angle Units: the <span class=production data-link-type=type title="<angle>">&lt;angle&gt;</span> type and <span class=css data-link-type=maybe title=deg>deg</span>, <span class=css data-link-type=maybe title=grad>grad</span>, <span class=css data-link-type=maybe title=rad>rad</span>, <span class=css data-link-type=maybe title=turn>turn</span> units</a>
155+
<li><a href=#time><span class=secno>6.2</span> Duration Units: the <span class=production data-link-type=type title="<time>">&lt;time&gt;</span> type and <span class=css data-link-type=maybe title=s>s</span>, <span class=css data-link-type=maybe title=ms>ms</span> units</a>
156+
<li><a href=#frequency><span class=secno>6.3</span> Frequency Units: the <span class=production data-link-type=type title="<frequency>">&lt;frequency&gt;</span> type and <span class=css data-link-type=maybe title=hz>Hz</span>, <span class=css data-link-type=maybe title=khz>kHz</span> units</a>
157+
<li><a href=#resolution><span class=secno>6.4</span> Resolution Units: the <span class=production data-link-type=type title="<resolution>">&lt;resolution&gt;</span> type and <span class=css data-link-type=maybe title=dpi>dpi</span>, <span class=css data-link-type=maybe title=dpcm>dpcm</span>, <span class=css data-link-type=maybe title=dppx>dppx</span> units</a></ul>
158158
<li><a href=#defined-elsewhere><span class=secno>7</span> Data Types Defined Elsewhere</a>
159159
<ul class=toc>
160160
<li><a href=#colors><span class=secno>7.1</span> Colors: the <span class=production data-link-type=type title="<color>">&lt;color&gt;</span> type</a>
161161
<li><a href=#images><span class=secno>7.2</span> Images: the <span class=production data-link-type=type title="<image>">&lt;image&gt;</span> type</a>
162162
<li><a href=#position><span class=secno>7.3</span> 2D Positioning: the <span class=production data-link-type=type title="<position>">&lt;position&gt;</span> type</a></ul>
163163
<li><a href=#functional-notation><span class=secno>8</span> Functional Notations</a>
164164
<ul class=toc>
165-
<li><a href=#calc-notation><span class=secno>8.1</span> Mathematical Expressions: <a class=css data-link-type=maybe href=#funcdef-calc title=calc()>calc()</a></a>
165+
<li><a href=#calc-notation><span class=secno>8.1</span> Mathematical Expressions: <span class=css data-link-type=maybe title=calc()>calc()</span></a>
166166
<ul class=toc>
167167
<li><a href=#calc-syntax><span class=secno>8.1.1</span> Syntax</a>
168168
<li><a href=#calc-type-checking><span class=secno>8.1.2</span> Type Checking</a>
169169
<li><a href=#calc-computed-value><span class=secno>8.1.3</span> Computed Value</a>
170170
<li><a href=#calc-range><span class=secno>8.1.4</span> Range Checking</a></ul>
171-
<li><a href=#toggle-notation><span class=secno>8.2</span> Toggling Between Values: <a class=css data-link-type=maybe href=#funcdef-toggle title=toggle()>toggle()</a></a>
172-
<li><a href=#attr-notation><span class=secno>8.3</span> Attribute References: <a class=css data-link-type=maybe href=#funcdef-attr title=attr()>attr()</a></a></ul>
171+
<li><a href=#toggle-notation><span class=secno>8.2</span> Toggling Between Values: <span class=css data-link-type=maybe title=toggle()>toggle()</span></a>
172+
<li><a href=#attr-notation><span class=secno>8.3</span> Attribute References: <span class=css data-link-type=maybe title=attr()>attr()</span></a></ul>
173173
<li><a href=#iana><span class=secno>9</span> Appendix A: IANA Considerations</a>
174174
<ul class=toc>
175175
<li><a href=#about-invalid><span class=secno>9.1</span> Registration for the <code>about:invalid</code> URL scheme</a></ul>
@@ -1172,7 +1172,8 @@ <h4 class="heading settled heading" data-level=8.1.2 id=calc-type-checking><span
11721172
A <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-dimension-token title="<dimension-token>">&lt;dimension-token&gt;</a>’s type is given by its unit
11731173
(<a class=css data-link-type=maybe href=#cm title=cm>cm</a> is <a class="production css-code" data-link-type=type href=#length-value title="<length>">&lt;length&gt;</a>, <a class=css data-link-type=maybe href=#deg title=deg>deg</a> is <a class="production css-code" data-link-type=type href=#angle-value title="<angle>">&lt;angle&gt;</a>, etc.).
11741174
An <a class=css data-link-type=maybe href=#funcdef-attr title=attr()>attr()</a> expression’s type is given by its <a class="production css-code" data-link-type=type href=#typedef-type-or-unit title="<type-or-unit>">&lt;type-or-unit&gt;</a> argument.
1175-
If percentages are accepted in the context in which the expression is placed,
1175+
1176+
<p> If percentages are accepted in the context in which the expression is placed,
11761177
a <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-percentage-token title="<percentage-token>">&lt;percentage-token&gt;</a> has the type of the value that percentages are relative to;
11771178
otherwise, a math expression containing percentages is invalid.
11781179

0 commit comments

Comments
 (0)