Skip to content

Commit 46d3b7a

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

25 files changed

Lines changed: 1825 additions & 1537 deletions

css2/changes.html

Lines changed: 183 additions & 159 deletions
Large diffs are not rendered by default.

css2/colors.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,15 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
229229
class="propinst-background-position">'background-position'</span></a>
230230
property.
231231
</p>
232+
<p>If the image has one of either an intrinsic width or an intrinsic
233+
height and an intrinsic aspect ratio, then the missing dimension is
234+
calculated from the given dimension and the ratio.
235+
</p>
236+
<p> If the image has one of either an intrinsic width or an intrinsic
237+
height and no intrinsic aspect ratio, then the missing dimension is
238+
assumed to be the size of the rectangle that establishes the
239+
coordinate system for the 'background-position' property.
240+
</p>
232241
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
233242
the dimensions must be assumed to be the largest dimensions at that
234243
ratio such that neither dimension exceeds the dimensions of the

css2/cover.html

Lines changed: 86 additions & 84 deletions
Large diffs are not rendered by default.

css2/css2.html

Lines changed: 333 additions & 261 deletions
Large diffs are not rendered by default.

css2/diffs-rec/changes.html

Lines changed: 230 additions & 206 deletions
Large diffs are not rendered by default.

css2/diffs-rec/colors.html

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,15 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
229229
class="propinst-background-position"><ins>'background-position'</ins></span></a>
230230
<ins>property.</ins>
231231
</p>
232+
<p><ins>If</ins> <ins>the</ins> <ins>image</ins> <ins>has</ins> <ins>one</ins> <ins>of</ins> <ins>either</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>width</ins> <ins>or</ins> <ins>an</ins> <ins>intrinsic</ins>
233+
<ins>height</ins> <ins>and</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>aspect</ins> <ins>ratio,</ins> <ins>then</ins> <ins>the</ins> <ins>missing</ins> <ins>dimension</ins> <ins>is</ins>
234+
<ins>calculated</ins> <ins>from</ins> <ins>the</ins> <ins>given</ins> <ins>dimension</ins> <ins>and</ins> <ins>the</ins> <ins>ratio.</ins>
235+
</p>
236+
<p> <ins>If</ins> <ins>the</ins> <ins>image</ins> <ins>has</ins> <ins>one</ins> <ins>of</ins> <ins>either</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>width</ins> <ins>or</ins> <ins>an</ins> <ins>intrinsic</ins>
237+
<ins>height</ins> <ins>and</ins> <ins>no</ins> <ins>intrinsic</ins> <ins>aspect</ins> <ins>ratio,</ins> <ins>then</ins> <ins>the</ins> <ins>missing</ins> <ins>dimension</ins> <ins>is</ins>
238+
<ins>assumed</ins> <ins>to</ins> <ins>be</ins> <ins>the</ins> <ins>size</ins> <ins>of</ins> <ins>the</ins> <ins>rectangle</ins> <ins>that</ins> <ins>establishes</ins> <ins>the</ins>
239+
<ins>coordinate</ins> <ins>system</ins> <ins>for</ins> <ins>the</ins> <ins>'background-position'</ins> <ins>property.</ins>
240+
</p>
232241
<p><ins>If</ins> <ins>the</ins> <ins>image</ins> <ins>has</ins> <ins>no</ins> <ins>intrinsic</ins> <ins>dimensions</ins> <ins>and</ins> <ins>has</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>ratio</ins>
233242
<ins>the</ins> <ins>dimensions</ins> <ins>must</ins> <ins>be</ins> <ins>assumed</ins> <ins>to</ins> <ins>be</ins> <ins>the</ins> <ins>largest</ins> <ins>dimensions</ins> <ins>at</ins> <ins>that</ins>
234243
<ins>ratio</ins> <ins>such</ins> <ins>that</ins> <ins>neither</ins> <ins>dimension</ins> <ins>exceeds</ins> <ins>the</ins> <ins>dimensions</ins> <ins>of</ins> <ins>the</ins>
@@ -266,15 +275,15 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
266275
href="box.html#box-padding-area">padding</a> <ins>and</ins> <a
267276
href="box.html#box-border-area"><ins>border</ins></a> areas of a box.
268277
</p><p>
269-
<del>Values</del> <del>have</del>The <del>following</del> <del>meanings:</del> <del>repeat</del><ins>tiling</ins> <ins>and</ins> <ins>positioning</ins> <ins>of</ins> <ins>the</ins>
278+
<ins>The</ins> <ins>tiling</ins> <ins>and</ins> <ins>positioning</ins> <ins>of</ins> <ins>the</ins>
270279
<ins>background-image</ins> <ins>on</ins> <ins>inline</ins> <ins>elements</ins> <ins>is</ins> <ins>undefined</ins> <ins>in</ins> <ins>this</ins> <ins>specification.</ins>
271280
<ins>A</ins> <ins>future</ins> <ins>level</ins> <ins>of</ins> <ins>CSS</ins> <ins>may</ins> <ins>define</ins> <ins>the</ins> <ins>tiling</ins> <ins>and</ins> <ins>positioning</ins> <ins>of</ins> <ins>the</ins>
272281
<ins>background-image</ins> <ins>on</ins> <ins>inline</ins> <ins>elements.</ins>
273282
</p>
274-
<p><ins>Values</ins> <ins>have</ins> <ins>the</ins> <ins>following</ins> <ins>meanings:</ins></p>
283+
<p>Values have the following meanings:</p>
275284

276285
<dl>
277-
<dt><strong><ins>repeat</ins></strong></dt>
286+
<dt><strong>repeat</strong></dt>
278287
<dd>The image is repeated both horizontally and vertically.</dd>
279288
<dt><strong>repeat-x</strong></dt>
280289
<dd>The image is repeated horizontally only.</dd>
@@ -368,22 +377,22 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
368377
<dd>
369378
<table class="propinfo" cellspacing=0 cellpadding=0>
370379
<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>
371-
[ <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> | center | <del>bottom]</del><ins>bottom</ins> <ins>]?</ins> <ins>]</ins> <ins>|</ins>
372-
<ins>[</ins> <ins>[</ins> <ins>left</ins> <ins>|</ins> <ins>center</ins> <ins>|</ins> <ins>right</ins> <ins>]</ins> || <del>[left</del><ins>[</ins> <ins>top</ins> | center | <del>right]</del><ins>bottom</ins> ] ] |
380+
<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> <ins>|</ins>
381+
<ins>[</ins> [ <del>[top</del><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> ] ] |
373382
<a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
374383
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>0% 0%
375384
<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
376385
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
377-
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>refer to the size of the box itself
378-
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>
386+
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>refer to the <del>size</del> <del>of</del><ins>size</ins> <ins>of</ins> <ins>the</ins> <ins>box</ins> <ins>itself</ins>
387+
<tr valign=baseline><td><em><ins>Media:</ins></em><ins>&nbsp;&nbsp;</ins><td><a href="media.html#visual-media-group" class="noxref"><ins>visual</ins></a>
379388
<tr valign=baseline><td><em><ins>Computed&nbsp;value:</ins></em><ins>&nbsp;&nbsp;</ins><td><ins>for</ins> <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length"><ins>&lt;length&gt;</ins></span></a> <ins>the</ins> <ins>absolute</ins> <ins>value,</ins> <ins>otherwise</ins> <ins>a</ins> <ins>percentage</ins>
380389
</table>
381390
</dl>
382391
</div>
383392

384393

385-
<p>If a background image has been specified, this property specifies
386-
its initial position. <del>Values</del> <del>have</del><ins>If</ins> <ins>only</ins> <ins>one</ins> <ins>value</ins> <ins>is</ins> <ins>specified,</ins> the <del>following</del> <del>meanings:</del> <del>&lt;percentage&gt;</del><ins>second</ins> <ins>value</ins>
394+
<p><ins>If</ins> <ins>a</ins> <ins>background</ins> <ins>image</ins> <ins>has</ins> <ins>been</ins> <ins>specified,</ins> <ins>this</ins> <ins>property</ins> <ins>specifies</ins>
395+
<ins>its</ins> <ins>initial</ins> <ins>position.</ins> <ins>If</ins> <ins>only</ins> <ins>one</ins> <ins>value</ins> <ins>is</ins> <ins>specified,</ins> <ins>the</ins> <ins>second</ins> <ins>value</ins>
387396
<ins>is</ins> <ins>assumed</ins> <ins>to</ins> <ins>be</ins> <ins>'center'.</ins> <ins>If</ins> <ins>at</ins> <ins>least</ins> <ins>one</ins> <ins>value</ins> <ins>is</ins> <ins>not</ins> <ins>a</ins> <ins>keyword,</ins>
388397
<ins>then</ins> <ins>the</ins> <ins>first</ins> <ins>value</ins> <ins>represents</ins> <ins>the</ins> <ins>horizontal</ins> <ins>position</ins> <ins>and</ins> <ins>the</ins> <ins>second</ins>
389398
<ins>represents</ins> <ins>the</ins> <ins>vertical</ins> <ins>position.</ins> <ins>Negative</ins> <ins>&lt;percentage></ins> <ins>and</ins>
@@ -393,10 +402,10 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
393402

394403
<dl>
395404
<dt><span class="index-inst" title="&lt;percentage&gt;"><a name="x8" href="syndata.html#value-def-percentage" class="noxref"><span
396-
class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></a></span>
405+
class="value-inst-percentage"><strong><ins>&lt;percentage&gt;</ins></strong></span></a></span>
397406

398407
<dd><ins>A</ins> <ins>percentage</ins> <ins>X</ins> <ins>aligns</ins> <ins>the</ins> <ins>point</ins> <ins>X%</ins> <ins>across</ins> <ins>(for</ins> <ins>horizontal)</ins> <ins>or</ins>
399-
<ins>down</ins> <ins>(for</ins> <ins>vertical)</ins> <ins>the</ins> <ins>image</ins> <ins>with</ins> <ins>the</ins> <ins>point</ins> <ins>X%</ins> <ins>across</ins> <ins>(for</ins>
408+
<ins>down</ins> <ins>(for</ins> <ins>vertical)</ins> the <del>box</del> <del>itself</del> <del>Media:</del> <del>&nbsp;&nbsp;</del> <del>visual</del> <del>If</del> <del>a</del> <del>background</del>image <del>has</del> <del>been</del> <del>specified,</del> <del>this</del> <del>property</del> <del>specifies</del> <del>its</del> <del>initial</del> <del>position.</del> <del>Values</del> <del>have</del><ins>with</ins> the <del>following</del> <del>meanings:</del> <del>&lt;percentage&gt;</del> <del>&lt;percentage&gt;</del><ins>point</ins> <ins>X%</ins> <ins>across</ins> <ins>(for</ins>
400409
<ins>horizontal)</ins> <ins>or</ins> <ins>down</ins> <ins>(for</ins> <ins>vertical)</ins> <ins>the</ins> <ins>element's</ins> <ins>padding</ins> <ins>box.</ins> <ins>For</ins>
401410
<ins>example,</ins> with a value pair of '0% <del>0%',</del> <del>the</del><ins>0%',the</ins> upper left corner of the
402411
image is aligned with the upper left corner of the <del>box's</del>padding <del>edge</del> <del>.</del><ins>box.</ins> A

0 commit comments

Comments
 (0)