[css2] Removed <del>/<ins> tags. Added that baseline of inline-block "should"

bert-github · bert-github · commit 233cc4b8434e · 2003-06-09T18:24:47.000Z
be the baseline of the last line.

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402104
diff --git a/css2/visudet.src b/css2/visudet.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: visudet.src,v 2.67 2003-06-09 16:51:07 bbos Exp $ -->
+<!-- $Id: visudet.src,v 2.68 2003-06-09 18:24:47 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Visual formatting model details</TITLE>
@@ -220,10 +220,9 @@ distinguished:</p>
       <li>'inline-block', replaced elements in normal flow
     </ol>
 
-<P><del>Points 1-6 and 9-10 include relative positioning.</del>
-<ins>For Points 1-6 and 9-10, the computed values of 'left' and
+<P>For Points 1-6 and 9-10, the computed values of 'left' and
 'right' are determined by the rules in <a
-href="visuren.html#relative-positioning">section 9.4.3.</a></ins>
+href="visuren.html#relative-positioning">section 9.4.3.</a>
 
 <h3>Inline, non-replaced elements</h3>
 
@@ -237,9 +236,7 @@ value of '0'.
 
 <h3><a name="inline-replaced-width">Inline, replaced elements</a></h3>
 
-<p>A specified value of 'auto' for <del><span
-class="propinst-left">'left'</span>, <span
-class="propinst-right">'right'</span>,</del> <span
+<p>A specified value of 'auto' for <span
 class="propinst-margin-left">'margin-left'</span> or <span
 class="propinst-margin-right">'margin-right'</span> becomes a computed
 value of '0'. If <span class="propinst-width">'width'</span> has a
@@ -260,9 +257,7 @@ class="propinst-width">'width'</span> is:
 
 <h3>Block-level, non-replaced elements in normal flow</h3>
 
-<p><del>If <span class="propinst-left">'left'</span> or <span
-class="propinst-right">'right'</span> are given as 'auto', their
-computed value is 0.</del> The following <a
+<p>The following <a
 name="width-constraints">constraints</a> must hold between the
 computed values of the other
 properties:</p>
@@ -302,9 +297,7 @@ to the edges of the containing block.
 
 <h3>Block-level, replaced elements in normal flow</h3>
 
-<p><del>If <span class="propinst-left">'left'</span> or <span
-class="propinst-right">'right'</span> are 'auto', their computed value
-is 0.</del> The computed value of 
+<p>The computed value of 
 <span class="propinst-width">'width'</span> is determined
 as for <a href="#inline-replaced-width">inline replaced 
 elements</a>.
@@ -314,8 +307,7 @@ both margins are 'auto', their computed values are equal.
 
 <h3>Floating, non-replaced elements</h3>
 
-<p>If <del><span class="propinst-left">'left'</span>, <span
-class="propinst-right">'right'</span>,</del> <span
+<p>If <span
 class="propinst-margin-left">'margin-left'</span>, or <span
 class="propinst-margin-right">'margin-right'</span> are specified as
 'auto', their computed value is '0'.
@@ -331,19 +323,16 @@ where explicit line breaks occur, and also calculate the preferred
 <em>minimum</em> width, e.g., by trying all possible line breaks.
 CSS&nbsp;2.1 does not define the exact algorithm. Thirdly, compute the
 <em>available width</em>: in this case, this is the width of the
-containing block minus <del><span class="propinst-left">'left'</span>,
-<span class="propinst-right">'right'</span>,</del> <span
+containing block minus <span
 class="propinst-margin-left">'margin-left'</span> and <span
-class="propinst-margin-right">'margin-right'</span>. <del>(Omit 'left' and
-'right' if they do not apply to this element.)</del>
+class="propinst-margin-right">'margin-right'</span>.
 
 <p>Then the shrink-to-fit width is: min(max(preferred minimum width,
 available width), preferred width).</p>
 
 <h3>Floating, replaced elements</h3>
 
-<p>If <del><span class="propinst-left">'left'</span>, <span
-class="propinst-right">'right'</span>,</del> <span
+<p>If <span
 class="propinst-margin-left">'margin-left'</span> or <span
 class="propinst-margin-right">'margin-right'</span> are specified as
 'auto', their computed value is '0'. 
@@ -492,9 +481,7 @@ that value.
 computed value is the <a href="#shrink-to-fit-float">shrink-to-fit</a>
 width as for floating elements.
 
-<p>A specified value of 'auto' for <del><span
-class="propinst-left">'left'</span>, <span
-class="propinst-right">'right'</span>,</del> <span
+<p>A specified value of 'auto' for <span
 class="propinst-margin-left">'margin-left'</span> or <span
 class="propinst-margin-right">'margin-right'</span> becomes a computed
 value of '0'.
@@ -597,17 +584,6 @@ margins"</a> above, as if <span class="propinst-width">'width'</span>
 were specified as this value.
 </ol>
 
-
-<del>
-<!-- http://lists.w3.org/Archives/Member/w3c-css-wg/2003JanMar/0267.html -->
-<P>The user agent may define a non-negative minimum value for the
-<span class="propinst-min-width">'min-width'</span> property, which
-may vary from element to element and even depend on other
-properties. If <span class="propinst-min-width">'min-width'</span>
-goes below this limit, either because it was set explicitly, or
-because it was 'auto' and the rules below would make it too small, the
-user agent may use the minimum value as the computed value.</p></del>
-
 <h2><a name="the-height-property">Content height</a>: the <span
 class="propinst-height">'height'</span> property</H2>
 
@@ -693,16 +669,11 @@ various kinds of boxes:
       <li>'inline-block', replaced elements in normal flow
     </ol>
 
-<P><del>Points 1-6 and 9-10 include relative positioning.</del>
-<ins>For Points 1-6 and 9-10, the computed values of 'top' and
-'bottom' are determined by the rules in section 9.4.3.</ins>
+<P>For Points 1-6 and 9-10, the computed values of 'top' and
+'bottom' are determined by the rules in section 9.4.3.
 
 <H3><a name="inline-non-replaced">Inline, non-replaced elements</a></H3>
 
-<del><p>If <span class="propinst-top">'top'</span> or <span
-class="propinst-bottom">'bottom'</span> are 'auto',
-their computed value is 0.</del>
-
 <P>The <span class="propinst-height">'height'</span> property doesn't
 apply. The height of the content area should be based on the font, but
 this specification does not specify how. A UA may, e.g., use the
@@ -734,8 +705,7 @@ involved, depending on the baseline alignment of the fonts.
 block-level replaced elements in normal flow, 'inline-block' replaced
 elements in normal flow and floating replaced elements</H3>
 
-<p>If <del><span class="propinst-top">'top'</span>, <span
-class="propinst-bottom">'bottom'</span>,</del> <span
+<p>If <span
 class="propinst-margin-top">'margin-top'</span>, or <span
 class="propinst-margin-bottom">'margin-bottom'</span> are 'auto',
 their computed value is 0. If <span
@@ -755,8 +725,7 @@ class="propinst-height">'height'</span> is:
 <H3>Block-level and 'inline-block', non-replaced elements in normal
 flow</H3>
 
-<p>If <del><span class="propinst-top">'top'</span>, <span
-class="propinst-bottom">'bottom'</span>,</del> <span
+<p>If <span
 class="propinst-margin-top">'margin-top'</span>, or <span
 class="propinst-margin-bottom">'margin-bottom'</span> are 'auto',
 their computed value is 0. If <span
@@ -1063,12 +1032,9 @@ not enter into the line box calculation, they are still rendered
 around inline boxes. This means that if the height specified by <span
 class="propinst-line-height">'line-height'</span> is less than the
 content height of contained boxes, backgrounds and colors of padding
-and borders may "bleed" into adjacent line boxes. <del
-class=proposed>However, in this case, some user agents may use the
-line box to "clip" the border and padding areas (i.e., not render
-them).</del> <ins class=proposed>User agents should render the boxes
+and borders may "bleed" into adjacent line boxes. User agents should render the boxes
 in document order. This will cause the borders on subsequent lines to
-paint over the borders and text of previous lines.</ins>
+paint over the borders and text of previous lines.
 
 <!-- #include src=properties/line-height.srb -->
 
@@ -1133,11 +1099,10 @@ div { line-height: 120%; font-size: 10pt }    /* percentage */
 </PRE>
 </div>
 
-<P><del class=proposed>When an element contains text that is rendered
-in more than one font, user agents should determine the <span
+<P>When an element contains text that is rendered
+in more than one font, user agents may determine the <span
 class="propinst-line-height">'line-height'</span> value according to
-the largest font size. <!-- change this if font-size inheritance is
-changed as per HWL's proposal --></del>
+the largest font size.
 
 <P>Generally, when there is only one value of <span
 class="propinst-line-height">'line-height'</span> for all inline
@@ -1206,10 +1171,12 @@ table height algorithms</a> for details.
   <DD>Align the bottom of the box with the bottom of the line box.
 </DL>
 
-<ins><P>The baseline of an 'inline-table' is the baseline of the last row
-of the table. The baseline of an 'inline-block' is the baseline of the
-last line box in the normal flow in the element, or the element's
-bottom margin edge, if there is none.</ins>
+<P>The baseline of an 'inline-table' is the baseline of the first row
+of the table.
+
+<P>A UA should use the baseline of the last line box in the normal
+flow in the element as the baseline of an 'inline-block', or the
+element's bottom margin edge, if there is none.
 
 </BODY>
 </HTML>
