Skip to content

Commit 9a3433d

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403171
1 parent 8e2d555 commit 9a3433d

25 files changed

+1917
-1981
lines changed

css2/changes.html

+12-31
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
582582
<li class="tocline3"><a href="changes.html#q539" class="tocxref">C.8.45 9.5 Floats</a>
583583
<li class="tocline3"><a href="changes.html#q540" class="tocxref">C.8.46 9.5 Floats</a>
584584
<li class="tocline3"><a href="changes.html#q541" class="tocxref">C.8.47 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
585-
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
586-
<li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 9.2.4 The 'display' property</a>
585+
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 9.2.4 The 'display' property</a>
587586
</ul>
588587
</ul>
589588
</div>
@@ -7154,9 +7153,8 @@ <h3 id=u.10.1><a name="q502">C.8.8 </a><a
71547153

71557154
<p>If there is no such ancestor, the containing block is the initial
71567155
containing block. <ins>In CSS&nbsp;2.1, if that nearest ancestor is an
7157-
inline-level element that splits across multiple lines, or splits into
7158-
multiple boxes due to bidi processing, the containing block is
7159-
undefined.</ins>
7156+
inline-level element that splits across multiple lines the containing
7157+
block is undefined.</ins>
71607158
</blockquote>
71617159

71627160

@@ -7306,7 +7304,7 @@ <h3 id=u.9.2.1.1><a name="q509">C.8.15 </a><a
73067304

73077305
<blockquote>
73087306
<p>The resulting boxes would be <del>an anonymous block box
7309-
around</del> <ins>a block box representing</ins> the P, containing an
7307+
around</del> <ins>a block box representing</ins> the BODY, containing an
73107308
anonymous block box around C1, the SPAN block box, and another
73117309
anonymous block box around C2.
73127310
</blockquote>
@@ -7354,6 +7352,10 @@ <h3 id=u.16.6><a name="q511">C.8.17 </a><a
73547352
source, at occurrences of "\A" in generated content,</del>
73557353
<ins>preserved newline characters,</ins> and as necessary to fill line
73567354
boxes.
7355+
<dt>pre-line <dd>This value directs user agents to collapse sequences
7356+
of white space. Lines are broken at <del>newlines in the source, at
7357+
occurrences of "\A" in generated content,</del> <ins>preserved newline
7358+
characters,</ins> and as necessary to fill line boxes.
73577359
</dl>
73587360
</blockquote>
73597361

@@ -7460,7 +7462,7 @@ <h3 id=u.12.5.1a><a name="q516">C.8.22 </a><a
74607462
<li><del>If the image has an intrinsic width or height, then that
74617463
intrinsic width/height becomes the image's used width/height.</del>
74627464
<ins>If the image has a intrinsic width and height, the used width and
7463-
height are the same.</ins>
7465+
height are the intrinsic width and height.</ins>
74647466

74657467
<li><del>If the image has no intrinsic ratio and a ratio cannot be
74667468
calculated from its width and height, then its intrinsic ratio is
@@ -7600,7 +7602,7 @@ <h3 id=u.10.4><a name="q522">C.8.28 </a><a
76007602

76017603
<blockquote>
76027604
<p><ins>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
7603-
table cells, table rows, and row groups is undefined.</ins>
7605+
table cells, table columns, and column groups is undefined.</ins>
76047606
</blockquote>
76057607

76067608

@@ -7650,7 +7652,7 @@ <h3 id=u.9.2.1.1a><a name="q524">C.8.30 </a><a
76507652
consecutive or separated only by collapsible whitespace and/or
76517653
out-of-flow elements), <del>dividing</del> <ins>splitting</ins> the
76527654
inline box into two pieces (even if either side is empty)<ins>, one on
7653-
each side of the block-level box</ins>.
7655+
each side of the block-level box(es)</ins>.
76547656
</blockquote>
76557657

76567658

@@ -7942,28 +7944,7 @@ <h3 id=u.14.2.1><a name="q541">C.8.47 </a><a
79427944

79437945

79447946

7945-
<h3 id=u.14.2.1a><a name="q542">C.8.48 </a><a
7946-
href="/TR/2010/WD-CSS2-20101207/colors.html#background-properties">14.2.1
7947-
Background properties: 'background-color', 'background-image',
7948-
'background-repeat', 'background-attachment', 'background-position',
7949-
and 'background'</a></h3>
7950-
7951-
<p>Because of insufficient implementations of background images with
7952-
an intrinsic ratio but no intrinsic size, the size of such images is
7953-
not defined in CSS&nbsp;2.1:
7954-
7955-
<blockquote>
7956-
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
7957-
the dimensions <del>must be assumed to be the largest dimensions at
7958-
that ratio such that neither dimension exceeds the dimensions of the
7959-
rectangle that establishes the coordinate system for the <a href="colors.html#propdef-background-position" class="noxref"><span
7960-
class="propinst-background-position">'background-position'</span></a>
7961-
property</del> <ins>are undefined in CSS&nbsp;2.1</ins>.
7962-
</blockquote>
7963-
7964-
7965-
7966-
<h3 id=u.9.2.4><a name="q543">C.8.49 </a><a
7947+
<h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
79677948
href="/TR/2010/WD-CSS2-20101207/visuren.html#display-prop">9.2.4 The
79687949
'display' property</a></h3>
79697950

css2/colors.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,11 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
237237
coordinate system for the 'background-position' property.
238238
</p>
239239
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
240-
the dimensions are undefined in CSS&nbsp;2.1.
240+
the dimensions must be assumed to be the largest dimensions at that
241+
ratio such that neither dimension exceeds the dimensions of the
242+
rectangle that establishes the coordinate system for the <a href="colors.html#propdef-background-position" class="noxref"><span
243+
class="propinst-background-position">'background-position'</span></a>
244+
property.
241245
</p>
242246
<p>If the image has no intrinsic ratio either, then the dimensions
243247
must be assumed to be the rectangle that establishes the coordinate

css2/cover.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1296,8 +1296,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12961296
<li class="tocline3"><a href="changes.html#q539" class="tocxref">C.8.45 9.5 Floats</a>
12971297
<li class="tocline3"><a href="changes.html#q540" class="tocxref">C.8.46 9.5 Floats</a>
12981298
<li class="tocline3"><a href="changes.html#q541" class="tocxref">C.8.47 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
1299-
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
1300-
<li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 9.2.4 The 'display' property</a>
1299+
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 9.2.4 The 'display' property</a>
13011300
</ul>
13021301
</ul>
13031302
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

css2/css2.html

+29-45
Original file line numberDiff line numberDiff line change
@@ -1291,8 +1291,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12911291
<li class="tocline3"><a href="changes.html#q539" class="tocxref">C.8.45 9.5 Floats</a>
12921292
<li class="tocline3"><a href="changes.html#q540" class="tocxref">C.8.46 9.5 Floats</a>
12931293
<li class="tocline3"><a href="changes.html#q541" class="tocxref">C.8.47 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
1294-
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
1295-
<li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 9.2.4 The 'display' property</a>
1294+
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 9.2.4 The 'display' property</a>
12961295
</ul>
12971296
</ul>
12981297
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
@@ -3120,8 +3119,6 @@ <h3>4.1.4 <a name="statements">Statements</a></h3>
31203119
around the statements.
31213120
</p>
31223121

3123-
3124-
31253122
<h3>4.1.5 <span class="index-def" title="at-rule">
31263123
<a name="at-rules">At-rules</a></span></h3>
31273124

@@ -3866,7 +3863,7 @@ <h3>4.3.4 <a name="uri">URLs and URIs</a></h3>
38663863
<p>
38673864
Some characters appearing in an unquoted URI, such as parentheses,
38683865
white space characters, single quotes (') and double quotes
3869-
("), must be escaped with a backslash so that the resulting URI value
3866+
(&quot;), must be escaped with a backslash so that the resulting URI value
38703867
is a URI token: '\(', '\)'.
38713868
</p>
38723869
<p>Depending on the type of URI, it might also be possible to write
@@ -7844,7 +7841,7 @@ <h4>9.2.1.1 <a name="anonymous-block-level">Anonymous block boxes</a></h4>
78447841
the block-level box (and any block-level siblings that are consecutive
78457842
or separated only by collapsible whitespace and/or out-of-flow
78467843
elements), splitting the inline box into two boxes (even if either
7847-
side is empty), one on each side of the block-level box. The line
7844+
side is empty), one on each side of the block-level box(es). The line
78487845
boxes before the break and after the
78497846
break are enclosed in anonymous block boxes, and the block-level box
78507847
becomes a sibling of those anonymous boxes. When such an inline box is
@@ -7878,7 +7875,7 @@ <h4>9.2.1.1 <a name="anonymous-block-level">Anonymous block boxes</a></h4>
78787875

78797876
<p>The P element contains a chunk (C1) of anonymous text followed
78807877
by a block-level element followed by another chunk (C2) of anonymous
7881-
text. The resulting boxes would be a block box representing the P,
7878+
text. The resulting boxes would be a block box representing the BODY,
78827879
containing an anonymous block box around C1, the SPAN block box, and
78837880
another anonymous block box around C2.
78847881
</p></div>
@@ -10276,8 +10273,7 @@ <h2>10.1 <a name="containing-block-details">Definition of "containing
1027610273
containing block is the initial containing block. In CSS&nbsp;2.1, if
1027710274
that nearest ancestor is an <a
1027810275
href="visuren#inline-level">inline-level element</a> that splits
10279-
across multiple lines, or splits into multiple boxes due to bidi
10280-
processing, the containing block is undefined.
10276+
across multiple lines, the containing block is undefined.
1028110277
</li>
1028210278
</ol>
1028310279

@@ -10894,7 +10890,7 @@ <h2>10.4 <a name="min-max-widths">Minimum and maximum widths</a>: <a href="visud
1089410890
</p>
1089510891

1089610892
<p>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
10897-
table cells, table rows, and row groups is undefined.
10893+
table cells, table columns, and column groups is undefined.
1089810894

1089910895
<p>The following algorithm describes how the two properties influence
1090010896
the <a href="cascade.html#computed-value">used value</a>
@@ -11148,7 +11144,8 @@ <h3>10.6.1 <a name="inline-non-replaced">Inline, non-replaced elements</a></h3>
1114811144
select which measure of the font is used for the content height.
1114911145
</p>
1115011146
<p>The vertical padding, border and margin of an inline, non-replaced
11151-
box start at the top and bottom of the content area, and has nothing to do with the <a href="visudet.html#propdef-line-height" class="noxref"><span
11147+
box start at the top and bottom of the content area, and has nothing
11148+
to do with the <a href="visudet.html#propdef-line-height" class="noxref"><span
1115211149
class="propinst-line-height">'line-height'</span></a>. But only the <a href="visudet.html#propdef-line-height" class="noxref"><span
1115311150
class="propinst-line-height">'line-height'</span></a> is used when calculating
1115411151
the height of the line box.
@@ -13278,7 +13275,7 @@ <h3>12.5.1 <a name="list-style">Lists:</a> the <a href="generate.html#propdef-li
1327813275
<p>The size of the image is calculated from the following rules:
1327913276
<ol>
1328013277
<li>If the image has a intrinsic width and height, the used width and
13281-
height are the same.
13278+
height are the intrinsic width and height.
1328213279

1328313280
<li>Otherwise, if the image has an intrinsic ratio and either an
1328413281
intrinsic width or an intrinsic height, the used width/height is the
@@ -14323,7 +14320,11 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
1432314320
coordinate system for the 'background-position' property.
1432414321
</p>
1432514322
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
14326-
the dimensions are undefined in CSS&nbsp;2.1.
14323+
the dimensions must be assumed to be the largest dimensions at that
14324+
ratio such that neither dimension exceeds the dimensions of the
14325+
rectangle that establishes the coordinate system for the <a href="colors.html#propdef-background-position" class="noxref"><span
14326+
class="propinst-background-position">'background-position'</span></a>
14327+
property.
1432714328
</p>
1432814329
<p>If the image has no intrinsic ratio either, then the dimensions
1432914330
must be assumed to be the rectangle that establishes the coordinate
@@ -16066,7 +16067,9 @@ <h2>16.6 <a name="white-space-prop">White space</a>: the <a href="text.html#prop
1606616067
of white space. Lines are broken at preserved newline characters,
1606716068
and as necessary to fill line boxes.</dd>
1606816069
<dt>pre-line</dt>
16069-
<dd>This value directs user agents to collapse sequences of white space. Lines are broken at newlines in the source, at occurrences of "\A" in generated content, and as necessary to fill line boxes.</dd>
16070+
<dd>This value directs user agents to collapse sequences of white
16071+
space. Lines are broken at preserved newline characters, and as
16072+
necessary to fill line boxes.</dd>
1607016073
</dl>
1607116074
<p>
1607216075
Newlines in the source can be represented by a carriage return
@@ -20379,8 +20382,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
2037920382
<li class="tocline3"><a href="changes.html#q539" class="tocxref">C.8.45 9.5 Floats</a>
2038020383
<li class="tocline3"><a href="changes.html#q540" class="tocxref">C.8.46 9.5 Floats</a>
2038120384
<li class="tocline3"><a href="changes.html#q541" class="tocxref">C.8.47 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
20382-
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
20383-
<li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 9.2.4 The 'display' property</a>
20385+
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 9.2.4 The 'display' property</a>
2038420386
</ul>
2038520387
</ul>
2038620388
</div>
@@ -26951,9 +26953,8 @@ <h3 id=u.10.1><a name="q502">C.8.8 </a><a
2695126953

2695226954
<p>If there is no such ancestor, the containing block is the initial
2695326955
containing block. <ins>In CSS&nbsp;2.1, if that nearest ancestor is an
26954-
inline-level element that splits across multiple lines, or splits into
26955-
multiple boxes due to bidi processing, the containing block is
26956-
undefined.</ins>
26956+
inline-level element that splits across multiple lines the containing
26957+
block is undefined.</ins>
2695726958
</blockquote>
2695826959

2695926960

@@ -27103,7 +27104,7 @@ <h3 id=u.9.2.1.1><a name="q509">C.8.15 </a><a
2710327104

2710427105
<blockquote>
2710527106
<p>The resulting boxes would be <del>an anonymous block box
27106-
around</del> <ins>a block box representing</ins> the P, containing an
27107+
around</del> <ins>a block box representing</ins> the BODY, containing an
2710727108
anonymous block box around C1, the SPAN block box, and another
2710827109
anonymous block box around C2.
2710927110
</blockquote>
@@ -27151,6 +27152,10 @@ <h3 id=u.16.6><a name="q511">C.8.17 </a><a
2715127152
source, at occurrences of "\A" in generated content,</del>
2715227153
<ins>preserved newline characters,</ins> and as necessary to fill line
2715327154
boxes.
27155+
<dt>pre-line <dd>This value directs user agents to collapse sequences
27156+
of white space. Lines are broken at <del>newlines in the source, at
27157+
occurrences of "\A" in generated content,</del> <ins>preserved newline
27158+
characters,</ins> and as necessary to fill line boxes.
2715427159
</dl>
2715527160
</blockquote>
2715627161

@@ -27257,7 +27262,7 @@ <h3 id=u.12.5.1a><a name="q516">C.8.22 </a><a
2725727262
<li><del>If the image has an intrinsic width or height, then that
2725827263
intrinsic width/height becomes the image's used width/height.</del>
2725927264
<ins>If the image has a intrinsic width and height, the used width and
27260-
height are the same.</ins>
27265+
height are the intrinsic width and height.</ins>
2726127266

2726227267
<li><del>If the image has no intrinsic ratio and a ratio cannot be
2726327268
calculated from its width and height, then its intrinsic ratio is
@@ -27397,7 +27402,7 @@ <h3 id=u.10.4><a name="q522">C.8.28 </a><a
2739727402

2739827403
<blockquote>
2739927404
<p><ins>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
27400-
table cells, table rows, and row groups is undefined.</ins>
27405+
table cells, table columns, and column groups is undefined.</ins>
2740127406
</blockquote>
2740227407

2740327408

@@ -27447,7 +27452,7 @@ <h3 id=u.9.2.1.1a><a name="q524">C.8.30 </a><a
2744727452
consecutive or separated only by collapsible whitespace and/or
2744827453
out-of-flow elements), <del>dividing</del> <ins>splitting</ins> the
2744927454
inline box into two pieces (even if either side is empty)<ins>, one on
27450-
each side of the block-level box</ins>.
27455+
each side of the block-level box(es)</ins>.
2745127456
</blockquote>
2745227457

2745327458

@@ -27739,28 +27744,7 @@ <h3 id=u.14.2.1><a name="q541">C.8.47 </a><a
2773927744

2774027745

2774127746

27742-
<h3 id=u.14.2.1a><a name="q542">C.8.48 </a><a
27743-
href="/TR/2010/WD-CSS2-20101207/colors.html#background-properties">14.2.1
27744-
Background properties: 'background-color', 'background-image',
27745-
'background-repeat', 'background-attachment', 'background-position',
27746-
and 'background'</a></h3>
27747-
27748-
<p>Because of insufficient implementations of background images with
27749-
an intrinsic ratio but no intrinsic size, the size of such images is
27750-
not defined in CSS&nbsp;2.1:
27751-
27752-
<blockquote>
27753-
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
27754-
the dimensions <del>must be assumed to be the largest dimensions at
27755-
that ratio such that neither dimension exceeds the dimensions of the
27756-
rectangle that establishes the coordinate system for the <a href="colors.html#propdef-background-position" class="noxref"><span
27757-
class="propinst-background-position">'background-position'</span></a>
27758-
property</del> <ins>are undefined in CSS&nbsp;2.1</ins>.
27759-
</blockquote>
27760-
27761-
27762-
27763-
<h3 id=u.9.2.4><a name="q543">C.8.49 </a><a
27747+
<h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
2776427748
href="/TR/2010/WD-CSS2-20101207/visuren.html#display-prop">9.2.4 The
2776527749
'display' property</a></h3>
2776627750

0 commit comments

Comments
 (0)