[css2] Generated. Do not edit!

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

Author: bert-github

css2/changes.html

@@ -7202,14 +7202,25 @@ <h3 id=u.10.8.1><a name="q506">C.8.12 </a><a
 </blockquote>
 
 <p>Also, to make sure there always is a box whose height is
-'line-height', removed a phrase earlier in the same section:
+'line-height', a phrase earlier in the same section was removed:
 
 <blockquote>
 <p>User agent must align the glyphs in a non-replaced inline box to
 each other by their relevant baselines<del>, and to nested inline
 boxes according to 'vertical-align'</del>.
 </blockquote>
 
+<p>And another modified:
+
+<blockquote>
+<p>The height of the inline box <del>is then the smallest such that it
+encloses all glyphs and their leading, as well as all nested inline
+boxes.</del> <ins>encloses all glyphs and their leading and is thus
+exactly 'line-height'. Boxes of child elements do not influence this
+height.</ins>
+</blockquote>
+
+
 <hr class="navbar">
 
 <div class="navbar">

css2/diffs-rec/changes.html

@@ -92,7 +92,7 @@ <H1><a name="q0">Appendix  <del>B.</del><ins>C.</ins> Changes</a></H1>
       <li class="tocline3"><a href="changes.html#q61" class="tocxref"><ins>C.2.54 Section 9.7 Relationships between 'display', 'position',</ins> and  <del>visibility in the visual</del><ins>'float'</ins></a>
       <li class="tocline3"><a href="changes.html#q62" class="tocxref"><ins>C.2.55 Section 9.9 Layered presentation</ins></a>
       <li class="tocline3"><a href="changes.html#q63" class="tocxref"><ins>C.2.56 Section 9.10 Text direction</ins></a>
-      <li class="tocline3"><a href="changes.html#q64" class="tocxref"><ins>C.2.57 Chapter 10 Visual formatting model details</ins></a>
+      <li class="tocline3"><a href="changes.html#q64" class="tocxref"><ins>C.2.57 Chapter 10 Visual</ins> formatting  <del>model.</del><ins>model details</ins></a>
       <li class="tocline3"><a href="changes.html#q65" class="tocxref"><ins>C.2.58 Section 10.1 Definition of "containing block"</ins></a>
       <li class="tocline3"><a href="changes.html#q66" class="tocxref"><ins>C.2.59 Section 10.2 Content width</ins></a>
       <li class="tocline3"><a href="changes.html#q67" class="tocxref"><ins>C.2.60 Section 10.3 Calculating widths and margins</ins></a>
@@ -6792,7 +6792,7 @@ <h3 id="t.17.4a"><a name="q486"><ins>C.7.97</ins> </a><a
 <p><ins>The</ins> <del><ins>anonymous</ins></del> <ins><ins>table wrapper</ins> box is a 'block'
 box if the table is block-level, and an 'inline-block' box if the
 table is inline-level. The</ins> <del><ins>anonymous</ins></del> <ins><ins>table wrapper</ins>
-box establishes a block</ins> formatting  <del>model.</del><ins>context. The table box (not the</ins>
+box establishes a block formatting context. The table box (not the</ins>
 <del><ins>anonymous</ins></del> <ins><ins>table wrapper</ins> box) is used when doing
 baseline vertical alignment for an 'inline-table'. The width of the</ins>
 <del><ins>anonymous</ins></del> <ins><ins>table wrapper</ins> box is the border-edge
@@ -6968,7 +6968,7 @@ <h3 id=u.8.3.1><a name="q495"><ins>C.8.1</ins> </a><a
 href="/TR/2010/WD-CSS2-20101207/box.html#collapsing-margins"><ins>8.3.1
 Collapsing margins</ins></a></h3>
 
-<p><ins>The section is completely rewritten to make the normative text
+<p>The  <del>ability</del><ins>section is completely rewritten</ins> to  <del>specify</del><ins>make the normative text
 shorter and clearer.</ins>
 
 
@@ -6977,8 +6977,8 @@ <h3 id=u.10.8.1><a name="q496"><ins>C.8.2</ins> </a><a
 href="/TR/2010/WD-CSS2-20101207/visudet.html#leading"><ins>10.8.1 Leading
 and half-leading</ins></a></h3>
 
-<p>The  <del>ability</del><ins>remark about equal line spacing is made more precise and put in
-green,</ins> to  <del>specify</del><ins>make it clearer that it is a note:</ins>
+<p><ins>The remark about equal line spacing is made more precise and put in
+green, to make it clearer that it is a note:</ins>
 
 <blockquote>
 <p class=note><em><del><ins>Generally,</ins></del>
@@ -7080,40 +7080,40 @@ <h3 id=u.10.1><a name="q502"><ins>C.8.8</ins> </a><a
 href="/TR/2010/WD-CSS2-20101207/visudet.html#containing-block-details"><ins>10.1
 Definition of "containing block"</ins></a></h3>
 
-<p>In <ins>CSS&nbsp;2.1, it is undefined what</ins> the  <del>visual formatting model.</del><ins>containing block of</ins> an
- <del>extended selector mechanism, including child selectors, adjacent selectors, and attribute selectors. Generated content , counters and automatic numbering ,</del><ins>absolutely positioned element is, if its nearest positioned ancestor
-is inline</ins> and  <del>markers . Text shadows, through</del><ins>split over multiple lines:</ins>
+<p><ins>In CSS&nbsp;2.1, it is undefined what the containing block of an
+absolutely positioned element is, if its nearest positioned ancestor
+is inline and split over multiple lines:</ins>
 
 <blockquote>
-<ins>4. If</ins> the  <del>new 'text-shadow' property. Several new pseudo-classes</del><ins>element has 'position: absolute', the containing block is</ins>
+<ins>4. If the element has 'position: absolute', the containing block is</ins>
 <del><ins>established by</ins></del> <ins><ins>the padding edge of</ins> the nearest
-ancestor with a 'position' of 'absolute', 'relative' or 'fixed'</ins><del>,
- <del>:first-child, :hover, :focus, :lang. System colors and fonts . Cursors . Dynamic outlines</del><ins>in the following way:</ins></del><ins>.</ins>
+ancestor with a 'position' of 'absolute', 'relative' or 'fixed'</ins><del><ins>,
+in the following way:</ins></del><ins><ins>.</ins></ins>
 <ol>
-  <li><del> <del>B.2 Updated descriptions</del><ins>In</ins> the  <del>CSS1 specification was short and concise. This specification</del><ins>case that the ancestor</ins> is  <del>much more voluminous and more readable. Much</del><ins>an inline box, the
-  containing block depends on the 'direction' property</ins> of the
-   <del>additional content describes new functionality, but</del><ins>ancestor:</ins></del>
+  <li><del>In the  <del>visual formatting model.</del><ins>case that the ancestor is</ins> an  <del>extended selector mechanism, including child selectors, adjacent selectors, and attribute selectors. Generated content , counters</del><ins>inline box, the
+  containing block depends on the 'direction' property of the
+  ancestor:</ins></del>
   <ol>
-    <li><del><ins>If</ins> the  <del>description</del><ins>'direction' is 'ltr', the top and left</ins> of  <del>CSS1 features has also been extended. Except in a few cases described below,</del>the
-     <del>rewritten descriptions do not indicate a change in syntax nor semantics. B.3 Semantic changes from CSS1 While all CSS1 style sheets</del><ins>containing block</ins> are  <del>valid CSS2 style sheets, there</del><ins>the top and left padding edges of the first
-    box generated by the ancestor, and the bottom and right</ins> are  <del>a few cases where</del>the
-     <del>CSS1 style sheet will have a different meaning when interpreted as a CSS2 style sheet. Most changes</del><ins>bottom and right padding edges of the last box of the
-    ancestor.</ins></del>
+    <li><del><ins>If the 'direction' is 'ltr', the top</ins> and  <del>automatic numbering ,</del><ins>left of the
+    containing block are the top</ins> and  <del>markers . Text shadows, through</del><ins>left padding edges of</ins> the  <del>new 'text-shadow' property. Several new pseudo-classes , :first-child, :hover, :focus, :lang. System colors</del><ins>first
+    box generated by the ancestor,</ins> and  <del>fonts . Cursors . Dynamic outlines . B.2 Updated descriptions</del>the  <del>CSS1 specification was short</del><ins>bottom</ins> and  <del>concise. This specification is much more voluminous</del><ins>right are the
+    bottom</ins> and  <del>more readable. Much</del><ins>right padding edges</ins> of the  <del>additional content describes new functionality, but the description</del><ins>last box</ins> of  <del>CSS1 features has also been extended. Except in a few cases described below,</del>the
+     <del>rewritten descriptions do not indicate a change in syntax nor semantics. B.3 Semantic changes from CSS1 While all CSS1 style sheets are valid CSS2 style sheets, there are a few cases where</del><ins>ancestor.</ins></del>
 
-    <li><del><ins>If the 'direction' is 'rtl', the top and right</ins> are  <del>due to implementation experience feeding back into</del>the
+    <li><del><ins>If</ins> the  <del>CSS1 style sheet will have a different meaning when interpreted as a CSS2 style sheet. Most changes</del><ins>'direction' is 'rtl', the top and right</ins> are  <del>due to implementation experience feeding back into</del>the
      <del>specification, but there</del><ins>top and right padding edges of the first box generated by the
     ancestor, and the bottom and left</ins> are  <del>also some error corrections.</del>the  <del>meaning</del><ins>bottom and left padding
     edges</ins> of  <del>"!important" has been changed. In CSS1, "!important" in an author's style sheet took precedence over one in a user style sheet.</del><ins>the last box of the ancestor.</ins></del>
   </ol>
   <p><del><ins>Note:</ins> This  <del>has been reversed in CSS2. In CSS2 color values are clipped with regard to</del><ins>may cause</ins> the  <del>device gamut, not with regard</del><ins>containing block's width</ins> to <ins>be
   negative.</ins></del>
 
-  <li><del><ins>Otherwise,</ins> the  <del>sRGB gamut as in CSS1. CSS1 simply said that 'margin-right' was ignored</del><ins>containing block is formed by the padding edge of
+  <li><del><ins>Otherwise,</ins> the  <del>sRGB gamut as</del><ins>containing block is formed by the padding edge of
   the ancestor.</ins></del>
 </ol>
 
 <p><ins>If there is no such ancestor, the containing block is the initial
-containing block. <ins>In CSS&nbsp;2.1,</ins> if <ins>that nearest ancestor is
+containing block. In  <del>CSS1. CSS1 simply said that 'margin-right' was ignored</del><ins>CSS&nbsp;2.1,</ins> if <ins>that nearest ancestor is
 an inline-level element that splits across multiple lines,</ins> the
  <del>both 'margin-left'</del><ins>containing block is undefined.</ins></ins>
 </blockquote>
@@ -7124,8 +7124,8 @@ <h3 id=u.13.2.2><a name="q503"><ins>C.8.9</ins> </a><a
 href="/TR/2010/WD-CSS2-20101207/page.html#page-selectors"><ins>13.2.2 Page
 selectors: selecting left, right,</ins> and  <del>'width' were set. In CSS2</del><ins>first pages</ins></a></h3>
 
-<p><ins>CSS&nbsp;2.1 does not define if ':first' applies to</ins> the  <del>choice between relaxing 'margin-right'</del><ins>first page</ins> or
- <del>'margin-left' depends on</del>the  <del>writing direction.</del><ins>first non-blank page:</ins>
+<p><ins>CSS&nbsp;2.1 does not define if ':first' applies to</ins> the  <del>choice between relaxing 'margin-right' or 'margin-left' depends on</del><ins>first page or</ins>
+the  <del>writing direction.</del><ins>first non-blank page:</ins>
 
 <blockquote>
 <p><ins><ins>If a forced break occurs before the first generated box, it is
@@ -7202,14 +7202,25 @@ <h3 id=u.10.8.1><a name="q506"><ins>C.8.12</ins> </a><a
 </blockquote>
 
 <p><ins>Also, to make sure there always is a box whose height is
-'line-height', removed a phrase earlier in the same section:</ins>
+'line-height', a phrase earlier in the same section was removed:</ins>
 
 <blockquote>
 <p><ins>User agent must align the glyphs in a non-replaced inline box to
 each other by their relevant baselines</ins><del><ins>,</ins> and  <del>CSS2 tokenizer</del><ins>to nested inline
 boxes according to 'vertical-align'</ins></del>.
 </blockquote>
 
+<p><ins>And another modified:</ins>
+
+<blockquote>
+<p><ins>The height of the inline box</ins> <del><ins>is then the smallest such that it
+encloses all glyphs and their leading, as well as all nested inline
+boxes.</ins></del> <ins><ins>encloses all glyphs and their leading and is thus
+exactly 'line-height'. Boxes of child elements do not influence this
+height.</ins></ins>
+</blockquote>
+
+
 <hr class="navbar">
 
 <div class="navbar">