Skip to content

Commit 30ce5fd

Browse files
tabatkinstabatkins
committed
[css-values] Kill <dimension>. Move the definition of 'dimension' into the hole left behind.
--HG-- extra : rebase_source : 4e25f661e6bf5ae7073037104cf0a9a0ae690a85
1 parent b8b1d09 commit 30ce5fd

File tree

2 files changed

+25
-54
lines changed

2 files changed

+25
-54
lines changed

‎css-values/Overview.html

+19-36
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
241241
the ‘<code class=css>&lt;percentage></code>’ type</a>
242242

243243
<li><a href="#dimensions"><span class=secno>4.4. </span> Numbers with
244-
Units: the ‘<code class=css>&lt;dimension></code>’ type</a>
244+
Units: <i>dimensions</i></a>
245245
</ul>
246246

247247
<li><a href="#lengths"><span class=secno>5. </span> Distance Units: the
@@ -887,40 +887,27 @@ <h3 id=percentages><span class=secno>4.3. </span> Percentages: the ‘<a
887887
property, the resultant value is the percentage times the <i>initial
888888
value</i> of that property.
889889

890-
<h3 id=dimensions><span class=secno>4.4. </span> Numbers with Units: the
891-
‘<a href="#ltdimension"><code class=css>&lt;dimension></code></a>’
892-
type</h3>
893-
894-
<p> A <dfn data-export=data-export id=dimension>dimension</dfn> value is
895-
denoted by <dfn data-dfn-type=type id=ltdimension>&lt;dimension></dfn> and
896-
consists of a <a href="#number-value"><i>&lt;number></i></a> representing
897-
the value immediately followed by an <i>&lt;ident></i> representing the
898-
unit. It corresponds to the <i>&lt;dimension-token</i> syntax production.
890+
<h3 id=dimensions><span class=secno>4.4. </span> Numbers with Units: <a
891+
href="#dimension"><i>dimensions</i></a></h3>
899892

900-
<p> The <a href="#ltdimension"><i>&lt;dimension></i></a> type is only used
901-
when writing very generic grammars; in most cases, a more specific type
902-
based on the unit is used instead, such as <a
903-
href="#length-value"><i>&lt;length></i></a> or <a
904-
href="#time-value"><i>&lt;time></i></a>.
893+
<p>A <dfn id=dimension>dimension</dfn> is a <a
894+
href="#number"><i>number</i></a> immediately followed by a unit
895+
identifier. It corresponds to the <a
896+
href="#dimension"><code>DIMENSION</code></a> token in the <a
897+
href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">grammar</a>.
898+
<a href="#ref-CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> Like
899+
keywords, unit identifiers are case-insensitive within the ASCII range.
905900

906901
<h2 id=lengths><span class=secno>5. </span> Distance Units: the ‘<a
907902
href="#length-value"><code class=css>&lt;length></code></a>’ type</h2>
908903

909904
<p>Lengths refer to distance measurements and are denoted by <dfn
910905
id=length-value><var>&lt;length></var></dfn> in the property definitions.
911-
A length is a <a href="#dimension0"><i>dimension</i></a>. However, for
912-
zero lengths the unit identifier is optional (i.e. can be syntactically
906+
A length is a <a href="#dimension"><i>dimension</i></a>. However, for zero
907+
lengths the unit identifier is optional (i.e. can be syntactically
913908
represented as the <a href="#number-value"><var>&lt;number></var></a>
914909
‘<code class=css>0</code>’).
915910

916-
<p>A <dfn id=dimension0>dimension</dfn> is a <a
917-
href="#number"><i>number</i></a> immediately followed by a unit
918-
identifier. It corresponds to the <a
919-
href="#dimension0"><code>DIMENSION</code></a> token in the <a
920-
href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">grammar</a>.
921-
<a href="#ref-CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> Like
922-
keywords, unit identifiers are case-insensitive within the ASCII range.
923-
924911
<p>Properties may restrict the length value to some range. If the value is
925912
outside the allowed range, the declaration is invalid and must be <a
926913
href="http://www.w3.org/TR/CSS21/conform.html#ignore">ignored</a>.
@@ -1249,7 +1236,7 @@ <h3 id=angles><span class=secno>6.1. </span> Angles: the ‘<a
12491236
class=css>rad</code></a>’, ‘<a href="#turn"><code
12501237
class=css>turn</code></a>’ units</h3>
12511238

1252-
<p>Angle values are <a href="#dimension0"><i>dimensions</i></a> denoted by
1239+
<p>Angle values are <a href="#dimension"><i>dimensions</i></a> denoted by
12531240
<dfn id=angle-value>&lt;angle></dfn>. The angle unit identifiers are:
12541241

12551242
<dl>
@@ -1281,7 +1268,7 @@ <h3 id=time><span class=secno>6.2. </span> Times: the ‘<a
12811268
href="#s"><code class=css>s</code></a>’, ‘<a href="#ms"><code
12821269
class=css>ms</code></a>’ units</h3>
12831270

1284-
<p>Time values are <a href="#dimension0"><i>dimensions</i></a> denoted by
1271+
<p>Time values are <a href="#dimension"><i>dimensions</i></a> denoted by
12851272
<dfn id=time-value>&lt;time></dfn>. The time unit identifiers are:
12861273

12871274
<dl>
@@ -1303,7 +1290,7 @@ <h3 id=frequency><span class=secno>6.3. </span> Frequencies: the ‘<a
13031290
and ‘<a href="#hz"><code class=css>Hz</code></a>’, ‘<a
13041291
href="#khz"><code class=css>kHz</code></a>’ units</h3>
13051292

1306-
<p>Frequency values are <a href="#dimension0"><i>dimensions</i></a> denoted
1293+
<p>Frequency values are <a href="#dimension"><i>dimensions</i></a> denoted
13071294
by <dfn id=frequency-value>&lt;frequency></dfn>. The frequency unit
13081295
identifiers are:
13091296

@@ -1326,7 +1313,7 @@ <h3 id=resolution><span class=secno>6.4. </span> Resolutions: the <a
13261313
class=css>dpcm</code></a>’, ‘<a href="#dppx"><code
13271314
class=css>dppx</code></a>’ units</h3>
13281315

1329-
<p>Resolution units are <a href="#dimension0"><i>dimensions</i></a> denoted
1316+
<p>Resolution units are <a href="#dimension"><i>dimensions</i></a> denoted
13301317
by <dfn id=resolution-value>&lt;resolution></dfn>. The resolution unit
13311318
identifiers are:
13321319

@@ -1557,7 +1544,7 @@ <h4 id=calc-syntax><span class=secno>8.1.1. </span> Syntax</h4>
15571544
<p> UAs must support ‘<a href="#calc"><code
15581545
class=css>calc()</code></a>’ expressions of at least 20 terms, where
15591546
each <a href="#number"><code>NUMBER</code></a>, <a
1560-
href="#dimension0"><code>DIMENSION</code></a>, or <a
1547+
href="#dimension"><code>DIMENSION</code></a>, or <a
15611548
href="#percentage"><code>PERCENTAGE</code></a> is a term. If a ‘<a
15621549
href="#calc"><code class=css>calc()</code></a>’ expression contains more
15631550
than the supported number of terms, it must be treated as if it were
@@ -1579,7 +1566,7 @@ <h4 id=calc-type-checking><span class=secno>8.1.2. </span> Type Checking</h4>
15791566
href="#number"><code>NUMBER</code></a> tokens are of type <a
15801567
href="#number-value"><var>&lt;number></var></a> or <a
15811568
href="#integer-value"><var>&lt;integer></var></a>. A <a
1582-
href="#dimension0"><code>DIMENSION</code></a> token's type is given by its
1569+
href="#dimension"><code>DIMENSION</code></a> token's type is given by its
15831570
unit (‘<code class=css>cm</code>’ is <a
15841571
href="#length-value"><var>&lt;length></var></a>, ‘<a href="#deg"><code
15851572
class=css>deg</code></a>’ is <a
@@ -2044,7 +2031,7 @@ <h3 id=attr-notation><span class=secno>8.3. </span> Attribute References:
20442031
<dt>‘<code class=css>%</code>’
20452032

20462033
<dd> The attribute value must parse as a NUMBER CSS token, and is
2047-
interpreted as a <a href="#dimension0"><i>dimension</i></a> with the
2034+
interpreted as a <a href="#dimension"><i>dimension</i></a> with the
20482035
specified unit. The default is ‘<code class=css>0</code>’ in the
20492036
relevant units, or else the property's minimum value if ‘<code
20502037
class=css>0</code>’ in the relevant units is not valid for the
@@ -2632,10 +2619,6 @@ <h2 class=no-num id=index>Index</h2>
26322619
<li>deg, <a href="#deg" title="section 6.1."><strong>6.1.</strong></a>
26332620

26342621
<li>dimension, <a href="#dimension"
2635-
title="section 4.4."><strong>4.4.</strong></a>, <a href="#dimension0"
2636-
title="section 5."><strong>5.</strong></a>
2637-
2638-
<li>&lt;dimension>, <a href="#ltdimension"
26392622
title="section 4.4."><strong>4.4.</strong></a>
26402623

26412624
<li>dpcm, <a href="#dpcm" title="section 6.4."><strong>6.4.</strong></a>

‎css-values/Overview.src.html

+6-18
Original file line numberDiff line numberDiff line change
@@ -546,19 +546,13 @@ <h3 id="percentages">
546546
property.</p>
547547

548548
<h3 id='dimensions'>
549-
Numbers with Units: the ''&lt;dimension>'' type</h3>
549+
Numbers with Units: <i>dimensions</i></h3>
550550

551-
<p>
552-
A <dfn data-export>dimension</dfn> value is denoted by
553-
<dfn data-dfn-type=type>&lt;dimension></dfn>
554-
and consists of a <i>&lt;number></i> representing the value
555-
immediately followed by an <i>&lt;ident></i> representing the unit.
556-
It corresponds to the <i>&lt;dimension-token</i> syntax production.
557-
558-
<p>
559-
The <i>&lt;dimension></i> type is only used when writing very generic grammars;
560-
in most cases, a more specific type based on the unit is used instead,
561-
such as <i>&lt;length></i> or <i>&lt;time></i>.
551+
<p>A <dfn>dimension</dfn> is a <i>number</i> immediately followed by a
552+
unit identifier. It corresponds to the <code>DIMENSION</code> token in the
553+
<a href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">grammar</a>.
554+
[[!CSS21]] Like keywords, unit identifiers are case-insensitive within
555+
the ASCII range.
562556

563557
<h2 id="lengths">
564558
Distance Units: the ''&lt;length>'' type</h2>
@@ -570,12 +564,6 @@ <h2 id="lengths">
570564
However, for zero lengths the unit identifier is optional
571565
(i.e. can be syntactically represented as the <var>&lt;number></var> ''0'').
572566

573-
<p>A <dfn>dimension</dfn> is a <i>number</i> immediately followed by a
574-
unit identifier. It corresponds to the <code>DIMENSION</code> token in the
575-
<a href="http://www.w3.org/TR/CSS21/syndata.html#tokenization">grammar</a>.
576-
[[!CSS21]] Like keywords, unit identifiers are case-insensitive within
577-
the ASCII range.
578-
579567
<p>Properties may restrict the length value to some range.
580568
If the value is outside the allowed range, the declaration is invalid
581569
and must be <a href="http://www.w3.org/TR/CSS21/conform.html#ignore">ignored</a>.

0 commit comments

Comments
 (0)