Skip to content

Commit 31b0c8a

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403050
1 parent 8744ffc commit 31b0c8a

31 files changed

+4641
-3390
lines changed

css2/cascade.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,11 @@ <H3>6.4.4 <a name="preshint">Precedence of non-CSS presentational hints</a></H3>
502502
src, standby, start, style, summary, title, type (except on LI, OL and
503503
UL elements), usemap, value, valuetype, version.
504504

505-
<P>For other languages, all document language-based styling should be
506-
handled in the user agent style sheet.
505+
<P>For other languages, all document language-based styling must be
506+
translated to the corresponding CSS and either enter the cascade at
507+
the user agent level or, as with HTML presentational hints, be treated
508+
as author level rules with a specificity of zero placed at the start
509+
of the author style sheet.
507510

508511
<div class="example"><P style="display:none">Example(s):</P>
509512

css2/changes.html

Lines changed: 372 additions & 114 deletions
Large diffs are not rendered by default.

css2/cover.html

Lines changed: 63 additions & 54 deletions
Large diffs are not rendered by default.

css2/css2.html

Lines changed: 347 additions & 182 deletions
Large diffs are not rendered by default.

css2/diffs-rec/cascade.html

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ <h2><ins>6.2</ins> <a name="inheritance"><ins>Inheritance</ins></a></h2>
174174
element will have the computed value <del>'12pt'</del><ins>'13pt'</ins> as well. If the
175175
user agent does not have the <del>12pt</del><ins>13pt</ins> font available, the
176176
actual value of <a href="fonts.html#propdef-font-size" class="noxref"><span class="propinst-font-size">'font-size'</span></a>
177-
for both H1 and EM might be, for example, <del>'11pt'.</del><ins>'12pt'.</ins>
177+
for both H1 and <del>EM might be, for example, '11pt'.</del><ins>EM might be, for example, '12pt'.</ins>
178178
</div>
179179

180180
<p class=note><ins>Note that inheritance follows the document tree and is
@@ -316,12 +316,12 @@ <H2>6.4 <a name="cascade">The cascade</a></h2>
316316
with the greatest weight takes precedence.
317317

318318
<P>By default, rules in author style sheets have more weight than
319-
rules in user style sheets. Precedence is reversed, however, for
320-
"!important" rules. All <del>rules</del>user and author rules have more weight
321-
than rules in the UA's default style sheet.
319+
rules in user style sheets. Precedence <del>is reversed, however, for "!important" rules. All rules user and author rules have more weight than rules in the UA's default style sheet. Imported style sheets also cascade and their weight depends on their import order. Rules specified in a given style sheet override rules imported from other style sheets. Imported style sheets can themselves import and override other style sheets, recursively, and the same precedence</del><ins>is reversed, however, for
320+
"!important" rules. All user and author rules have more weight
321+
than</ins> rules <del>apply.</del><ins>in the UA's default style sheet.</ins>
322322

323323

324-
<H3> <del>Imported style sheets also cascade and their weight depends on their import order. Rules specified in a given style sheet override rules imported from other style sheets. Imported style sheets can themselves import and override other style sheets, recursively, and the same precedence rules apply.</del>6.4.1 <a name="cascading-order">Cascading order</a></H3>
324+
<H3>6.4.1 <a name="cascading-order">Cascading order</a></H3>
325325

326326
<P>To find the value for an element/property combination, user agents
327327
must apply the following sorting order:</p>
@@ -430,13 +430,13 @@ <H3>6.4.3 <a name="specificity">Calculating a selector's specificity</a></H3>
430430
<li>count the number of other attributes and pseudo-classes
431431
in the selector (= <del>b)</del><ins>c)</ins>
432432

433-
<li>count the <del>number of element names</del><ins>number of element names and pseudo-elements in the selector (= d)</ins>
433+
<li>count the number of element names <ins>and pseudo-elements</ins> in the selector (= <del>c) ignore pseudo-elements.</del><ins>d)</ins>
434434
</ul>
435435

436436
<p><ins>The specificity is based only on the form of the selector. In
437437
particular, a selector of the form "[id=p33]" is counted as an
438438
attribute selector (a=0, b=0, c=1, d=0), even if the id attribute is
439-
defined as an "ID"</ins> in the <del>selector (= c) ignore pseudo-elements.</del><ins>source document's DTD.</ins>
439+
defined as an "ID" in the source document's DTD.</ins>
440440

441441
<P>Concatenating the <del>three</del><ins>four</ins> numbers <del>a-b-c</del><ins>a-b-c-d</ins> (in a number system with a large
442442
base) gives the specificity.
@@ -445,9 +445,9 @@ <H3>6.4.3 <a name="specificity">Calculating a selector's specificity</a></H3>
445445
Some examples:
446446

447447
<PRE>
448-
* {} /* a=0 b=0 c=0 <ins>d=0</ins> -&gt; specificity = <del>0</del><ins>0,0,0,0</ins> */
449-
li {} /* a=0 b=0 <del>c=1</del><ins>c=0 d=1</ins> -&gt; specificity = <del>1</del><ins>0,0,0,1 */
450-
li:first-line {} /* a=0 b=0 c=0 d=2 -&gt; specificity = 0,0,0,2</ins> */
448+
* {} /* a=0 b=0 c=0 <ins>d=0 -&gt; specificity = 0,0,0,0 */
449+
li {} /* a=0 b=0 c=0 d=1</ins> -&gt; specificity = <del>0</del><ins>0,0,0,1</ins> */
450+
<del>LI</del><ins>li:first-line</ins> {} /* a=0 b=0 <del>c=1</del><ins>c=0 d=2</ins> -&gt; specificity = <del>1</del><ins>0,0,0,2</ins> */
451451
ul li {} /* a=0 b=0 <del>c=2</del><ins>c=0 d=2</ins> -&gt; specificity = <del>2</del><ins>0,0,0,2</ins> */
452452
ul ol+li {} /* a=0 b=0 <del>c=3</del><ins>c=0 d=3</ins> -&gt; specificity = <del>3</del><ins>0,0,0,3</ins> */
453453
h1 + *[rel=up]{} /* a=0 <del>b=1</del><ins>b=0</ins> c=1 <ins>d=1</ins> -&gt; specificity = <del>11</del><ins>0,0,1,1</ins> */
@@ -488,7 +488,7 @@ <H3>6.4.4 <a name="preshint">Precedence of non-CSS presentational hints</a></H3>
488488
this policy will make it easier for stylistic attributes to coexist
489489
with style sheets.
490490

491-
<P> <del>Note.</del><ins>For HTML, any attribute that is not</ins> in <del>CSS1,</del>the <del>non-CSS presentational hints were given a specificity equal to 1, not 0.</del><ins>following list should be
491+
<P> <del>Note.</del><ins>For HTML, any attribute that is not</ins> in <del>CSS1,</del>the <del>non-CSS</del><ins>following list should be
492492
considered presentational: abbr, accept-charset, accept, accesskey,
493493
action, alt, archive, axis, charset, checked, cite, class, classid,
494494
code, codebase, codetype, colspan, coords, data, datetime, declare,
@@ -502,8 +502,11 @@ <H3>6.4.4 <a name="preshint">Precedence of non-CSS presentational hints</a></H3>
502502
src, standby, start, style, summary, title, type (except on LI, OL and
503503
UL elements), usemap, value, valuetype, version.</ins>
504504

505-
<P><ins>For other languages, all document language-based styling should be
506-
handled in</ins> the <del>change is due to</del><ins>user agent style sheet.</ins>
505+
<P><ins>For other languages, all document language-based styling must be
506+
translated to the corresponding CSS and either enter the cascade at
507+
the user agent level or, as with HTML</ins> presentational <del>hints were given</del><ins>hints, be treated
508+
as author level rules with</ins> a specificity <del>equal to 1, not 0.</del><ins>of zero placed at</ins> the <del>change is due to</del><ins>start
509+
of the author style sheet.</ins>
507510

508511
<div class="example"><P style="display:none"><ins>Example(s):</ins></P>
509512

0 commit comments

Comments
 (0)