Skip to content

Commit 12a9a9d

Browse files
bert-githubbert-github
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402881
1 parent dbabd6c commit 12a9a9d

27 files changed

Lines changed: 2844 additions & 2295 deletions

‎css2/box.html‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -441,17 +441,9 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
441441
top border, no top padding, and the child has no <a
442442
href="visuren.html#clearance">clearance.</a></p>
443443

444-
<p>The bottom margin of an in-flow block-level element is adjoining to
445-
its last in-flow block-level child's bottom margin when:
446-
<ul>
447-
<li>the element's specified 'height' is 'auto',
448-
449-
<li>the element's used height is the same as it would have been if the
450-
specified values of 'min-height' and 'max-height' were their initial
451-
values
452-
453-
<li>the element has no bottom padding or border.
454-
</ul>
444+
<p>The bottom margin of an in-flow block-level element with a 'height'
445+
of 'auto' is adjoining to its last in-flow block-level child's bottom
446+
margin if the element has no bottom padding or border.
455447

456448
<p>An element's own margins are adjoining if the <a href="visudet.html#propdef-min-height" class="noxref"><span
457449
class="propinst-min-height">'min-height'</span></a> property is zero, and

‎css2/changes.html‎

Lines changed: 256 additions & 95 deletions
Large diffs are not rendered by default.

‎css2/cover.html‎

Lines changed: 54 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,8 @@ <h2><a name="toc">Full Table of Contents</a></h2>
612612
<ul class="toc">
613613
<li class="tocline3"><a href="page.html#page-margins" class="tocxref">13.2.1 Page margins</a>
614614
<ul class="toc">
615-
<li class="tocline4"><a href="page.html#oversized-page-box" class="tocxref">13.2.1.1 Rendering page boxes that do not fit a target sheet</a>
616-
<li class="tocline4"><a href="page.html#positioning-page-box" class="tocxref">13.2.1.2 Positioning the page box on the sheet</a>
615+
<li class="tocline4"><a href="page.html#oversized-page-box" class="tocxref">13.2.1.1 [This section intentionally left blank]</a>
616+
<li class="tocline4"><a href="page.html#positioning-page-box" class="tocxref">13.2.1.2 [This section intentionally left blank]</a>
617617
</ul>
618618
<li class="tocline3"><a href="page.html#page-selectors" class="tocxref">13.2.2 Page selectors: selecting left, right, and first pages</a>
619619
<li class="tocline3"><a href="page.html#outside-page-box" class="tocxref">13.2.3 Content outside the page box</a>
@@ -1084,50 +1084,59 @@ <h2><a name="toc">Full Table of Contents</a></h2>
10841084
<li class="tocline3"><a href="changes.html#q317" class="tocxref">C.6.26 Section&nbsp;9.3.2 Box offsets: 'top', 'right', 'bottom', 'left'</a>
10851085
<li class="tocline3"><a href="changes.html#q318" class="tocxref">C.6.27 Section&nbsp;9.5 Floats</a>
10861086
<li class="tocline3"><a href="changes.html#q319" class="tocxref">C.6.28 Section&nbsp;9.5 Floats</a>
1087-
<li class="tocline3"><a href="changes.html#q320" class="tocxref">C.6.29 Section&nbsp;9.6.1 Fixed positioning</a>
1088-
<li class="tocline3"><a href="changes.html#q321" class="tocxref">C.6.30 Section&nbsp;9.9.1 Specifying the stack level: the 'z-index' property</a>
1089-
<li class="tocline3"><a href="changes.html#q322" class="tocxref">C.6.31 Section 10.3.2 Inline, replaced elements</a>
1090-
<li class="tocline3"><a href="changes.html#q323" class="tocxref">C.6.32 Section 10.3.2 Inline, replaced elements</a>
1091-
<li class="tocline3"><a href="changes.html#q324" class="tocxref">C.6.33 Section&nbsp;10.3.3 Block-level, non-replaced elements in normal flow</a>
1092-
<li class="tocline3"><a href="changes.html#q325" class="tocxref">C.6.34 Section&nbsp;10.3.7 Absolutely positioned, non-replaced elements</a>
1093-
<li class="tocline3"><a href="changes.html#q326" class="tocxref">C.6.35 Section&nbsp;10.3.7 Absolutely positioned, non-replaced elements</a>
1094-
<li class="tocline3"><a href="changes.html#q327" class="tocxref">C.6.36 Section&nbsp;10.3.8 Absolutely positioned, replaced elements</a>
1095-
<li class="tocline3"><a href="changes.html#q328" class="tocxref">C.6.37 Section&nbsp;10.3.8 Absolutely positioned, replaced elements</a>
1087+
<li class="tocline3"><a href="changes.html#q320" class="tocxref">C.6.29 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
1088+
<li class="tocline3"><a href="changes.html#q321" class="tocxref">C.6.30 Section&nbsp;9.6.1 Fixed positioning</a>
1089+
<li class="tocline3"><a href="changes.html#q322" class="tocxref">C.6.31 Section&nbsp;9.9.1 Specifying the stack level: the 'z-index' property</a>
1090+
<li class="tocline3"><a href="changes.html#q323" class="tocxref">C.6.32 Section&nbsp;10.1 Definition of "containing block"</a>
1091+
<li class="tocline3"><a href="changes.html#q324" class="tocxref">C.6.33 Section 10.3.2 Inline, replaced elements</a>
1092+
<li class="tocline3"><a href="changes.html#q325" class="tocxref">C.6.34 Section 10.3.2 Inline, replaced elements</a>
1093+
<li class="tocline3"><a href="changes.html#q326" class="tocxref">C.6.35 Section&nbsp;10.3.3 Block-level, non-replaced elements in normal flow</a>
1094+
<li class="tocline3"><a href="changes.html#q327" class="tocxref">C.6.36 Section&nbsp;10.3.7 Absolutely positioned, non-replaced elements</a>
1095+
<li class="tocline3"><a href="changes.html#q328" class="tocxref">C.6.37 Section&nbsp;10.3.7 Absolutely positioned, non-replaced elements</a>
10961096
<li class="tocline3"><a href="changes.html#q329" class="tocxref">C.6.38 Section&nbsp;10.3.8 Absolutely positioned, replaced elements</a>
1097-
<li class="tocline3"><a href="changes.html#q330" class="tocxref">C.6.39 Section&nbsp;10.5 Content height: the 'height' property</a>
1098-
<li class="tocline3"><a href="changes.html#q331" class="tocxref">C.6.40 Section 10.6.2 Inline replaced elements [&hellip;]</a>
1099-
<li class="tocline3"><a href="changes.html#q332" class="tocxref">C.6.41 Section&nbsp;10.6.4 Absolutely positioned, non-replaced elements</a>
1100-
<li class="tocline3"><a href="changes.html#q333" class="tocxref">C.6.42 Section&nbsp;10.6.5 Absolutely positioned, replaced elements</a>
1101-
<li class="tocline3"><a href="changes.html#q334" class="tocxref">C.6.43 Section 10.8.1 Leading and half-leading</a>
1102-
<li class="tocline3"><a href="changes.html#q335" class="tocxref">C.6.44 Section&nbsp;11.1.1 Overflow: the 'overflow' property</a>
1103-
<li class="tocline3"><a href="changes.html#q336" class="tocxref">C.6.45 Section&nbsp;11.1.2 Clipping: the 'clip' property</a>
1104-
<li class="tocline3"><a href="changes.html#q337" class="tocxref">C.6.46 Section&nbsp;12.4.2 Counter styles</a>
1105-
<li class="tocline3"><a href="changes.html#q338" class="tocxref">C.6.47 Section&nbsp;12.5 Lists</a>
1106-
<li class="tocline3"><a href="changes.html#q339" class="tocxref">C.6.48 Section&nbsp;12.5.1 Lists: the 'list-style-type', 'list-style-image', 'list-style-position', and 'list-style' properties</a>
1107-
<li class="tocline3"><a href="changes.html#q340" class="tocxref">C.6.49 Section&nbsp;12.5.1 Lists: the 'list-style-type', 'list-style-image', 'list-style-position', and 'list-style' properties</a>
1108-
<li class="tocline3"><a href="changes.html#q341" class="tocxref">C.6.50 Section&nbsp;13.2.3 Content outside the page box</a>
1109-
<li class="tocline3"><a href="changes.html#q342" class="tocxref">C.6.51 Section&nbsp;13.3.1 Page break properties: 'page-break-before', 'page-break-after', 'page-break-inside'</a>
1110-
<li class="tocline3"><a href="changes.html#q343" class="tocxref">C.6.52 Section&nbsp;13.3.1 Page break properties: 'page-break-before', 'page-break-after', 'page-break-inside'</a>
1111-
<li class="tocline3"><a href="changes.html#q344" class="tocxref">C.6.53 Section&nbsp;13.3.3 Allowed page breaks</a>
1112-
<li class="tocline3"><a href="changes.html#q345" class="tocxref">C.6.54 Section&nbsp;14.2 The background</a>
1113-
<li class="tocline3"><a href="changes.html#q346" class="tocxref">C.6.55 Section&nbsp;13.2 Page boxes: the @page rule</a>
1114-
<li class="tocline3"><a href="changes.html#q347" class="tocxref">C.6.56 Section 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
1115-
<li class="tocline3"><a href="changes.html#q348" class="tocxref">C.6.57 Section&nbsp;15.6 Font boldness: the 'font-weight' property</a>
1116-
<li class="tocline3"><a href="changes.html#q349" class="tocxref">C.6.58 Section&nbsp;16.6 Whitespace: the 'white-space' property</a>
1117-
<li class="tocline3"><a href="changes.html#q350" class="tocxref">C.6.59 Section 17.2.1 Anonymous table objects</a>
1118-
<li class="tocline3"><a href="changes.html#q351" class="tocxref">C.6.60 Section 17.2.1 Anonymous table objects</a>
1119-
<li class="tocline3"><a href="changes.html#q352" class="tocxref">C.6.61 Section&nbsp;17.5.4 Horizontal alignment in a column</a>
1120-
<li class="tocline3"><a href="changes.html#q353" class="tocxref">C.6.62 Section&nbsp;18.1 Cursors: the 'cursor' property</a>
1121-
<li class="tocline3"><a href="changes.html#q354" class="tocxref">C.6.63 Section B.2 Informative references</a>
1122-
<li class="tocline3"><a href="changes.html#q355" class="tocxref">C.6.64 Appendix&nbsp;D. Default style sheet for HTML 4</a>
1123-
<li class="tocline3"><a href="changes.html#q356" class="tocxref">C.6.65 Appendix&nbsp;D. Default style sheet for HTML 4</a>
1124-
<li class="tocline3"><a href="changes.html#q357" class="tocxref">C.6.66 Section E.2 Painting order</a>
1125-
<li class="tocline3"><a href="changes.html#q358" class="tocxref">C.6.67 Appendix G. Grammar of CSS 2.1</a>
1126-
<li class="tocline3"><a href="changes.html#q359" class="tocxref">C.6.68 Section G.2 Lexical scanner</a>
1127-
<li class="tocline3"><a href="changes.html#q360" class="tocxref">C.6.69 Section G.2 Lexical scanner</a>
1128-
<li class="tocline3"><a href="changes.html#q361" class="tocxref">C.6.70 Section&nbsp;G2 Lexical scanner</a>
1129-
<li class="tocline3"><a href="changes.html#q362" class="tocxref">C.6.71 Section&nbsp;G.2 Lexical scanner</a>
1130-
<li class="tocline3"><a href="changes.html#q363" class="tocxref">C.6.72 Appendix&nbsp;I. Index</a>
1097+
<li class="tocline3"><a href="changes.html#q330" class="tocxref">C.6.39 Section&nbsp;10.3.8 Absolutely positioned, replaced elements</a>
1098+
<li class="tocline3"><a href="changes.html#q331" class="tocxref">C.6.40 Section&nbsp;10.3.8 Absolutely positioned, replaced elements</a>
1099+
<li class="tocline3"><a href="changes.html#q332" class="tocxref">C.6.41 Section&nbsp;10.5 Content height: the 'height' property</a>
1100+
<li class="tocline3"><a href="changes.html#q333" class="tocxref">C.6.42 Section 10.6.2 Inline replaced elements [&hellip;]</a>
1101+
<li class="tocline3"><a href="changes.html#q334" class="tocxref">C.6.43 Section&nbsp;10.6.4 Absolutely positioned, non-replaced elements</a>
1102+
<li class="tocline3"><a href="changes.html#q335" class="tocxref">C.6.44 Section&nbsp;10.6.5 Absolutely positioned, replaced elements</a>
1103+
<li class="tocline3"><a href="changes.html#q336" class="tocxref">C.6.45 Section 10.8.1 Leading and half-leading</a>
1104+
<li class="tocline3"><a href="changes.html#q337" class="tocxref">C.6.46 Section&nbsp;11.1.1 Overflow: the 'overflow' property</a>
1105+
<li class="tocline3"><a href="changes.html#q338" class="tocxref">C.6.47 Section&nbsp;11.1.2 Clipping: the 'clip' property</a>
1106+
<li class="tocline3"><a href="changes.html#q339" class="tocxref">C.6.48 Section&nbsp;12.4.2 Counter styles</a>
1107+
<li class="tocline3"><a href="changes.html#q340" class="tocxref">C.6.49 Section&nbsp;12.5 Lists</a>
1108+
<li class="tocline3"><a href="changes.html#q341" class="tocxref">C.6.50 Section&nbsp;12.5.1 Lists: the 'list-style-type', 'list-style-image', 'list-style-position', and 'list-style' properties</a>
1109+
<li class="tocline3"><a href="changes.html#q342" class="tocxref">C.6.51 Section&nbsp;12.5.1 Lists: the 'list-style-type', 'list-style-image', 'list-style-position', and 'list-style' properties</a>
1110+
<li class="tocline3"><a href="changes.html#q343" class="tocxref">C.6.52 Section&nbsp;13.2.1.1 Rendering page boxes that do not fit a target sheet</a>
1111+
<li class="tocline3"><a href="changes.html#q344" class="tocxref">C.6.53 Section&nbsp;13.2.3 Content outside the page box</a>
1112+
<li class="tocline3"><a href="changes.html#q345" class="tocxref">C.6.54 Section&nbsp;13.3.1 Page break properties: 'page-break-before', 'page-break-after', 'page-break-inside'</a>
1113+
<li class="tocline3"><a href="changes.html#q346" class="tocxref">C.6.55 Section&nbsp;13.3.1 Page break properties: 'page-break-before', 'page-break-after', 'page-break-inside'</a>
1114+
<li class="tocline3"><a href="changes.html#q347" class="tocxref">C.6.56 Section&nbsp;13.3.2 Breaks inside elements: 'orphans', 'widows'</a>
1115+
<li class="tocline3"><a href="changes.html#q348" class="tocxref">C.6.57 Section&nbsp;13.3.3 Allowed page breaks</a>
1116+
<li class="tocline3"><a href="changes.html#q349" class="tocxref">C.6.58 Section&nbsp;13.3.3 Allowed page breaks</a>
1117+
<li class="tocline3"><a href="changes.html#q350" class="tocxref">C.6.59 Section&nbsp;13.3.3 Allowed page breaks</a>
1118+
<li class="tocline3"><a href="changes.html#q351" class="tocxref">C.6.60 Section&nbsp;13.3.5 "Best" page breaks</a>
1119+
<li class="tocline3"><a href="changes.html#q352" class="tocxref">C.6.61 Section&nbsp;14.2 The background</a>
1120+
<li class="tocline3"><a href="changes.html#q353" class="tocxref">C.6.62 Section&nbsp;13.2 Page boxes: the @page rule</a>
1121+
<li class="tocline3"><a href="changes.html#q354" class="tocxref">C.6.63 Section 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
1122+
<li class="tocline3"><a href="changes.html#q355" class="tocxref">C.6.64 Section&nbsp;15.6 Font boldness: the 'font-weight' property</a>
1123+
<li class="tocline3"><a href="changes.html#q356" class="tocxref">C.6.65 Section&nbsp;16.6 Whitespace: the 'white-space' property</a>
1124+
<li class="tocline3"><a href="changes.html#q357" class="tocxref">C.6.66 Section&nbsp;16.6.1 The 'white-space' processing model</a>
1125+
<li class="tocline3"><a href="changes.html#q358" class="tocxref">C.6.67 Section 17.2.1 Anonymous table objects</a>
1126+
<li class="tocline3"><a href="changes.html#q359" class="tocxref">C.6.68 Section 17.2.1 Anonymous table objects</a>
1127+
<li class="tocline3"><a href="changes.html#q360" class="tocxref">C.6.69 Section&nbsp;17.4 Tables in the visual formatting model</a>
1128+
<li class="tocline3"><a href="changes.html#q361" class="tocxref">C.6.70 Section&nbsp;17.5.4 Horizontal alignment in a column</a>
1129+
<li class="tocline3"><a href="changes.html#q362" class="tocxref">C.6.71 Section&nbsp;18.1 Cursors: the 'cursor' property</a>
1130+
<li class="tocline3"><a href="changes.html#q363" class="tocxref">C.6.72 Section B.2 Informative references</a>
1131+
<li class="tocline3"><a href="changes.html#q364" class="tocxref">C.6.73 Appendix&nbsp;D. Default style sheet for HTML 4</a>
1132+
<li class="tocline3"><a href="changes.html#q365" class="tocxref">C.6.74 Appendix&nbsp;D. Default style sheet for HTML 4</a>
1133+
<li class="tocline3"><a href="changes.html#q366" class="tocxref">C.6.75 Section E.2 Painting order</a>
1134+
<li class="tocline3"><a href="changes.html#q367" class="tocxref">C.6.76 Appendix G. Grammar of CSS 2.1</a>
1135+
<li class="tocline3"><a href="changes.html#q368" class="tocxref">C.6.77 Section G.2 Lexical scanner</a>
1136+
<li class="tocline3"><a href="changes.html#q369" class="tocxref">C.6.78 Section G.2 Lexical scanner</a>
1137+
<li class="tocline3"><a href="changes.html#q370" class="tocxref">C.6.79 Section&nbsp;G2 Lexical scanner</a>
1138+
<li class="tocline3"><a href="changes.html#q371" class="tocxref">C.6.80 Section&nbsp;G.2 Lexical scanner</a>
1139+
<li class="tocline3"><a href="changes.html#q372" class="tocxref">C.6.81 Appendix&nbsp;I. Index</a>
11311140
</ul>
11321141
</ul>
11331142
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>

‎css2/diffs-rec/box.html‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -441,17 +441,9 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
441441
<ins>top</ins> <ins>border,</ins> <ins>no</ins> <ins>top</ins> <ins>padding,</ins> <ins>and</ins> <ins>the</ins> <ins>child</ins> <ins>has</ins> <ins>no</ins> <a
442442
href="visuren.html#clearance"><ins>clearance.</ins></a></p>
443443

444-
<p><ins>The</ins> <ins>bottom</ins> <ins>margin</ins> <ins>of</ins> <ins>an</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>element</ins> <ins>is</ins> <ins>adjoining</ins> <ins>to</ins>
445-
<ins>its</ins> <ins>last</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>child's</ins> <ins>bottom</ins> <ins>margin</ins> <ins>when:</ins>
446-
<ul>
447-
<li><ins>the</ins> <ins>element's</ins> <ins>specified</ins> <ins>'height'</ins> <ins>is</ins> <ins>'auto',</ins>
448-
449-
<li><ins>the</ins> <ins>element's</ins> <ins>used</ins> <ins>height</ins> <ins>is</ins> <ins>the</ins> <ins>same</ins> <ins>as</ins> <ins>it</ins> <ins>would</ins> <ins>have</ins> <ins>been</ins> <ins>if</ins> <ins>the</ins>
450-
<ins>specified</ins> <ins>values</ins> <ins>of</ins> <ins>'min-height'</ins> <ins>and</ins> <ins>'max-height'</ins> <ins>were</ins> <ins>their</ins> <ins>initial</ins>
451-
<ins>values</ins>
452-
453-
<li><ins>the</ins> <ins>element</ins> <ins>has</ins> <ins>no</ins> <ins>bottom</ins> <ins>padding</ins> <ins>or</ins> <ins>border.</ins>
454-
</ul>
444+
<p><ins>The</ins> <ins>bottom</ins> <ins>margin</ins> <ins>of</ins> <ins>an</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>element</ins> <ins>with</ins> <ins>a</ins> <ins>'height'</ins>
445+
<ins>of</ins> <ins>'auto'</ins> <ins>is</ins> <ins>adjoining</ins> <ins>to</ins> <ins>its</ins> <ins>last</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>child's</ins> <ins>bottom</ins>
446+
<ins>margin</ins> <ins>if</ins> <ins>the</ins> <ins>element</ins> <ins>has</ins> <ins>no</ins> <ins>bottom</ins> <ins>padding</ins> <ins>or</ins> <ins>border.</ins>
455447

456448
<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
457449
class="propinst-min-height"><ins>'min-height'</ins></span></a> <ins>property</ins> <ins>is</ins> <ins>zero,</ins> <ins>and</ins>

0 commit comments

Comments
 (0)