Skip to content

Commit 31f3847

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

46 files changed

Lines changed: 2473 additions & 1843 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

css2/conform.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
169169

170170
<dd>The width and height as defined by the element itself, not imposed
171171
by the surroundings. CSS does not define how the intrinsic dimensions
172-
are found. In CSS&nbsp;2.1 it is assumed that all replaced elements,
173-
and only replaced elements, come with intrinsic dimensions.
172+
are found. In CSS&nbsp;2.1 only replaced elements can come with
173+
intrinsic dimensions.
174174

175175
<dt><strong><span class="index-def" title="attribute"><a
176176
name="attribute">Attribute</a></span></strong>

css2/css2.html

Lines changed: 225 additions & 144 deletions
Large diffs are not rendered by default.

css2/diffs-rec/cascade.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ <H3>6.4.3 <a name="specificity">Calculating a selector's specificity</a></H3>
398398
<P>A selector's specificity is calculated as follows:</p>
399399

400400
<ul>
401-
<li>count <ins>1</ins> <ins>if</ins> <ins>the</ins> <ins>selector</ins> <ins>is</ins> <ins>a</ins> <ins>'style'</ins> <ins>attribute</ins> <ins>rather</ins> <ins>than</ins> <ins>a</ins>
401+
<li>count <ins>1</ins> <ins>if</ins> <ins>the</ins> <ins>declaration</ins> <ins>is</ins> <ins>from</ins> <ins>is</ins> <ins>a</ins> <ins>'style'</ins> <ins>attribute</ins> <ins>rather</ins>
402+
<ins>than</ins> <ins>a</ins> <ins>rule</ins> <ins>with</ins> <ins>a</ins>
402403
<ins>selector,</ins> <ins>0</ins> <ins>otherwise</ins> <ins>(=</ins> <ins>a)</ins> <ins>(In</ins> <ins>HTML,</ins> <ins>values</ins> <ins>of</ins> <ins>an</ins> <ins>element's</ins> <ins>"style"</ins>
403404
<ins>attribute</ins> <ins>are</ins> <ins>style</ins> <ins>sheet</ins> <ins>rules.</ins> <ins>These</ins> <ins>rules</ins> <ins>have</ins> <ins>no</ins> <ins>selectors,</ins> <ins>so</ins>
404405
<ins>a=1,</ins> <ins>b=0,</ins> <ins>c=0,</ins> <ins>and</ins> <ins>d=0.)</ins>

css2/diffs-rec/changes.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <H1><a name="q0">Appendix <del>B.</del><ins>C.</ins> Changes</a></H1>
135135
<P><em>This appendix is informative, not normative.</em></P>
136136

137137
<P> <del>CSS2</del> <del>builds</del> <del>on</del> <del>CSS1</del> <del>and</del> <del>all</del> <del>valid</del> <del>CSS1</del> <del>style</del> <del>sheets</del> <del>are</del> <del>valid</del> <del>CSS2</del> <del>style</del> <del>sheets.</del><ins>CSS&nbsp;2.1</ins> <ins>is</ins> <ins>an</ins> <ins>updated</ins> <ins>revision</ins> <ins>of</ins> <ins>CSS2.</ins> The changes between the
138-
<del>CSS1</del><ins>CSS2</ins> specification (see <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="normref"> <del>[CSS1]</del><ins>[CSS2]</ins></span></a>) and this specification fall into
138+
<del>CSS1</del><ins>CSS2</ins> specification (see <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="informref"> <del>[CSS1]</del><ins>[CSS2]</ins></span></a>) and this specification fall into
139139
<del>three</del><ins>five</ins> groups: <del>new</del> <del>functionality,</del> <del>updated</del> <del>descriptions</del> <del>of</del> <del>CSS1</del> <del>functionality,</del> <del>and</del><ins>known</ins> <ins>errors,</ins> <ins>typographical</ins> <ins>errors,</ins> <ins>clarifications,</ins>
140140
changes <del>to</del> <del>CSS1.</del> <del>B.1</del> <del>New</del> <del>functionality</del> <del>In</del> <del>addition</del> <del>to</del> <del>the</del> <del>functionality</del> <del>of</del> <del>CSS1,</del> <del>CSS2</del> <del>supports:</del> <del>The</del> <del>concept</del> <del>of</del> <del>media</del> <del>types</del> <del>.</del> <del>The</del> <del>'inherit'</del> <del>value</del> <del>for</del> <del>all</del> <del>properties.</del> <del>Paged</del> <del>media</del> <del>Aural</del> <del>style</del> <del>sheets</del> <del>Several</del> <del>internationalization</del> <del>features,</del> <del>including</del> <del>list</del> <del>numbering</del> <del>styles</del> <del>,</del> <del>support</del> <del>for</del> <del>bidirectional</del> <del>text</del> <del>,</del>and <del>support</del><ins>additions.</ins> <ins>Typographical</ins> <ins>errors</ins> <ins>are</ins> <ins>not</ins> <ins>listed</ins> <ins>here.</ins></P>
141141

@@ -229,8 +229,8 @@ <h3 id="s-10-3-7"><a name="q13"><ins>C.2.6</ins> </a><a
229229
<p><ins>When</ins> <ins>both</ins> <ins>'width'</ins> <ins>and</ins> <ins>'right'</ins> <ins>(or</ins> <ins>'width'</ins> <ins>and</ins> <ins>'left')</ins> <ins>are</ins> <ins>'auto',</ins>
230230
<ins>the</ins> <ins>element's</ins> <ins>computed</ins> <ins>width</ins> <ins>is</ins> <ins>the</ins> <ins>width</ins> <ins>of</ins> <ins>the</ins> <ins>contents</ins> <ins>(using</ins> <ins>an</ins>
231231
<ins>algorithm</ins> <ins>similar</ins> <ins>to</ins> <ins>that</ins> <ins>for</ins> <ins>table</ins> <ins>cells)</ins> <ins>and</ins> <ins>then</ins> <ins>'right'</ins> <ins>(or</ins>
232-
<ins>'left')</ins> <ins>is</ins> <ins>solved.</ins> <ins>CSS2</ins> <ins>incorrectly</ins> <ins>said</ins> <ins>that</ins> <ins>'right'</ins> <ins>(or</ins> <ins>'left')</ins> <ins>was</ins>
233-
<ins>set</ins> <ins>to</ins> <ins>0</ins> <ins>in</ins> <ins>that</ins> <ins>case,</ins> <ins>and</ins> <ins>then</ins> <ins>width</ins> <ins>was</ins> <ins>solved.</ins>
232+
<ins>'left')</ins> <ins>is</ins> <ins>solved</ins> <ins>for.</ins> <ins>CSS2</ins> <ins>incorrectly</ins> <ins>said</ins> <ins>that</ins> <ins>'right'</ins> <ins>(or</ins> <ins>'left')</ins> <ins>was</ins>
233+
<ins>set</ins> <ins>to</ins> <ins>0</ins> <ins>in</ins> <ins>that</ins> <ins>case,</ins> <ins>and</ins> <ins>then</ins> <ins>width</ins> <ins>was</ins> <ins>solved</ins> <ins>for.</ins>
234234

235235
<h3 id="s-10-6-4"><a name="q14"><ins>C.2.7</ins> </a><a
236236
href="visudet.html#abs-non-replaced-height"><ins>Section</ins> <ins>10.6.4</ins> <ins>Absolutely</ins>

css2/diffs-rec/colors.html

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ <h2><a name="q2">14.2 The background</a></h2>
105105
class="propinst-background-color">'background-color'</span></a>.
106106
</p>
107107
<p>
108-
The background of the <del>box</del> <del>generated</del> <del>by</del> <del>the</del>root element <ins>becomes</ins> <ins>the</ins> <ins>background</ins> <ins>of</ins> <ins>the</ins> <ins>canvas</ins> <ins>and</ins> covers the entire <a href="intro.html#canvas">canvas</a> <del>.</del><ins>,</ins> <ins>anchored</ins> <ins>at</ins> <ins>the</ins> <ins>same</ins> <ins>point</ins> <ins>as</ins> <ins>it</ins> <ins>would</ins> <ins>be</ins> <ins>if</ins> <ins>it</ins> <ins>was</ins> <ins>painted</ins> <ins>only</ins> <ins>for</ins> <ins>the</ins> <ins>root</ins> <ins>element</ins> <ins>itself.</ins> <ins>The</ins> <ins>root</ins> <ins>element</ins> <ins>does</ins> <ins>not</ins> <ins>paint</ins> <ins>this</ins> <ins>background</ins> <ins>again.</ins>
108+
The background of the <del>box</del> <del>generated</del> <del>by</del> <del>the</del>root element <ins>becomes</ins> <ins>the</ins> <ins>background</ins> <ins>of</ins> <ins>the</ins> <ins>canvas</ins> <ins>and</ins>
109+
covers the entire <a href="intro.html#canvas">canvas</a> <del>.</del><ins>,</ins> <ins>anchored</ins> <ins>(for</ins>
110+
<a href="colors.html#propdef-background-position" class="noxref"><span class="propinst-background-position"><ins>'background-position'</ins></span></a><ins>)</ins> <ins>at</ins>
111+
<ins>the</ins> <ins>same</ins> <ins>point</ins> <ins>as</ins> <ins>it</ins> <ins>would</ins> <ins>be</ins> <ins>if</ins> <ins>it</ins> <ins>was</ins> <ins>painted</ins> <ins>only</ins> <ins>for</ins> <ins>the</ins> <ins>root</ins> <ins>element</ins>
112+
<ins>itself.</ins> <ins>The</ins> <ins>root</ins> <ins>element</ins> <ins>does</ins> <ins>not</ins> <ins>paint</ins> <ins>this</ins> <ins>background</ins> <ins>again.</ins>
109113
</p>
110114

111115
<p>For HTML documents, however, we recommend that authors specify the
@@ -117,8 +121,9 @@ <h2><a name="q2">14.2 The background</a></h2>
117121
<ins>user</ins> <ins>agents</ins> <ins>must</ins> <ins>instead</ins> use the <ins>computed</ins> value of <del>the</del> <del>'background'</del> <del>property</del><ins>those</ins> <ins>properties</ins>
118122
<ins>from</ins> <ins>that</ins> <ins>HTML</ins> <ins>element's</ins> <ins>first</ins> <ins>BODY</ins> <ins>element</ins> <ins>child</ins> <ins>when</ins> <ins>painting</ins>
119123
<ins>backgrounds</ins> for the <ins>canvas,</ins> <ins>and</ins> <ins>must</ins> <ins>not</ins> <ins>paint</ins> <ins>a</ins> <ins>background</ins> <ins>for</ins> <ins>that</ins>
120-
BODY element.
121-
<del>If</del> <del>the</del> <del>resulting</del> <del>value</del> <del>is</del> <del>'transparent',</del> <del>the</del> <del>rendering</del> <del>is</del> <del>undefined.</del><ins>This</ins> <ins>does</ins> <ins>not</ins> <ins>apply</ins> <ins>to</ins> <ins>XHTML</ins> <ins>documents.</ins>
124+
BODY element. <del>If</del><ins>Such</ins> <ins>backgrounds</ins> <ins>must</ins> <ins>also</ins> <ins>be</ins> <ins>anchored</ins> <ins>at</ins> the <del>resulting</del> <del>value</del> <del>is</del> <del>'transparent',</del><ins>same</ins> <ins>point</ins>
125+
<ins>as</ins> <ins>they</ins> <ins>would</ins> <ins>be</ins> <ins>if</ins> <ins>they</ins> <ins>were</ins> <ins>painted</ins> <ins>only</ins> <ins>for</ins> the <del>rendering</del> <del>is</del> <del>undefined.</del><ins>root</ins> <ins>element.</ins>
126+
<ins>This</ins> <ins>does</ins> <ins>not</ins> <ins>apply</ins> <ins>to</ins> <ins>XHTML</ins> <ins>documents.</ins>
122127
</p>
123128
<div class="html-example"><p>
124129
According to these rules, the canvas underlying the following
@@ -363,9 +368,9 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
363368
<span class="index-def" title="'background-position'"><a name="propdef-background-position" class="propdef-title"><strong>'background-position'</strong></a></span>
364369
<dd>
365370
<table class="propinfo" cellspacing=0 cellpadding=0>
366-
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>[ [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> <del>]{1,2}</del><ins>|</ins> <ins>left</ins> <ins>|</ins> <ins>center</ins> <ins>|</ins> <ins>right</ins> <ins>]</ins>
367-
<ins>[</ins> <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage"><ins>&lt;percentage&gt;</ins></span></a> <ins>|</ins> <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length"><ins>&lt;length&gt;</ins></span></a> <ins>|</ins> <ins>top</ins> <ins>|</ins> <ins>center</ins> <ins>|</ins> <ins>bottom</ins> <ins>]?</ins> <ins>]</ins> |
368-
[ <del>[top</del><ins>[</ins> <ins>left</ins> | center | <del>bottom]</del><ins>right</ins> <ins>]</ins> || <del>[left</del><ins>[</ins> <ins>top</ins> | center | <del>right]</del><ins>bottom</ins> ] ] |
371+
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>[ [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> <del>]{1,2}</del>| <ins>left</ins> <ins>|</ins> <ins>center</ins> <ins>|</ins> <ins>right</ins> <ins>]</ins>
372+
[ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage"> <del>[top</del><ins>&lt;percentage&gt;</ins></span></a> <ins>|</ins> <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length"><ins>&lt;length&gt;</ins></span></a> <ins>|</ins> <ins>top</ins> <ins>|</ins> <ins>center</ins> <ins>|</ins> <ins>bottom</ins> <ins>]?</ins> <ins>]</ins> <ins>|</ins>
373+
<ins>[</ins> <ins>[</ins> <ins>left</ins> | center | <del>bottom]</del><ins>right</ins> <ins>]</ins> || <del>[left</del><ins>[</ins> <ins>top</ins> | center | <del>right]</del><ins>bottom</ins> ] ] |
369374
<a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
370375
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>0% 0%
371376
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td> <del>block-level</del> <del>and</del> <del>replaced</del><ins>all</ins> elements
@@ -540,7 +545,7 @@ <h2>14.3 <a name="gamma-correction">Gamma correction</a></h2>
540545
<dt> Unix using X11</dt>
541546
<dd> none</dd>
542547
<dt> Mac using QuickDraw</dt>
543-
<dd> apply gamma 1.45 <a href="refs.html#ref-ICC32" rel="biblioentry" class="noxref"><span class="normref">[ICC32]</span></a> (ColorSync-savvy applications
548+
<dd> apply gamma 1.45 <a href="refs.html#ref-ICC42" rel="biblioentry" class="noxref"><span class="normref"> <del>[ICC32]</del><ins>[ICC42]</ins></span></a> (ColorSync-savvy applications
544549
may simply pass the sRGB ICC profile to ColorSync
545550
to perform correct color correction)</dd>
546551
<dt> SGI using X</dt>

0 commit comments

Comments
 (0)