Skip to content

Commit d7fd83c

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

16 files changed

Lines changed: 1935 additions & 1919 deletions

css2/changes.html

Lines changed: 308 additions & 307 deletions
Large diffs are not rendered by default.

css2/cover.html

Lines changed: 154 additions & 153 deletions
Large diffs are not rendered by default.

css2/css2.html

Lines changed: 480 additions & 476 deletions
Large diffs are not rendered by default.

css2/diffs-rec/changes.html

Lines changed: 311 additions & 310 deletions
Large diffs are not rendered by default.

css2/diffs-rec/cover.html

Lines changed: 156 additions & 155 deletions
Large diffs are not rendered by default.

css2/diffs-rec/indexlist.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> 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" title="@charset" class="index-inst"><span>1</span></a> <del>@font-face,</del> <del>1</del>, <a href="syndata.html#x55" title="@charset" class="index-inst"><span>2</span></a>, <a href="syndata.html#x56" title="@charset" class="index-inst"><span>3</span></a>, <a href="syndata.html#x61" title="@charset" class="index-inst"><span>4</span></a>, <a href="syndata.html#x62" title="@charset" class="index-inst"><span>5</span></a>
81-
<li class="tocline0"><ins>"@charset",</ins> <a href="syndata.html#x57" title="&quot;@charset&quot;" class="index-def"><strong><ins>1</ins></strong></a>, <a href="syndata.html#x63" title="&quot;@charset&quot;" class="index-def"><strong> <del>6</del> <del>,</del> <del>7</del><ins>2</ins></strong></a>
80+
<li class="tocline0">@charset, <a href="syndata.html#x10" title="@charset" class="index-inst"><span>1</span></a> <del>@font-face,</del> <del>1</del>, <a href="syndata.html#x55" title="@charset" class="index-inst"><span>2</span></a>, <a href="syndata.html#x56" title="@charset" class="index-inst"><span>3</span></a>
81+
<li class="tocline0"> <del>,</del> <del>4</del> <del>,</del> <del>5</del> <del>,</del> <del>6</del> <del>,</del> <del>7</del><ins>"@charset",</ins> <a href="syndata.html#x57" title="&quot;@charset&quot;" class="index-def"><strong><ins>1</ins></strong></a>
8282
<li class="tocline0">@import, <a href="cascade.html#x6" title="@import" class="index-def"><strong>1</strong></a>, <a href="cascade.html#x7" title="@import" class="index-inst"><span>2</span></a>, <a href="media.html#x1" title="@import" class="index-inst"><span>3</span></a>
8383
<li class="tocline0">@media, <a href="media.html#x0" title="@media" class="index-inst"><span>1</span></a>, <a href="media.html#x3" title="@media" class="index-inst"><span>2</span></a>
8484
<li class="tocline0"> <del>,</del> <del>3</del> <del>,</del> <del>4</del>@page, <a href="page.html#x3" title="@page" class="index-def"><strong>1</strong></a>
@@ -112,7 +112,7 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> Index</a></H1>
112112
</ul>
113113
<p><a name="index-b">&nbsp;</a>
114114
<ul class="index">
115-
<li class="tocline0">'background', <a href="colors.html#propdef-background" title="'background'" class="index-def"><strong>1</strong></a><ins>,</ins> <a href="colors.html#propdef-background" title="'background'" class="index-def"><strong><ins>2</ins></strong></a>
115+
<li class="tocline0">'background', <a href="colors.html#propdef-background" title="'background'" class="index-def"><strong>1</strong></a>
116116
<li class="tocline0">'background-attachment', <a href="colors.html#propdef-background-attachment" title="'background-attachment'" class="index-def"><strong>1</strong></a>
117117
<li class="tocline0">'background-color', <a href="colors.html#propdef-background-color" title="'background-color'" class="index-def"><strong>1</strong></a>
118118
<li class="tocline0">'background-image', <a href="colors.html#propdef-background-image" title="'background-image'" class="index-def"><strong>1</strong></a>
@@ -126,7 +126,7 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> Index</a></H1>
126126
<li class="tocline0">block box, <a href="visuren.html#block-box" title="block box" class="index-def"><strong>1</strong></a>
127127
<li class="tocline0">'block', definition of, <a href="visuren.html#value-def-block" title="'block', definition of" class="index-def"><strong>1</strong></a>
128128
<li class="tocline0">block-level element, <a href="visuren.html#block-level" title="block-level element" class="index-def"><strong>1</strong></a>
129-
<li class="tocline0"><ins>BOM,</ins> <a href="syndata.html#x54" title="BOM" class="index-inst"><span><ins>1</ins></span></a><ins>,</ins> <a href="syndata.html#x60" title="BOM" class="index-inst"><span><ins>2</ins></span></a>
129+
<li class="tocline0"><ins>BOM,</ins> <a href="syndata.html#x54" title="BOM" class="index-inst"><span><ins>1</ins></span></a>
130130
<li class="tocline0">border edge, <a href="box.html#border-edge" title="border edge" class="index-def"><strong>1</strong></a>
131131
<li class="tocline0">'border', <a href="box.html#propdef-border" title="'border'" class="index-def"><strong>1</strong></a>
132132
<li class="tocline0">'border-bottom', <a href="box.html#propdef-border-bottom" title="'border-bottom'" class="index-def"><strong>1</strong></a>
@@ -241,9 +241,9 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> Index</a></H1>
241241
<li class="tocline0">default style sheet, <a href="cascade.html#default-style-sheet" title="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" title="default, character encoding" class="index-inst"><span>1</span></a> <del>'definition-src'</del> <del>(descriptor),</del> <del>1</del><ins>,</ins> <a href="syndata.html#x58" title="default, character encoding" class="index-inst"><span><ins>2</ins></span></a>
244+
<li class="tocline0">character encoding, <a href="syndata.html#x52" title="default, character encoding" class="index-inst"><span>1</span></a>
245245
</ul>
246-
<li class="tocline0">descendant, <a href="conform.html#descendant" title="descendant" class="index-def"><strong>1</strong></a>
246+
<li class="tocline0"> <del>'definition-src'</del> <del>(descriptor),</del> <del>1</del>descendant, <a href="conform.html#descendant" title="descendant" class="index-def"><strong>1</strong></a>
247247
<li class="tocline0">descendant-selectors, <a href="selector.html#x12" title="descendant-selectors" class="index-def"><strong>1</strong></a>
248248
<li class="tocline0"><dfn> <del>'descent'</del> <del>(descriptor),</del><ins>border</ins> <ins>box</ins></dfn><ins>,</ins> <a href="box.html#x14" title="<dfn><ins>border</ins> <ins>box</ins></dfn><ins>"</ins> <ins>class="index-def"></ins><strong><ins>1</ins></strong></a>
249249
<li class="tocline0"><dfn><ins>content</ins> <ins>box</ins></dfn><ins>,</ins> <a href="box.html#x10" title="<dfn><ins>content</ins> <ins>box</ins></dfn><ins>"</ins> <ins>class="index-def"></ins><strong><ins>1</ins></strong></a>
@@ -356,9 +356,9 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> Index</a></H1>
356356
<li class="tocline0">definition of, <a href="visufx.html#value-def-left" title="&lt;left&gt;, definition of" class="index-def"><strong>1</strong></a>
357357
</ul>
358358
<li class="tocline0">'left', <a href="visuren.html#propdef-left" title="'left'" class="index-def"><strong>1</strong></a>
359-
<li class="tocline0">&lt;length&gt;, <a href="colors.html#x11" title="&lt;length&gt;" class="index-inst"><span>1</span></a>, <a href="colors.html#x9" title="&lt;length&gt;" class="index-inst"><span>2</span></a>, <a href="text.html#x1" title="&lt;length&gt;" class="index-inst"><span>3</span></a>, <a href="text.html#x10" title="&lt;length&gt;" class="index-inst"><span>4</span></a>, <a href="text.html#x7" title="&lt;length&gt;" class="index-inst"><span>5</span></a>, <a href="visudet.html#x11" title="&lt;length&gt;" class="index-inst"><span>6</span></a>, <a href="visudet.html#x15" title="&lt;length&gt;" class="index-inst"><span>7</span></a>, <a href="visudet.html#x24" title="&lt;length&gt;" class="index-inst"><span>8</span></a>, <a href="visudet.html#x32" title="&lt;length&gt;" class="index-inst"><span>9</span></a>, <a href="visudet.html#x4" title="&lt;length&gt;" class="index-inst"><span>10</span></a>, <a href="visudet.html#x8" title="&lt;length&gt;" class="index-inst"><span>11</span></a>
359+
<li class="tocline0">&lt;length&gt;, <a href="colors.html#x9" title="&lt;length&gt;" class="index-inst"><span>1</span></a>, <a href="text.html#x1" title="&lt;length&gt;" class="index-inst"><span>2</span></a>, <a href="text.html#x10" title="&lt;length&gt;" class="index-inst"><span>3</span></a>, <a href="text.html#x7" title="&lt;length&gt;" class="index-inst"><span>4</span></a>, <a href="visudet.html#x11" title="&lt;length&gt;" class="index-inst"><span>5</span></a>, <a href="visudet.html#x15" title="&lt;length&gt;" class="index-inst"><span>6</span></a>, <a href="visudet.html#x24" title="&lt;length&gt;" class="index-inst"><span>7</span></a>, <a href="visudet.html#x32" title="&lt;length&gt;" class="index-inst"><span>8</span></a>, <a href="visudet.html#x4" title="&lt;length&gt;" class="index-inst"><span>9</span></a>, <a href="visudet.html#x8" title="&lt;length&gt;" class="index-inst"><span>10</span></a>
360360
<ul class="index">
361-
<li class="tocline0"> <del>,</del> <del>12</del> <del>,</del> <del>13</del> <del>,</del> <del>14</del>definition of, <a href="syndata.html#value-def-length" title="&lt;length&gt;, definition of" class="index-def"><strong>1</strong></a>
361+
<li class="tocline0"> <del>,</del> <del>11</del> <del>,</del> <del>12</del> <del>,</del> <del>13</del> <del>,</del> <del>14</del>definition of, <a href="syndata.html#value-def-length" title="&lt;length&gt;, definition of" class="index-def"><strong>1</strong></a>
362362
</ul>
363363
<li class="tocline0">'letter-spacing', <a href="text.html#propdef-letter-spacing" title="'letter-spacing'" class="index-def"><strong>1</strong></a>
364364
<li class="tocline0">ligatures, <a href="text.html#x8" title="ligatures" class="index-inst"><span>1</span></a>
@@ -639,7 +639,7 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> Index</a></H1>
639639
<li class="tocline0"><ins>User,</ins> <a href="conform.html#user" title="User" class="index-def"><strong>1</strong></a>
640640
<li class="tocline0">user agent, <a href="conform.html#ua" title="user agent" class="index-def"><strong>1</strong></a>
641641
<li class="tocline0"><ins>User</ins> <ins>agent</ins> <ins>(UA),</ins> <a href="conform.html#user-agent" title="User agent (UA)" class="index-def"><strong><ins>1</ins></strong></a>
642-
<li class="tocline0"><ins>UTF-8,</ins> <a href="syndata.html#x58" title="UTF-8" class="index-inst"><span><ins>1</ins></span></a><ins>,</ins> <a href="syndata.html#x64" title="UTF-8" class="index-inst"><span><ins>2</ins></span></a>
642+
<li class="tocline0"><ins>UTF-8,</ins> <a href="syndata.html#x58" title="UTF-8" class="index-inst"><span><ins>1</ins></span></a>
643643
</ul>
644644
<p><a name="index-v">&nbsp;</a>
645645
<ul class="index">
@@ -659,7 +659,7 @@ <H1><a name="q0">Appendix <del>H.</del><ins>I.</ins> Index</a></H1>
659659
</ul>
660660
<p><a name="index-w">&nbsp;</a>
661661
<ul class="index">
662-
<li class="tocline0">'white-space', <a href="text.html#propdef-white-space" title="'white-space'" class="index-def"><strong>1</strong></a><ins>,</ins> <a href="text.html#propdef-white-space" title="'white-space'" class="index-def"><strong><ins>2</ins></strong></a>
662+
<li class="tocline0">'white-space', <a href="text.html#propdef-white-space" title="'white-space'" class="index-def"><strong>1</strong></a>
663663
<li class="tocline0">'widows', <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong>1</strong></a>
664664
<li class="tocline0">'width', <a href="visudet.html#propdef-width" title="'width'" class="index-def"><strong>1</strong></a>
665665
<li class="tocline0"> <del>'widths'</del> <del>(descriptor),</del> <del>1</del>'word-spacing', <a href="text.html#propdef-word-spacing" title="'word-spacing'" class="index-def"><strong>1</strong></a>

css2/diffs-rec/syndata.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,9 @@ <h3>4.3.2 <a name="length-units">Lengths</a></h3>
906906
resolution of the viewing device, i.e., most often a computer
907907
display. If the pixel density of the output device is very different
908908
from that of a typical computer display, the user agent should rescale
909-
pixel values. It is recommended that the <a name="x39"><span class="index-def"
909+
pixel values. It is recommended that the <ins>pixel</ins> <ins>unit</ins> <ins>refer</ins> <ins>to</ins> <ins>the</ins> <ins>whole</ins>
910+
<ins>number</ins> <ins>of</ins> <ins>device</ins> <ins>pixels</ins> <ins>that</ins> <ins>best</ins> <ins>approximates</ins> <ins>the</ins> <ins>reference</ins> <ins>pixel.</ins> <ins>It</ins>
911+
<ins>is</ins> <ins>recommended</ins> <ins>that</ins> <ins>the</ins> <a name="x39"><span class="index-def"
910912
title="reference pixel|pixel"><em>reference pixel</em></span></a> be the
911913
visual angle of one pixel on a device with a pixel density of <del>90dpi</del><ins>96dpi</ins>
912914
and a distance from the reader of an arm's length. For a nominal arm's
@@ -1301,7 +1303,7 @@ <h3><ins>4.3.7</ins> <a name="strings">Strings</a></h3>
13011303

13021304
<h3> <del>4.4</del> <del>CSS</del> <del>document</del> <del>representation</del><ins>4.3.8</ins> <a name="unsupported-values"><ins>Unsupported</ins> <ins>Values</ins></a></h3>
13031305

1304-
<p><ins>If</ins> a <del>CSS</del> <del>style</del> <del>sheet</del> <del>is</del><ins>UA</ins> <ins>does</ins> <ins>not</ins> <ins>support</ins> a <del>sequence</del> <del>of</del> <del>characters</del> <del>from</del> <del>the</del> <del>Universal</del> <del>Character</del> <del>Set</del> <del>(see</del> <del>[ISO10646]</del> <del>).</del> <del>For</del> <del>transmission</del> <del>and</del> <del>storage,</del> <del>these</del> <del>characters</del> <del>must</del> <del>be</del> <del>encoded</del><ins>particular</ins> <ins>value,</ins> <ins>it</ins> <ins>should</ins> <em><ins>ignore</ins></em> <ins>that</ins>
1306+
<p><ins>If</ins> a <del>CSS</del> <del>style</del> <del>sheet</del> <del>is</del><ins>UA</ins> <ins>does</ins> <ins>not</ins> <ins>support</ins> a <del>sequence</del> <del>of</del> <del>characters</del><ins>particular</ins> <ins>value,</ins> <ins>it</ins> <ins>should</ins> <em><ins>ignore</ins></em> <ins>that</ins>
13051307
<ins>value</ins> <ins>when</ins> <ins>parsing</ins> <ins>style</ins> <ins>sheets,</ins> <ins>as</ins> <ins>if</ins> <ins>that</ins> <ins>value</ins> <ins>was</ins> <ins>an</ins>
13061308
<a href="#illegalvalues"><ins>illegal</ins> <ins>value</ins></a><ins>.</ins> <ins>For</ins> <ins>example:</ins>
13071309
</p>
@@ -1324,10 +1326,10 @@ <h3> <del>4.4</del> <del>CSS</del> <del>document</del> <del>representation</del>
13241326

13251327
<h2><ins>4.4</ins> <a name="charset"><ins>CSS</ins> <ins>style</ins> <ins>sheet</ins> <ins>representation</ins></a></h2>
13261328

1327-
<p><ins>A</ins> <ins>CSS</ins> <ins>style</ins> <ins>sheet</ins> <ins>is</ins> <ins>a</ins> <ins>sequence</ins> <ins>of</ins> <ins>characters</ins> <ins>from</ins> <ins>the</ins> <ins>Universal</ins>
1328-
<ins>Character</ins> <ins>Set</ins> <ins>(see</ins> <a href="refs.html#ref-ISO10646" rel="biblioentry" class="noxref"><span class="normref"><ins>[ISO10646]</ins></span></a><ins>).</ins> <ins>For</ins> <ins>transmission</ins> <ins>and</ins>
1329-
<ins>storage,</ins> <ins>these</ins> <ins>characters</ins> <ins>must</ins> <ins>be</ins> <a name="x50"><span class="index-def"
1330-
title="character encoding"><ins>encoded</ins></span></a> by a character encoding that
1329+
<p><ins>A</ins> <ins>CSS</ins> <ins>style</ins> <ins>sheet</ins> <ins>is</ins> <ins>a</ins> <ins>sequence</ins> <ins>of</ins> <ins>characters</ins> from the Universal
1330+
Character Set (see <a href="refs.html#ref-ISO10646" rel="biblioentry" class="noxref"><span class="normref">[ISO10646]</span></a>). For transmission and
1331+
storage, these characters must be <a name="x50"><span class="index-def"
1332+
title="character encoding">encoded</span></a> by a character encoding that
13311333
supports the set of characters available in US-ASCII (e.g., <ins>UTF-8,</ins> ISO
13321334
8859-x, SHIFT JIS, etc.). For a good introduction to character sets
13331335
and character encodings, please consult the HTML <del>4.0</del><ins>4</ins>

css2/diffs-rec/visuren.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -464,14 +464,14 @@ <h3> <del>9.2.5</del><ins>9.2.4</ins> <a name="display-prop">The</a> <a href="vi
464464
<dt><strong> <del>marker</del> <del>This</del> <del>value</del> <del>declares</del> <del>generated</del> <del>content</del> <del>before</del> <del>or</del> <del>after</del> <del>a</del> <del>box</del> <del>to</del> <del>be</del> <del>a</del> <del>marker.</del> <del>This</del> <del>value</del> <del>should</del> <del>only</del> <del>be</del> <del>used</del> <del>with</del> <del>:before</del> <del>and</del> <del>:after</del> <del>pseudo-elements</del> <del>attached</del> <del>to</del> <del>block-level</del> <del>elements.</del> <del>In</del> <del>other</del> <del>cases,</del> <del>this</del> <del>value</del> <del>is</del> <del>interpreted</del> <del>as</del> <del>'inline'.</del> <del>Please</del> <del>consult</del> <del>the</del> <del>section</del> <del>on</del> <del>markers</del> <del>for</del> <del>more</del> <del>information.</del>none</strong></dt>
465465

466466
<dd><a name="x17"><span class="index-def" title="'none'::as display value">This
467-
value</span></a> causes an element to <em> <del>generate</del> <del>no</del> <del>boxes</del><ins>not</ins> <ins>appear</ins></em> in the <a
467+
value</span></a> causes an element to <del>generate</del> <del>no</del> <del>boxes</del><ins>not</ins> <ins>appear</ins> in the <a
468468
href="intro.html#formatting-structure">formatting structure</a> (i.e.,
469-
<em><ins>in</ins> <ins>visual</ins> <ins>media</ins></em> the element <em> <del>has</del><ins>generates</ins> <ins>no</ins> <ins>boxes</ins></em> <ins>and</ins>
470-
<ins>has</ins> no effect on layout). Descendant elements do not generate any
471-
boxes either; <em><ins>the</ins> <ins>element</ins> <ins>and</ins> <ins>its</ins> <ins>content</ins> <ins>are</ins> <ins>removed</ins> <ins>from</ins> <ins>the</ins>
472-
<ins>formatting</ins> <ins>structure</ins> <ins>entirely.</ins></em> This behavior
473-
<strong>cannot</strong> be overridden by setting the <a href="visuren.html#propdef-display" class="noxref"><span
474-
class="propinst-display">'display'</span></a> property on the descendants.
469+
<ins>in</ins> <ins>visual</ins> <ins>media</ins> the element <del>has</del><ins>generates</ins> <ins>no</ins> <ins>boxes</ins> <ins>and</ins> <ins>has</ins> no effect on
470+
layout). Descendant elements do not generate any boxes either; <ins>the</ins>
471+
<ins>element</ins> <ins>and</ins> <ins>its</ins> <ins>content</ins> <ins>are</ins> <ins>removed</ins> <ins>from</ins> <ins>the</ins> <ins>formatting</ins> <ins>structure</ins>
472+
<ins>entirely.</ins> This behavior <strong>cannot</strong> be overridden by
473+
setting the <a href="visuren.html#propdef-display" class="noxref"><span class="propinst-display">'display'</span></a> property
474+
on the descendants.
475475

476476
<p>Please note that a display of 'none' does not create an invisible
477477
box; it creates no box at all. CSS includes mechanisms that enable an

0 commit comments

Comments
 (0)