[css2] Generated. Do not edit!

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402661

Author: bert-github

css2/css2.html

@@ -7878,6 +7878,13 @@ <h3>9.4.2 <a name="inline-formatting">Inline formatting context</a></h3>
 same line box</em> due to <a href="#direction">bidirectional text
 processing</a>.
 </p>
+<p>Line boxes that contain no text, no preserved white space, no
+inline elements with non-zero margins, padding, or borders, and no
+other in-flow content (such as images, inline blocks or inline
+tables), and don't end with a line feed must be treated as zero-height
+line boxes. For the purposes of margin collapsing, this line box must
+be ignored.
+</p>
 <div class="html-example"><p> 
 Here is an example of inline box construction. The following paragraph
 (created by the HTML block-level element P) contains anonymous text
@@ -8090,7 +8097,7 @@ <h2>9.5 <a name="floats">Floats</a></h2>
 the left float is placed on that line, aligned with the top of the line box, and then the inline boxes already on the line are moved accordingly to the right of the float (the right being the other side of the left float) and vice versa for rtl and right floats.
 </p>
 <p>
-The margin box of a table, a block-level replaced element, or an element in the normal flow that establishes a new <a href="visuren.html#block-formatting">block formatting context</a>
+The border box of a table, a block-level replaced element, or an element in the normal flow that establishes a new <a href="visuren.html#block-formatting">block formatting context</a> 
 (such as an element with 'overflow' other than 'visible')
 must not overlap any floats in the same block formatting context as
 the element itself. If necessary, implementations should clear the
@@ -9741,6 +9748,13 @@ <h3>10.3.2 <a name="inline-replaced-width">Inline, replaced elements</a></h3>
 
 <blockquote><p>(used height) * (intrinsic ratio)</blockquote>
 
+<p>If 'height' and <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> both
+have computed values of 'auto' and the element has an intrinsic ratio
+but no intrinsic height or width and the containing block's width
+doesn't itself depend on the replaced element's width, then the used
+value of 'width' is calculated from the constraint equation used for
+block-level, non-replaced elements in normal flow.
+
 <p>Otherwise, if <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> has a
 computed value of 'auto', but none of the conditions above are met,
 then the used value of <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a>
@@ -10387,8 +10401,13 @@ <h3>10.6.2 <a name="inline-replaced-height">Inline replaced elements</a>,
 'auto' and the element has no intrinsic height, but does have an
 intrinsic width and intrinsic ratio; or if <a href="visudet.html#propdef-height" class="noxref"><span
 class="propinst-height">'height'</span></a> has a computed value of
-'auto', <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> has some other
-computed value, and the element does have an intrinsic ratio; then the
+'auto', and the element does have an intrinsic ratio;
+or if <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>
+and <a href="visudet.html#propdef-width" class="noxref"><span class="propinst-width">'width'</span></a> both have computed
+values of 'auto' and the element has an intrinsic ratio but no
+intrinsic height or width and the containing block's width doesn't
+itself depend on the replaced element's width;
+then the
 used value of <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> is:
 
 <blockquote><p>(used width) / (intrinsic ratio)</blockquote>
@@ -11324,6 +11343,7 @@ <h3>11.1.2 <a name="clipping">Clipping</a>: the <a href="visufx.html#propdef-cli
 </dl>
 
 <p>An element's clipping region clips out any aspect of the element (e.g. content, children, background, borders, text decoration, outline and visible scrolling mechanism &mdash; if any) that is outside the clipping region.
+Content that has been clipped does not cause overflow.
 </p>
 <p>The element's ancestors may also clip portions of their content (e.g. via their own <a href="visufx.html#propdef-clip" class="noxref"><span class="propinst-clip">'clip'</span></a> property and/or if 
 their <a href="visufx.html#propdef-overflow" class="noxref"><span class="propinst-overflow">'overflow'</span></a> property is
@@ -17628,6 +17648,10 @@ <H2>A.5 <a name="pause-props">Pause properties</a>: <a href="aural.html#propdef-
 speaking an element's content.  Values have the following
 meanings:</p>
 
+<p class=note><strong>Note.</strong> In CSS3 pauses are inserted
+around the cues and content rather than between them. See [[CSS3
+Speech]] for details.
+
 <dl>
 <dt><span class="index-inst" title="&lt;time&gt;"><a name="x16" href="aural.html#value-def-time" class="noxref"><span class="value-inst-time"><strong>&lt;time&gt;</strong></span></a></span>
 <dd>Expresses the pause in absolute time units (seconds and milliseconds).
@@ -18725,6 +18749,13 @@ <H2><a name="q2">B.2 Informative references</a></H2>
 Available at <a href="http://www.w3.org/TR/2001/CR-css3-selectors-20011113/">
 http://www.w3.org/TR/2001/CR-css3-selectors-20011113</a>
 
+<dt><strong><a name="ref-CSS3SPEECH"
+class="informref">[CSS3SPEECH]</a></strong> <dd>"CSS3 Speech Module",
+David Raggett, Daniel Glazman, Claudio Santambrogio, 14 May 2003, W3C
+Working Draft (work in progress). Available
+at <a href="http://www.w3.org/TR/2004/WD-css3-speech-20041216/">
+http://www.w3.org/TR/2004/WD-css3-speech-20041216</a>
+
 <dt><strong><a name="ref-DOM" class="informref">[DOM]</a></strong>
 <dd>"Document Object Model Specification", L. Wood, A. Le Hors, 
 9 October 1997.<BR>
@@ -21388,8 +21419,8 @@ <H1><a name="q0">Appendix I. Index</a></H1>
 </ul>
 <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>
 <ul class="index">
-  <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>
-  <li class="tocline0">"@charset", <a href="syndata.html#x57" class="index-def"><strong>1</strong></a>
+  <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>
+  <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>
   <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>
   <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>
   <li class="tocline0">@page, <a href="page.html#x3" class="index-def"><strong>1</strong></a>
@@ -21437,7 +21468,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
   <li class="tocline0">block box, <a href="visuren.html#block-box" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'block', definition of, <a href="visuren.html#value-def-block" class="index-def"><strong>1</strong></a>
   <li class="tocline0">block-level element, <a href="visuren.html#block-level" class="index-def"><strong>1</strong></a>
-  <li class="tocline0">BOM, <a href="syndata.html#x54" class="index-inst"><span>1</span></a>
+  <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>
   <li class="tocline0">border edge, <a href="box.html#border-edge" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'border', <a href="box.html#propdef-border" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'border-bottom', <a href="box.html#propdef-border-bottom" class="index-def"><strong>1</strong></a>
@@ -21552,7 +21583,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
   <li class="tocline0">default style sheet, <a href="cascade.html#default-style-sheet" class="index-def"><strong>1</strong></a>
   <li class="tocline0">default
   <ul class="index">
-    <li class="tocline0">character encoding, <a href="syndata.html#x52" class="index-inst"><span>1</span></a>
+    <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>
   </ul>
   <li class="tocline0">descendant, <a href="conform.html#descendant" class="index-def"><strong>1</strong></a>
   <li class="tocline0">descendant-selectors, <a href="selector.html#x12" class="index-def"><strong>1</strong></a>
@@ -21946,7 +21977,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
   <li class="tocline0">User, <a href="conform.html#user" class="index-def"><strong>1</strong></a>
   <li class="tocline0">user agent, <a href="conform.html#ua" class="index-def"><strong>1</strong></a>
   <li class="tocline0">User agent (UA), <a href="conform.html#user-agent" class="index-def"><strong>1</strong></a>
-  <li class="tocline0">UTF-8, <a href="syndata.html#x58" class="index-inst"><span>1</span></a>
+  <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>
 </ul>
 <p><a name="index-v">&nbsp;</a>
 <ul class="index">

css2/diffs-rec/aural.html

@@ -389,6 +389,10 @@ <H2> <del>19.4</del><ins>A.5</ins> <a name="pause-props">Pause properties</a>: <
 speaking an element's content.  Values have the following
 meanings:</p>
 
+<p class=note><strong><ins>Note.</ins></strong> <ins>In</ins> <ins>CSS3</ins> <ins>pauses</ins> <ins>are</ins> <ins>inserted</ins>
+<ins>around</ins> <ins>the</ins> <ins>cues</ins> <ins>and</ins> <ins>content</ins> <ins>rather</ins> <ins>than</ins> <ins>between</ins> <ins>them.</ins> <ins>See</ins> <ins>[[CSS3</ins>
+<ins>Speech]]</ins> <ins>for</ins> <ins>details.</ins>
+
 <dl>
 <dt><span class="index-inst" title="&lt;time&gt;"><a name="x16" href="aural.html#value-def-time" class="noxref"><span class="value-inst-time"><strong>&lt;time&gt;</strong></span></a></span>
 <dd>Expresses the pause in absolute time units (seconds and milliseconds).

css2/diffs-rec/box.html

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

css2/diffs-rec/conform.html

@@ -150,16 +150,16 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
 <a name="replaced-element">Replaced
 element</a></span></strong>
 
-<dd><p>An element  <del>for</del> <del>which</del> <del>the</del> <del>CSS</del> <del>formatter</del> <del>knows</del> <del>only</del><ins>that</ins> <ins>is</ins> <ins>outside</ins> the  <del>intrinsic</del> <del>dimensions.</del> <del>In</del> <del>HTML,</del> <del>IMG,</del> <del>INPUT,</del> <del>TEXTAREA,</del> <del>SELECT,</del> <del>and</del> <del>OBJECT</del> <del>elements</del> <del>can</del> <del>be</del> <del>examples</del><ins>scope</ins> of  <del>replaced</del> <del>elements.</del><ins>the</ins> <ins>CSS</ins> <ins>formatter,</ins> <ins>such</ins>
-<ins>as</ins> <ins>an</ins> <ins>image,</ins> <ins>embedded</ins> <ins>document,</ins> <ins>or</ins> <ins>applet.</ins> For example, the content of
-the <ins>HTML</ins> IMG element is often replaced by the image that  <del>the</del><ins>its</ins> "src"
-attribute designates.  <del>CSS</del> <del>does</del> <del>not</del> <del>define</del> <del>how</del><ins>Replaced</ins> <ins>elements</ins> <ins>often</ins> <ins>have</ins> <ins>intrinsic</ins>
-<ins>dimensions:</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>width,</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>height,</ins> <ins>and</ins> <ins>an</ins> <ins>intrinsic</ins>
-<ins>ratio.</ins> <ins>For</ins> <ins>example,</ins> <ins>a</ins> <ins>bitmap</ins> <ins>image</ins> <ins>has</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>width</ins> <ins>and</ins> <ins>an</ins>
-<ins>intrinsic</ins> <ins>height</ins> <ins>specified</ins> <ins>in</ins> <ins>absolute</ins> <ins>units</ins> <ins>(from</ins> <ins>which</ins> the intrinsic
-<ins>ratio</ins> <ins>can</ins> <ins>obviously</ins> <ins>be</ins> <ins>determined).</ins> <ins>On</ins> <ins>the</ins> <ins>other</ins> <ins>hand,</ins> <ins>other</ins> <ins>documents</ins>
-<ins>may</ins> <ins>not</ins> <ins>have</ins> <ins>any</ins> <ins>intrinsic</ins> dimensions  <del>are</del> <del>found.</del><ins>(for</ins> <ins>example</ins> <ins>a</ins> <ins>blank</ins> <ins>HTML</ins>
-<ins>document).</ins>
+<dd><p>An element  <del>for</del> <del>which</del> <del>the</del> <del>CSS</del> <del>formatter</del> <del>knows</del> <del>only</del><ins>whose</ins> <ins>content</ins> <ins>is</ins> <ins>outside</ins> the  <del>intrinsic</del> <del>dimensions.</del> <del>In</del> <del>HTML,</del> <del>IMG,</del> <del>INPUT,</del> <del>TEXTAREA,</del> <del>SELECT,</del> <del>and</del> <del>OBJECT</del> <del>elements</del> <del>can</del> <del>be</del> <del>examples</del><ins>scope</ins> of  <del>replaced</del> <del>elements.</del><ins>the</ins> <ins>CSS</ins>
+<ins>formatting</ins> <ins>model,</ins> <ins>such</ins> <ins>as</ins> <ins>an</ins> <ins>image,</ins> <ins>embedded</ins> <ins>document,</ins> <ins>or</ins> <ins>applet.</ins> For
+example, the content of the <ins>HTML</ins> IMG element is often replaced by the
+image that  <del>the</del><ins>its</ins> "src" attribute designates.  <del>CSS</del> <del>does</del> <del>not</del> <del>define</del> <del>how</del><ins>Replaced</ins> <ins>elements</ins> <ins>often</ins>
+<ins>have</ins> <ins>intrinsic</ins> <ins>dimensions:</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>width,</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>height,</ins>
+<ins>and</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>ratio.</ins> <ins>For</ins> <ins>example,</ins> <ins>a</ins> <ins>bitmap</ins> <ins>image</ins> <ins>has</ins> <ins>an</ins> <ins>intrinsic</ins>
+<ins>width</ins> <ins>and</ins> <ins>an</ins> <ins>intrinsic</ins> <ins>height</ins> <ins>specified</ins> <ins>in</ins> <ins>absolute</ins> <ins>units</ins> <ins>(from</ins> <ins>which</ins>
+<ins>the</ins> <ins>intrinsic</ins> <ins>ratio</ins> <ins>can</ins> <ins>obviously</ins> <ins>be</ins> <ins>determined).</ins> <ins>On</ins> the <ins>other</ins> <ins>hand,</ins>
+<ins>other</ins> <ins>documents</ins> <ins>may</ins> <ins>not</ins> <ins>have</ins> <ins>any</ins> intrinsic dimensions  <del>are</del> <del>found.</del><ins>(for</ins> <ins>example</ins> <ins>a</ins>
+<ins>blank</ins> <ins>HTML</ins> <ins>document).</ins>
 
 <p><ins>User</ins> <ins>agents</ins> <ins>may</ins> <ins>consider</ins> <ins>a</ins> <ins>replaced</ins> <ins>element</ins> <ins>to</ins> <ins>not</ins> <ins>have</ins> <ins>any</ins>
 <ins>intrinsic</ins> <ins>dimensions</ins> <ins>if</ins> <ins>it</ins> <ins>is</ins> <ins>believed</ins> <ins>that</ins> <ins>those</ins> <ins>dimensions</ins> <ins>could</ins>
@@ -218,9 +218,9 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
 content</a></span></strong>
 
 <dd>The content of an element after the rendering that applies to it
-according to the relevant style sheets has been applied. The rendered
-content of a <a href="#replaced-element">replaced element</a> comes
-from outside the source document.  Rendered content may also be
+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
+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>
+<ins>specification.</ins> Rendered content may also be
 alternate text for an element (e.g., the value of the  <del>HTML</del><ins>XHTML</ins> "alt"
 attribute), and may include items inserted implicitly or explicitly by
 the style sheet, such as bullets, numbering, etc.