[css2] Generated. Do not edit!

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

Author: bert-github

css2/css2.html

@@ -11136,7 +11136,13 @@ <h2>10.7 <a name="min-max-heights">Minimum and maximum heights</a>: <a href="vis
 </ol>
 
 <p class="note">These steps do not affect the real computed values of
-the above properties.</p>
+the above properties. The change of used <a href="visudet.html#propdef-height" class="noxref"><span
+class="propinst-height">'height'</span></a> has no effect on margin
+collapsing except as specifically required by rules for <a href="visudet.html#propdef-min-height" class="noxref"><span
+class="propinst-min-height">'min-height'</span></a> or <a href="visudet.html#propdef-max-height" class="noxref"><span
+class="propinst-max-height">'max-height'</span></a> in <a
+href="box.html#collapsing-margins">"Collapsing margins"
+(8.3.1).</a></p>
 
 <p>However, for replaced elements with both <a href="visudet.html#propdef-width" class="noxref"><span
 class="propinst-width">'width'</span></a> and <a href="visudet.html#propdef-height" class="noxref"><span
@@ -13368,22 +13374,6 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
 </div>
 
 
-<div class="propdef">
-<dl><dt>
-<span class="index-def" title="'page-break-inside'"><a name="propdef-page-break-inside" class="propdef-title"><strong>'page-break-inside'</strong></a></span>
-<dd>
-<table class="propinfo" cellspacing=0 cellpadding=0>
-<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>avoid | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
-<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>auto
-<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block-level elements
-<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
-<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
-<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>, <a href="media.html#paged-media-group" class="noxref">paged</a>
-<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>as specified
-</table>
-</dl>
-</div>
-
 
 <P>Values for these properties have the following meanings:</p>
 
@@ -13532,7 +13522,7 @@ <h3>13.3.3 <a name="allowed-page-breaks">Allowed page breaks</a></h3>
 
 <li><strong>Rule D:</strong> In addition, breaking at (2) is allowed only if the <a href="page.html#propdef-page-break-inside" class="noxref"><span
 class="propinst-page-break-inside">'page-break-inside'</span></a> property
-of the elements and all its ancestors is 'auto'.
+of the element and all its ancestors is 'auto'.
 </ul>
 
 <p>If the above doesn't provide enough break points to keep content
@@ -14791,7 +14781,7 @@ <h2>15.6 <a name="font-boldness">Font boldness</a>: the
 will be no less dark than the faces of lighter values.
 </p>
 
-<div id="compute-font-weight">
+<div class=note id="compute-font-weight">
 <p>Note: A set of nested elements that mix 'bolder' and 'lighter' will
 give unpredictable results depending on the UA, OS, and font
 availability. This behavior will be more precisely defined in CSS3.
@@ -24830,10 +24820,10 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
 <tr><td><a href="page.html#propdef-page-break-inside"><span class="propinst-page-break-inside xref">'page-break-inside'</span></a>
 <td>avoid | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>auto
-<td>block-level elements
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+<td>block-level elements (but see text)   no
+<td>N/A
+<td>visual, paged
+<td>as specified
 
 <tr><td><a href="aural.html#propdef-pause-after"><span class="propinst-pause-after xref">'pause-after'</span></a>
 <td><a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
@@ -25850,7 +25840,6 @@ <H1><a name="q0">Appendix I. Index</a></H1>
   <li class="tocline0">page selector, <a href="page.html#x5" title="page selector" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'page-break-after', <a href="page.html#propdef-page-break-after" title="'page-break-after'" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'page-break-before', <a href="page.html#propdef-page-break-before" title="'page-break-before'" class="index-def"><strong>1</strong></a>
-  <li class="tocline0">'page-break-inside', <a href="page.html#propdef-page-break-inside" title="'page-break-inside'" class="index-def"><strong>1</strong></a>
   <li class="tocline0">page-context, <a href="page.html#page-context" title="page-context" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'paged' media group, <a href="media.html#paged-media-group" title="'paged' media group" class="index-def"><strong>1</strong></a>
   <li class="tocline0">parent, <a href="conform.html#parent" title="parent" class="index-def"><strong>1</strong></a>
@@ -26046,7 +26035,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
 <p><a name="index-w">&nbsp;</a>
 <ul class="index">
   <li class="tocline0">'white-space', <a href="text.html#propdef-white-space" title="'white-space'" class="index-def"><strong>1</strong></a>
-  <li class="tocline0">'widows', <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong>1</strong></a>
+  <li class="tocline0">'widows', <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong>1</strong></a>, <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong>2</strong></a>
   <li class="tocline0">'width', <a href="visudet.html#propdef-width" title="'width'" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'word-spacing', <a href="text.html#propdef-word-spacing" title="'word-spacing'" class="index-def"><strong>1</strong></a>
 </ul>

css2/diffs-wd/fonts.html

@@ -635,7 +635,7 @@ <h2>15.6 <a name="font-boldness">Font boldness</a>: the
 will be no less dark than the faces of lighter values.
 </p>
 
-<div id="compute-font-weight">
+<div class=note id="compute-font-weight">
 <p> <del>The</del> <del>computed</del> <del>value</del> <del>of</del> <del>"font-weight"</del> <del>is</del> <del>either:</del> <del>one</del> <del>of</del> <del>the</del> <del>legal</del> <del>number</del> <del>values,</del> <del>or</del> <del>one</del> <del>of</del> <del>the</del> <del>legal</del> <del>number</del> <del>values</del> <del>combined</del> <del>with</del> <del>one</del> <del>or</del> <del>more</del> <del>of</del> <del>the</del> <del>relative</del> <del>values</del> <del>(bolder</del> <del>or</del> <del>lighter).</del> <del>This</del> <del>type</del><ins>Note:</ins> <ins>A</ins> <ins>set</ins> of  <del>computed</del> <del>values</del> <del>is</del> <del>necessary</del> <del>to</del> <del>use</del> <del>when</del><ins>nested</ins> <ins>elements</ins> <ins>that</ins> <ins>mix</ins> <ins>'bolder'</ins> <ins>and</ins> <ins>'lighter'</ins> <ins>will</ins>
 <ins>give</ins> <ins>unpredictable</ins> <ins>results</ins> <ins>depending</ins> <ins>on</ins> the <ins>UA,</ins> <ins>OS,</ins> <ins>and</ins> font
 <ins>availability.</ins> <ins>This</ins> <ins>behavior</ins> <ins>will</ins> <ins>be</ins> <ins>more</ins> <ins>precisely</ins> <ins>defined</ins> in  <del>question</del> <del>does</del> <del>not</del> <del>have</del> <del>all</del> <del>weight</del> <del>variations</del> <del>that</del> <del>are</del> <del>needed.</del><ins>CSS3.</ins>

css2/diffs-wd/indexlist.html

@@ -463,8 +463,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
   <li class="tocline0">page selector, <a href="page.html#x5" title="page selector" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'page-break-after', <a href="page.html#propdef-page-break-after" title="'page-break-after'" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'page-break-before', <a href="page.html#propdef-page-break-before" title="'page-break-before'" class="index-def"><strong>1</strong></a>
-  <li class="tocline0">'page-break-inside', <a href="page.html#propdef-page-break-inside" title="'page-break-inside'" class="index-def"><strong>1</strong></a>
-  <li class="tocline0">page-context, <a href="page.html#page-context" title="page-context" class="index-def"><strong>1</strong></a>
+  <li class="tocline0"> <del>'page-break-inside',</del> <del>1</del>page-context, <a href="page.html#page-context" title="page-context" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'paged' media group, <a href="media.html#paged-media-group" title="'paged' media group" class="index-def"><strong>1</strong></a>
   <li class="tocline0">parent, <a href="conform.html#parent" title="parent" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'pause', <a href="aural.html#propdef-pause" title="'pause'" class="index-def"><strong>1</strong></a>
@@ -659,7 +658,7 @@ <H1><a name="q0">Appendix I. Index</a></H1>
 <p><a name="index-w">&nbsp;</a>
 <ul class="index">
   <li class="tocline0">'white-space', <a href="text.html#propdef-white-space" title="'white-space'" class="index-def"><strong>1</strong></a>
-  <li class="tocline0"> <del>,</del> <del>2</del>'widows', <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong>1</strong></a>
+  <li class="tocline0"> <del>,</del> <del>2</del>'widows', <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong>1</strong></a><ins>,</ins> <a href="page.html#propdef-widows" title="'widows'" class="index-def"><strong><ins>2</ins></strong></a>
   <li class="tocline0">'width', <a href="visudet.html#propdef-width" title="'width'" class="index-def"><strong>1</strong></a>
   <li class="tocline0">'word-spacing', <a href="text.html#propdef-word-spacing" title="'word-spacing'" class="index-def"><strong>1</strong></a>
 </ul>

css2/diffs-wd/page.html

@@ -308,24 +308,8 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
 </div>
 
 
-<div class="propdef">
-<dl><dt>
-<span class="index-def" title="'page-break-inside'"><a name="propdef-page-break-inside" class="propdef-title"><strong>'page-break-inside'</strong></a></span>
-<dd>
-<table class="propinfo" cellspacing=0 cellpadding=0>
-<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>avoid | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
-<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>auto
-<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block-level elements
-<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td> <del>yes</del><ins>no</ins>
-<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
-<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>, <a href="media.html#paged-media-group" class="noxref">paged</a>
-<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>as specified
-</table>
-</dl>
-</div>
-
 
-<P>Values for these properties have the following meanings:</p>
+<P> <del>'page-break-inside'</del> <del>Value:</del> <del>&nbsp;&nbsp;</del> <del>avoid</del> <del>|</del> <del>auto</del> <del>|</del> <del>inherit</del> <del>Initial:</del> <del>&nbsp;&nbsp;</del> <del>auto</del> <del>Applies</del> <del>to:</del> <del>&nbsp;&nbsp;</del> <del>block-level</del> <del>elements</del> <del>Inherited:</del> <del>&nbsp;&nbsp;</del> <del>yes</del> <del>Percentages:</del> <del>&nbsp;&nbsp;</del> <del>N/A</del> <del>Media:</del> <del>&nbsp;&nbsp;</del> <del>visual</del> <del>,</del> <del>paged</del> <del>Computed&nbsp;value:</del> <del>&nbsp;&nbsp;</del> <del>as</del> <del>specified</del>Values for these properties have the following meanings:</p>
 
 <dl>
 <dt><strong>auto</strong></dt>
@@ -472,7 +456,7 @@ <h3>13.3.3 <a name="allowed-page-breaks">Allowed page breaks</a></h3>
 
 <li><strong>Rule D:</strong> In addition, breaking at (2) is allowed only if the <a href="page.html#propdef-page-break-inside" class="noxref"><span
 class="propinst-page-break-inside">'page-break-inside'</span></a> property
-<ins>of</ins> <ins>the</ins> <ins>elements</ins> <ins>and</ins> <ins>all</ins> <ins>its</ins> <ins>ancestors</ins> is 'auto'.
+<ins>of</ins> <ins>the</ins> <ins>element</ins> <ins>and</ins> <ins>all</ins> <ins>its</ins> <ins>ancestors</ins> is 'auto'.
 </ul>
 
 <p>If the above doesn't provide enough break points to keep content

css2/diffs-wd/propidx.html

@@ -568,10 +568,10 @@ <H1><a name="q0">Appendix F. Full property table</a></H1>
 <tr><td><a href="page.html#propdef-page-break-inside"><span class="propinst-page-break-inside xref">'page-break-inside'</span></a>
 <td>avoid | auto | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <td>auto
-<td>block-level elements
-<td> <del>yes</del><ins>no</ins>
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>, <a href="media.html#paged-media-group">paged</a>
+<td>block-level elements  <del>yes</del> <del>&nbsp;</del> <del>visual</del> <del>,</del><ins>(but</ins> <ins>see</ins> <ins>text)</ins>   <ins>no</ins>
+<td><ins>N/A</ins>
+<td><ins>visual,</ins> paged
+<td><ins>as</ins> <ins>specified</ins>
 
 <tr><td><a href="aural.html#propdef-pause-after"><span class="propinst-pause-after xref">'pause-after'</span></a>
 <td><a href="aural.html#value-def-time" class="noxref"><span class="value-inst-time">&lt;time&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>

css2/diffs-wd/visudet.html

@@ -1369,7 +1369,13 @@ <h2>10.7 <a name="min-max-heights">Minimum and maximum heights</a>: <a href="vis
 </ol>
 
 <p class="note">These steps do not affect the real computed values of
-the above properties.</p>
+the above properties. <ins>The</ins> <ins>change</ins> <ins>of</ins> <ins>used</ins> <a href="visudet.html#propdef-height" class="noxref"><span
+class="propinst-height"><ins>'height'</ins></span></a> <ins>has</ins> <ins>no</ins> <ins>effect</ins> <ins>on</ins> <ins>margin</ins>
+<ins>collapsing</ins> <ins>except</ins> <ins>as</ins> <ins>specifically</ins> <ins>required</ins> <ins>by</ins> <ins>rules</ins> <ins>for</ins> <a href="visudet.html#propdef-min-height" class="noxref"><span
+class="propinst-min-height"><ins>'min-height'</ins></span></a> <ins>or</ins> <a href="visudet.html#propdef-max-height" class="noxref"><span
+class="propinst-max-height"><ins>'max-height'</ins></span></a> <ins>in</ins> <a
+href="box.html#collapsing-margins"><ins>"Collapsing</ins> <ins>margins"</ins>
+<ins>(8.3.1).</ins></a></p>
 
 <p>However, for replaced elements with both <a href="visudet.html#propdef-width" class="noxref"><span
 class="propinst-width">'width'</span></a> and <a href="visudet.html#propdef-height" class="noxref"><span