Skip to content

Commit 7d8b099

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402645
1 parent 4d7252c commit 7d8b099

7 files changed

Lines changed: 41 additions & 38 deletions

File tree

css2/css2.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21388,8 +21388,8 @@ <H1><a name="q0">Appendix I. Index</a></H1>
2138821388
</ul>
2138921389
<p><a name="index-;">&nbsp;</a><a name="index-<">&nbsp;</a><a name="index-=">&nbsp;</a><a name="index->">&nbsp;</a><a name="index-?">&nbsp;</a><a name="index-@">&nbsp;</a>
2139021390
<ul class="index">
21391-
<li class="tocline0">@charset, <a href="syndata.html#x10" class="index-inst"><span>1</span></a>, <a href="syndata.html#x55" class="index-inst"><span>2</span></a>, <a href="syndata.html#x56" class="index-inst"><span>3</span></a>, <a href="syndata.html#x61" class="index-inst"><span>4</span></a>, <a href="syndata.html#x62" class="index-inst"><span>5</span></a>
21392-
<li class="tocline0">"@charset", <a href="syndata.html#x57" class="index-def"><strong>1</strong></a>, <a href="syndata.html#x63" class="index-def"><strong>2</strong></a>
21391+
<li class="tocline0">@charset, <a href="syndata.html#x10" class="index-inst"><span>1</span></a>, <a href="syndata.html#x55" class="index-inst"><span>2</span></a>, <a href="syndata.html#x56" class="index-inst"><span>3</span></a>
21392+
<li class="tocline0">"@charset", <a href="syndata.html#x57" class="index-def"><strong>1</strong></a>
2139321393
<li class="tocline0">@import, <a href="cascade.html#x6" class="index-def"><strong>1</strong></a>, <a href="cascade.html#x7" class="index-inst"><span>2</span></a>, <a href="media.html#x1" class="index-inst"><span>3</span></a>
2139421394
<li class="tocline0">@media, <a href="media.html#x0" class="index-inst"><span>1</span></a>, <a href="media.html#x3" class="index-inst"><span>2</span></a>
2139521395
<li class="tocline0">@page, <a href="page.html#x3" class="index-def"><strong>1</strong></a>
@@ -21437,7 +21437,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
2143721437
<li class="tocline0">block box, <a href="visuren.html#block-box" class="index-def"><strong>1</strong></a>
2143821438
<li class="tocline0">'block', definition of, <a href="visuren.html#value-def-block" class="index-def"><strong>1</strong></a>
2143921439
<li class="tocline0">block-level element, <a href="visuren.html#block-level" class="index-def"><strong>1</strong></a>
21440-
<li class="tocline0">BOM, <a href="syndata.html#x54" class="index-inst"><span>1</span></a>, <a href="syndata.html#x60" class="index-inst"><span>2</span></a>
21440+
<li class="tocline0">BOM, <a href="syndata.html#x54" class="index-inst"><span>1</span></a>
2144121441
<li class="tocline0">border edge, <a href="box.html#border-edge" class="index-def"><strong>1</strong></a>
2144221442
<li class="tocline0">'border', <a href="box.html#propdef-border" class="index-def"><strong>1</strong></a>
2144321443
<li class="tocline0">'border-bottom', <a href="box.html#propdef-border-bottom" class="index-def"><strong>1</strong></a>
@@ -21552,7 +21552,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
2155221552
<li class="tocline0">default style sheet, <a href="cascade.html#default-style-sheet" class="index-def"><strong>1</strong></a>
2155321553
<li class="tocline0">default
2155421554
<ul class="index">
21555-
<li class="tocline0">character encoding, <a href="syndata.html#x52" class="index-inst"><span>1</span></a>, <a href="syndata.html#x58" class="index-inst"><span>2</span></a>
21555+
<li class="tocline0">character encoding, <a href="syndata.html#x52" class="index-inst"><span>1</span></a>
2155621556
</ul>
2155721557
<li class="tocline0">descendant, <a href="conform.html#descendant" class="index-def"><strong>1</strong></a>
2155821558
<li class="tocline0">descendant-selectors, <a href="selector.html#x12" class="index-def"><strong>1</strong></a>
@@ -21946,7 +21946,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
2194621946
<li class="tocline0">User, <a href="conform.html#user" class="index-def"><strong>1</strong></a>
2194721947
<li class="tocline0">user agent, <a href="conform.html#ua" class="index-def"><strong>1</strong></a>
2194821948
<li class="tocline0">User agent (UA), <a href="conform.html#user-agent" class="index-def"><strong>1</strong></a>
21949-
<li class="tocline0">UTF-8, <a href="syndata.html#x58" class="index-inst"><span>1</span></a>, <a href="syndata.html#x64" class="index-inst"><span>2</span></a>
21949+
<li class="tocline0">UTF-8, <a href="syndata.html#x58" class="index-inst"><span>1</span></a>
2195021950
</ul>
2195121951
<p><a name="index-v">&nbsp;</a>
2195221952
<ul class="index">

css2/diffs-wd/box.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
443443

444444
<p>An element's own margins are adjoining if the <a href="visudet.html#propdef-min-height" class="noxref"><span
445445
class="propinst-min-height">'min-height'</span></a> property is zero, and
446-
it has neither vertical borders nor vertical padding, and it has a
446+
it has neither <del>vertical</del><ins>top</ins> <ins>or</ins> <ins>bottom</ins> borders nor <del>vertical</del><ins>top</ins> <ins>or</ins> <ins>bottom</ins> padding, and it has a
447447
<a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> of either 0 or 'auto',
448448
and it does not contain a line box, and all of its in-flow children's
449449
margins (if any) are adjoining.</p>

css2/diffs-wd/conform.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
150150
<a name="replaced-element">Replaced
151151
element</a></span></strong>
152152

153-
<dd><p>An element that is outside the scope of the CSS formatter, such
154-
as an image, embedded document, or applet. For example, the content of
155-
the HTML IMG element is often replaced by the image that its "src"
156-
attribute designates. Replaced elements often have intrinsic
157-
dimensions: an intrinsic width, an intrinsic height, and an intrinsic
158-
ratio. For example, a bitmap image has an intrinsic width and an
159-
intrinsic height specified in absolute units (from which the intrinsic
160-
ratio can obviously be determined). On the other hand, other documents
161-
may not have any intrinsic dimensions (for example a blank HTML
162-
document).
153+
<dd><p>An element <del>that</del><ins>whose</ins> <ins>content</ins> is outside the scope of the CSS
154+
<del>formatter,</del><ins>formatting</ins> <ins>model,</ins> such as an image, embedded document, or applet. For
155+
example, the content of the HTML IMG element is often replaced by the
156+
image that its "src" attribute designates. Replaced elements often
157+
have intrinsic dimensions: an intrinsic width, an intrinsic height,
158+
and an intrinsic ratio. For example, a bitmap image has an intrinsic
159+
width and an intrinsic height specified in absolute units (from which
160+
the intrinsic ratio can obviously be determined). On the other hand,
161+
other documents may not have any intrinsic dimensions (for example a
162+
blank HTML document).
163163

164164
<p>User agents may consider a replaced element to not have any
165165
intrinsic dimensions if it is believed that those dimensions could
@@ -218,9 +218,9 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
218218
content</a></span></strong>
219219

220220
<dd>The content of an element after the rendering that applies to it
221-
according to the relevant style sheets has been applied. The rendered
222-
content of a <a href="#replaced-element">replaced element</a> comes
223-
from outside the source document. Rendered content may also be
221+
according to the relevant style sheets has been applied. <del>The</del> <del>rendered</del> <del>content</del> <del>of</del><ins>How</ins> a
222+
replaced <del>element</del> <del>comes</del> <del>from</del> <del>outside</del> <del>the</del> <del>source</del> <del>document.</del><ins>element's</ins> <ins>content</ins> <ins>is</ins> <ins>rendered</ins> <ins>is</ins> <ins>not</ins> <ins>defined</ins> <ins>by</ins> <ins>this</ins>
223+
<ins>specification.</ins> Rendered content may also be
224224
alternate text for an element (e.g., the value of the XHTML "alt"
225225
attribute), and may include items inserted implicitly or explicitly by
226226
the style sheet, such as bullets, numbering, etc.

css2/diffs-wd/indexlist.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ <H1><a name="q0">Appendix I. Index</a></H1>
7777
</ul>
7878
<p><a name="index-;">&nbsp;</a><a name="index-<">&nbsp;</a><a name="index-=">&nbsp;</a><a name="index->">&nbsp;</a><a name="index-?">&nbsp;</a><a name="index-@">&nbsp;</a>
7979
<ul class="index">
80-
<li class="tocline0">@charset, <a href="syndata.html#x10" class="index-inst"><span>1</span></a>, <a href="syndata.html#x55" class="index-inst"><span>2</span></a>, <a href="syndata.html#x56" class="index-inst"><span>3</span></a><ins>,</ins> <a href="syndata.html#x61" class="index-inst"><span><ins>4</ins></span></a><ins>,</ins> <a href="syndata.html#x62" class="index-inst"><span><ins>5</ins></span></a>
81-
<li class="tocline0">"@charset", <a href="syndata.html#x57" class="index-def"><strong>1</strong></a><ins>,</ins> <a href="syndata.html#x63" class="index-def"><strong><ins>2</ins></strong></a>
80+
<li class="tocline0">@charset, <a href="syndata.html#x10" class="index-inst"><span>1</span></a>, <a href="syndata.html#x55" class="index-inst"><span>2</span></a>, <a href="syndata.html#x56" class="index-inst"><span>3</span></a>
81+
<li class="tocline0">"@charset", <a href="syndata.html#x57" class="index-def"><strong>1</strong></a>
8282
<li class="tocline0">@import, <a href="cascade.html#x6" class="index-def"><strong>1</strong></a>, <a href="cascade.html#x7" class="index-inst"><span>2</span></a>, <a href="media.html#x1" class="index-inst"><span>3</span></a>
8383
<li class="tocline0">@media, <a href="media.html#x0" class="index-inst"><span>1</span></a>, <a href="media.html#x3" class="index-inst"><span>2</span></a>
8484
<li class="tocline0">@page, <a href="page.html#x3" class="index-def"><strong>1</strong></a>
@@ -126,7 +126,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
126126
<li class="tocline0">block box, <a href="visuren.html#block-box" class="index-def"><strong>1</strong></a>
127127
<li class="tocline0">'block', definition of, <a href="visuren.html#value-def-block" class="index-def"><strong>1</strong></a>
128128
<li class="tocline0">block-level element, <a href="visuren.html#block-level" class="index-def"><strong>1</strong></a>
129-
<li class="tocline0">BOM, <a href="syndata.html#x54" class="index-inst"><span>1</span></a><ins>,</ins> <a href="syndata.html#x60" class="index-inst"><span><ins>2</ins></span></a>
129+
<li class="tocline0">BOM, <a href="syndata.html#x54" class="index-inst"><span>1</span></a>
130130
<li class="tocline0">border edge, <a href="box.html#border-edge" class="index-def"><strong>1</strong></a>
131131
<li class="tocline0">'border', <a href="box.html#propdef-border" class="index-def"><strong>1</strong></a>
132132
<li class="tocline0">'border-bottom', <a href="box.html#propdef-border-bottom" class="index-def"><strong>1</strong></a>
@@ -241,7 +241,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
241241
<li class="tocline0">default style sheet, <a href="cascade.html#default-style-sheet" class="index-def"><strong>1</strong></a>
242242
<li class="tocline0">default
243243
<ul class="index">
244-
<li class="tocline0">character encoding, <a href="syndata.html#x52" class="index-inst"><span>1</span></a><ins>,</ins> <a href="syndata.html#x58" class="index-inst"><span><ins>2</ins></span></a>
244+
<li class="tocline0">character encoding, <a href="syndata.html#x52" class="index-inst"><span>1</span></a>
245245
</ul>
246246
<li class="tocline0">descendant, <a href="conform.html#descendant" class="index-def"><strong>1</strong></a>
247247
<li class="tocline0">descendant-selectors, <a href="selector.html#x12" class="index-def"><strong>1</strong></a>
@@ -635,7 +635,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
635635
<li class="tocline0"><ins>User,</ins> <a href="conform.html#user" class="index-def"><strong><ins>1</ins></strong></a>
636636
<li class="tocline0">user agent, <a href="conform.html#ua" class="index-def"><strong>1</strong></a>
637637
<li class="tocline0"><ins>User</ins> <ins>agent</ins> <ins>(UA),</ins> <a href="conform.html#user-agent" class="index-def"><strong><ins>1</ins></strong></a>
638-
<li class="tocline0">UTF-8, <a href="syndata.html#x58" class="index-inst"><span>1</span></a><ins>,</ins> <a href="syndata.html#x64" class="index-inst"><span><ins>2</ins></span></a>
638+
<li class="tocline0">UTF-8, <a href="syndata.html#x58" class="index-inst"><span>1</span></a>
639639
</ul>
640640
<p><a name="index-v">&nbsp;</a>
641641
<ul class="index">

css2/diffs-wd/page.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,11 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
356356
box so that the next page is formatted as a right page.</dd>
357357
</dl>
358358

359-
<P>Whether the first page of a document is :left or :right depends on
359+
<p>Whether the first page of a document is :left or :right depends on
360360
the major writing direction of the document. A conforming user agent
361361
may interpret the values 'left' and 'right' as 'always'.
362362

363-
<P>A potential page break location is typically under the influence
363+
<p>A potential page break location is typically under the influence
364364
of the parent element's <a href="page.html#propdef-page-break-inside" class="noxref"><span
365365
class="propinst-page-break-inside">'page-break-inside'</span></a>
366366
property, the <a href="page.html#propdef-page-break-after" class="noxref"><span
@@ -371,10 +371,13 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
371371
than 'auto', the values 'always', 'left', and 'right' take precedence
372372
over 'avoid'.
373373

374-
<P>User Agents must apply these properties to block-level elements
374+
<p>User Agents must apply these properties to block-level elements
375375
in the normal flow of the root element. User agents may also apply
376376
these properties to other elements, e.g., 'table-row' elements.
377377

378+
<p><ins>When</ins> <ins>a</ins> <ins>page</ins> <ins>break</ins> <ins>splits</ins> <ins>a</ins> <ins>box,</ins> <ins>the</ins> <ins>box's</ins> <ins>margins,</ins> <ins>borders,</ins> <ins>and</ins>
379+
<ins>padding</ins> <ins>have</ins> <ins>no</ins> <ins>visual</ins> <ins>effect</ins> <ins>where</ins> <ins>the</ins> <ins>split</ins> <ins>occurs.</ins>
380+
378381

379382
<h3>13.3.2 <a name="break-inside">Breaks inside elements</a>: <a href="page.html#propdef-orphans" class="noxref"><span
380383
class="propinst-orphans">'orphans'</span></a>, <a href="page.html#propdef-widows" class="noxref"><span

css2/diffs-wd/syndata.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ <h3><a name="q15">4.3.1 Integers and real numbers</a></h3>
808808
be an &lt;integer&gt;, or it can be zero or more digits followed by a
809809
dot (.) followed by one or more digits. Both integers and real numbers
810810
may be preceded by a "-" or "+" to indicate the sign.
811-
</p>
811+
<ins>-0</ins> <ins>is</ins> <ins>equivalent</ins> <ins>to</ins> <ins>0</ins> <ins>and</ins> <ins>is</ins> <ins>not</ins> <ins>a</ins> <ins>negative</ins> <ins>number.</ins></p>
812812

813813
<p>Note that many properties that allow an integer or real number as a
814814
value actually restrict the value to some range, often to a
@@ -1235,7 +1235,8 @@ <h3> <del>Counters</del> <del>that</del> <del>are</del> <del>not</del> <del>in</
12351235
details. Note that only colors specified in CSS are affected; e.g.,
12361236
images are expected to carry their own color information.
12371237
</p>
1238-
<p>Values outside the device gamut should be clipped: the red, green,
1238+
<p>Values outside the device gamut should be <del>clipped:</del><ins>clipped</ins> <ins>or</ins>
1239+
<ins>mapped</ins> <ins>into</ins> <ins>the</ins> <ins>gamut</ins> <ins>when</ins> <ins>the</ins> <ins>gamut</ins> <ins>is</ins> <ins>known:</ins> the red, green,
12391240
and blue values must be changed to fall within the range supported by
12401241
the device. <ins>Users</ins> <ins>agents</ins> <ins>may</ins> <ins>perform</ins> <ins>higher</ins> <ins>quality</ins> <ins>mapping</ins> <ins>of</ins> <ins>colors</ins>
12411242
<ins>from</ins> <ins>one</ins> <ins>gamut</ins> <ins>to</ins> <ins>another.</ins> For a typical CRT monitor, whose device
@@ -1255,10 +1256,9 @@ <h3> <del>Counters</del> <del>that</del> <del>are</del> <del>not</del> <del>in</
12551256
(inside the device gamut), while other colors inside the 0..255 sRGB
12561257
range will be outside the device gamut and will thus be <del>clipped.</del><ins>mapped.</ins>
12571258
</p>
1258-
<div class=note><p><em><strong><ins>Note.</ins></strong> <ins>It</ins> <ins>is</ins> <ins>thus</ins> <ins>not</ins> <ins>possible</ins>
1259-
<ins>to</ins> <ins>simply</ins> <ins>clip</ins> <ins>all</ins> <ins>colors</ins> <ins>to</ins> <ins>the</ins> <ins>range</ins> <ins>0..255.</ins> <ins>Clipping</ins> <ins>(or</ins> <ins>mapping)</ins>
1260-
<ins>must</ins> <ins>be</ins> <ins>done</ins> <ins>to</ins> <ins>the</ins> <ins>actual</ins> <ins>device</ins> <ins>gamut,</ins> <ins>which</ins> <ins>may</ins> <ins>be</ins> <ins>larger</ins> <ins>or</ins>
1261-
<ins>smaller</ins> <ins>than</ins> <ins>0..255.</ins></em>
1259+
<div class=note><p><em><strong><ins>Note.</ins></strong> <ins>Mapping</ins> <ins>or</ins> <ins>clipping</ins> <ins>of</ins>
1260+
<ins>color</ins> <ins>values</ins> <ins>should</ins> <ins>be</ins> <ins>done</ins> <ins>to</ins> <ins>the</ins> <ins>actual</ins> <ins>device</ins> <ins>gamut</ins> <ins>if</ins> <ins>known</ins> <ins>(which</ins>
1261+
<ins>may</ins> <ins>be</ins> <ins>larger</ins> <ins>or</ins> <ins>smaller</ins> <ins>than</ins> <ins>0..255).</ins></em>
12621262
</div>
12631263

12641264
<h3>4.3.7 <a name="strings">Strings</a></h3>

0 commit comments

Comments
 (0)