[css2] Issues 60, 62, 63, 64, 65, 66, 70 from http://wiki.csswg.org/spec/css2.1

bert-github · bert-github · commit dbd474a59c81 · 2008-12-02T18:50:38.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402863
diff --git a/css2/box.src b/css2/box.src
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.72 2008-10-13 17:55:40 bbos Exp $ -->
+<!-- $Id: box.src,v 1.73 2008-12-02 18:50:38 bbos Exp $ -->
 <HEAD>
 <TITLE>Box model</TITLE>
 </HEAD>
@@ -302,8 +302,9 @@ elements that are not related as siblings or ancestors.
 href="visuren.html#floats">floated</a> box and any other box do not
 collapse (not even between a float and its in-flow children).
 
-<li>Vertical margins of elements with <span
-class="propinst-overflow">'overflow'</span> other than 'visible' do
+<li>Vertical margins of elements that establish new block formatting
+contexts (such as floats and elements with <span
+class="propinst-overflow">'overflow'</span> other than 'visible') do
 not collapse with their in-flow children.
 
 <li>Margins of <a
diff --git a/css2/cover.src b/css2/cover.src
@@ -139,11 +139,10 @@ the text &#8220;[CSS21]&#8221; in the subject, preferably like
 this: &#8220;[CSS21] <em>&hellip;summary of
 comment&hellip;</em>&#8221;</p>
 
-<p>A list of changes since
-the <a href="/TR/2006/WD-CSS21-20061106">last Working Draft</a> is
-available in the
-<a href="/Style/css2-updates/issues-4-20061106.html">Disposition of
-Comments</a>.</p>
+<p>This document incorporates <a
+href="/Style/css2-updates/CR-CSS21-20070719-errata.html">
+corrections</a> made as a result of implementation experience since
+July 2007 (the previous publication).
 
 <p>This document was produced by the <a
 href="/Style/CSS/members">CSS Working Group</a> (part
diff --git a/css2/generate.src b/css2/generate.src
@@ -891,6 +891,11 @@ marker box be on the left side of the content and for elements whose
 the content. 'overflow' on the element does not clip the marker box. 
 The marker box is fixed with respect to the principal block box's
 border and does not scroll with the principal block box's content.
+The size or contents of the marker box may affect the height of the
+principal block box and/or the height of its first line box, and in
+some cases may cause the creation of a new line box. <span
+class=note><strong>Note:</strong> This interaction may be more
+precisely defined in a future level of CSS.</span>
 
 <dt><strong>inside</strong>
 
diff --git a/css2/media.src b/css2/media.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: media.src,v 2.43 2008-06-25 16:20:35 bbos Exp $ -->
+<!-- $Id: media.src,v 2.44 2008-12-02 18:50:38 bbos Exp $ -->
 <HEAD>
 <TITLE>Media types</TITLE>
 </HEAD>
@@ -76,7 +76,12 @@ the <a href="cascade.html">chapter on the cascade</a>.
 
 <P>An <span class="index-def" title="media">@media</span> rule
 specifies the target <a href="#media-types">media types</a> (separated
-by commas) of a set of rules (delimited by curly braces).  The <span
+by commas) of a set of <a
+href="syndata.html#tokenization">statements</a> (delimited by curly
+braces). Invalid statements must be ignored per <a
+href="syndata.html#rule-sets">4.1.7 "Rule sets, declaration blocks,
+and selectors"</a> and <a href="syndata.html#parsing-errors">4.2
+"Rules for handling parsing errors."</a> The <span
 class="index-inst" title="@media">@media</span> construct allows style
 sheet rules for various media in the same style sheet:</P>
 
@@ -93,7 +98,8 @@ sheet rules for various media in the same style sheet:</P>
 </pre>
 
 <p>Style rules outside of @media rules apply to all media types
-that the style sheet applies to.</p>
+that the style sheet applies to. At-rules inside @media are invalid in
+CSS2.1.
 
 <H2><a name="media-types">Recognized media types</a></H2> 
 
diff --git a/css2/syndata.src b/css2/syndata.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: syndata.src,v 2.161 2008-11-26 15:05:04 bbos Exp $ -->
+<!-- $Id: syndata.src,v 2.162 2008-12-02 18:50:38 bbos Exp $ -->
 <head>
 <title>Syntax and basic data types</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -263,7 +263,8 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
     to contain either the backslash or the newline).
 	</p>
     <p>Second, it cancels the meaning of special CSS characters.
-        Any character (except a hexadecimal digit) can be escaped
+        Except within CSS comments, any character (except a
+        hexadecimal digit) can be escaped
         with a backslash to remove its special meaning.
         For example, <samp>"\""</samp> is a string consisting of one
         double quote. Style sheet preprocessors must not remove
diff --git a/css2/visuren.src b/css2/visuren.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: visuren.src,v 2.147 2008-11-03 16:46:08 bbos Exp $ -->
+<!-- $Id: visuren.src,v 2.148 2008-12-02 18:50:38 bbos Exp $ -->
 <head>
 <title>Visual formatting model</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -232,7 +232,7 @@ do not form new blocks of content; the content is distributed in lines
 within a paragraph, inline images,
 etc.). Several values of the <span
 class="propinst-display">'display'</span> property make an element
-inline: 'inline', 'inline-table', 
+inline: 'inline', 'inline-table', 'inline-block'
  and 'run-in' (part of the time; see <a href="#run-in">run-in boxes</a>). 
 Inline-level elements generate <a name="inline-box"><dfn>inline
 boxes</dfn></a>.
@@ -1088,7 +1088,7 @@ and the floated IMG box.
 The contents of floats are stacked as if floats generated new 
 stacking contexts, except that any positioned elements and elements
 that actually create new
-stacking contexts take part in the float's parent's stacking context. 
+stacking contexts take part in the float's parent stacking context. 
 A float can overlap other boxes in the normal flow (e.g., when a 
 normal flow box next to a float has negative margins). When this 
 happens, floats are rendered in front of non-positioned in-flow 
@@ -1883,9 +1883,9 @@ stacking levels (from back to front):
 <li>the stacking contexts of descendants with negative stack
      levels.</li>
 <li>a stacking level containing in-flow non-inline-level
-     descendants.</li>
-<li>a stacking level for floats and their contents.</li>
-<li>a stacking level for in-flow inline-level descendants.</li>
+     non-positioned descendants.</li>
+<li>a stacking level for non-positioned floats and their contents.</li>
+<li>a stacking level for in-flow inline-level non-positioned descendants.</li>
 <li>a stacking level for positioned descendants with 'z-index:
      auto', and any descendant stacking contexts with 'z-index: 0'.</li>
 <li>the stacking contexts of descendants with positive stack levels.</li>
