[css2] Processed issues 60a, 62, 64, 67, 79 and 70

bert-github · bert-github · commit 74ec73928241 · 2003-12-08T16:15:26.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402196
diff --git a/css2/box.src b/css2/box.src
@@ -2,7 +2,7 @@
   'http://www.w3.org/TR/html4/strict.dtd'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.49 2003-11-06 23:34:42 bbos Exp $ -->
+<!-- $Id: box.src,v 1.50 2003-12-08 16:15:26 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -77,16 +77,6 @@ box is a table, etc. Box widths and heights are discussed
 in the chapter on <a href="visudet.html">visual formatting
 model details</a>.
 
-<!-- removed at ftf 6 Nov 2003
-<P>The <span class="index-def" title="box::width"><a
-name="the-box-width"><dfn>box width</dfn></a></span> is given by the
-sum of the left and right margins, border, and padding, and the
-content width. The <span class="index-def" title="box::height"><a
-name="the-box-height"><dfn>box height</dfn></a></span> is given by the sum
-of the top and bottom margins, border, and padding, and the content
-height.
--->
-
 <P>The background style of the content, padding, and border areas of a
 box is specified by the <span
 class="propinst-background">'background'</span> property of the
@@ -365,11 +355,12 @@ clearance applied to it, its top margin collapses with the adjoining
 margins of subsequent siblings but that resulting margin does not
 collapse with the bottom margin of the parent block.</p>
 
-<p>Collapsing is based on the <em>computed value</em> of <span
+<p>Collapsing is based on the <em>used value</em> of <span
 class="propinst-padding">'padding'</span>, <span
 class="propinst-margin">'margin'</span>, and <span
-class="propinst-border">'border'</span>. The collapsed margin is
-calculated over the computed value of the various margins.</p>
+class="propinst-border">'border'</span> (i.e., after resolving any
+percentages). The collapsed margin is
+calculated over the used value of the various margins.</p>
 
 </div>
 
diff --git a/css2/syndata.src b/css2/syndata.src
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
         "http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
 <html lang="en">
-<!-- $Id: syndata.src,v 2.91 2003-12-05 18:25:10 bbos Exp $ -->
+<!-- $Id: syndata.src,v 2.92 2003-12-08 16:15:26 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Syntax and basic data types</title>
@@ -532,7 +532,8 @@ and their contents have no influence on the rendering.  Comments may
 not be nested.
 </p>
 <p>CSS also allows the SGML comment delimiters ("&lt;!--" and
-"--&gt;") in certain places, but they do not delimit CSS
+"--&gt;") in certain places defined by the grammar, but they do not
+delimit CSS
 comments. They are permitted so that style rules appearing in an HTML
 source document (in the STYLE element) may be hidden from pre-HTML 3.2
 user agents. See the HTML 4.0 specification ([[-HTML40]]) for more information.
@@ -640,6 +641,8 @@ h1 { color: blue }
 </li>
 </ul>
 
+<p>How to handle unparseable and untokenizable stylesheets is
+undefined in CSS2.1
 
 <h2><a name="values">Values</a></h2>
 
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.85 2003-12-01 16:11:33 bbos Exp $ -->
+<!-- $Id: visudet.src,v 2.86 2003-12-08 16:15:26 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Visual formatting model details</title>
@@ -757,8 +757,8 @@ class="propinst-height">'height'</span> is:
     (intrinsic height) * ( (used width) / (intrinsic width) )
 </pre>
 
-<h3>Block-level non-replaced elements in normal
-flow when 'overflow' computes to 'visible'</h3>
+<h3><a name="normal-block">Block-level non-replaced elements in normal
+flow when 'overflow' computes to 'visible'</a></h3>
 
 <p>If <span
 class="propinst-margin-top">'margin-top'</span>, or <span
@@ -840,7 +840,9 @@ applies.</p>
 <ol>
 <li>'top' and 'height' are 'auto' and 'bottom' is not 'auto', then the
 height is based on the content, set 'auto' values for 'margin-top' and
-'margin-bottom' to 0, and solve for 'top'</li>
+'margin-bottom' to 0, and solve for 'top' ("based on the content"
+means computed the same as for <a href="#normal-block">block
+level elements in normal flow</a>)</li>
 
 <li>'top' and 'bottom' are 'auto' and 'height' is not 'auto', then
 set 'top' to the static position, set 'auto' values for 'margin-top'
