w3c
diff --git a/‎css2/box.src‎
Lines changed: 4 additions & 12 deletions b/‎css2/box.src‎
Lines changed: 4 additions & 12 deletions
diff --git a/‎css2/changes.src‎
Lines changed: 163 additions & 11 deletions b/‎css2/changes.src‎
Lines changed: 163 additions & 11 deletions
diff --git a/‎css2/page.src‎
Lines changed: 22 additions & 29 deletions b/‎css2/page.src‎
Lines changed: 22 additions & 29 deletions
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.73 2008-12-02 18:50:38 bbos Exp $ -->
+<!-- $Id: box.src,v 1.74 2009-02-03 11:24:59 bbos Exp $ -->
 <HEAD>
 <TITLE>Box model</TITLE>
 </HEAD>
@@ -355,17 +355,9 @@ its first in-flow block-level child's top margin if the element has no
 top border, no top padding, and the child has no <a
 href="visuren.html#clearance">clearance.</a></p>
 
-<p>The bottom margin of an in-flow block-level element is adjoining to
-its last in-flow block-level child's bottom margin when:
-<ul>
-<li>the element's specified 'height' is 'auto',
-
-<li>the element's used height is the same as it would have been if the
-specified values of 'min-height' and 'max-height' were their initial
-values
-
-<li>the element has no bottom padding or border.
-</ul>
+<p>The bottom margin of an in-flow block-level element with a 'height'
+of 'auto' is adjoining to its last in-flow block-level child's bottom
+margin if the element has no bottom padding or border.
 
 <p>An element's own margins are adjoining if the <span
 class="propinst-min-height">'min-height'</span> property is zero, and
 
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: changes.src,v 2.95 2009-01-29 19:05:56 bbos Exp $ -->
+<!-- $Id: changes.src,v 2.96 2009-02-03 11:24:59 bbos Exp $ -->
 <HEAD>
 <TITLE>Changes</TITLE>
 </HEAD>
@@ -3022,7 +3022,7 @@ images without reliable resolution information, a size of 1&nbsp;px
 unit per image source pixel must be assumed.</ins></q> to the
 definition of <q>intrinsic dimensions.</q>
 
-<!--========================== issue 2 ============================-->
+<!--===================== issue 2 & 82 & 87 =======================-->
 
 <h3 id=s.4.1.1><a
 href="/TR/2007/CR-CSS21-20070719/syndata.html#tokenization"> Section
@@ -3037,6 +3037,20 @@ the grammar rule
 start with a dash (-), but the dash was already allowed because of the
 definition of <q>IDENT.</q>
 
+<p><span class=date>[2009-02-02]</span> Change <del>U</del> to
+<ins>u</ins> in token UNICODE-RANGE. (It means the same, but seems to
+avoid confusion.)
+
+<p><span class=date>[2009-02-02]</span> Clarify where comments are
+allowed:
+
+<blockquote>
+<p>COMMENT tokens do not occur in the grammar (to keep it readable),
+but any number of these tokens may appear anywhere <del>between</del>
+<ins>outside</ins> other tokens. <ins>(Note, however, that a comment
+before or within the @charset rule disables the @charset.)</ins>
+</blockquote>
+
 <!--========================== issue 90 ===========================-->
 
 <h3 id="s.4.1.2.2"><a
@@ -3163,7 +3177,6 @@ Section&nbsp;4.3.5 Counters</a></h3>
 in <q>Counters are denoted by <ins>case-sensitive</ins>
 identifiers</q>.
 
-
 <!--========================== issue 38, 81 =======================-->
 
 <h3 id="s.5.8.1"><a
@@ -3301,18 +3314,16 @@ Section 8.3.1 Collapsing margins</a></h3>
 position of the top border edge is determined by assuming the element
 has a non-zero <em>bottom</em> (not: top) border.
 
-<!--========================== issue 14 ===========================-->
+<!--======================== issue 14 & 79 ========================-->
 
 <h3 id="s.8.3.1a"><a
 href="/TR/2007/CR-CSS21-20070719/box.html#collapsing-margins">
 Section 8.3.1 Collapsing margins</a></h3>
 
-<p><span class=date>[2008-10-13]</span> Rephrased the rule for
-adjoining margins so that the bottom margin of an in-flow block-level
-element is adjoining to its last in-flow block-level child's bottom
-margin if the element's 'min-height' is less then <em>or equal to</em>
-its intrinsic height and 'max-height' is greater than <em>or equal
-to</em> its intrinsic height.
+<p><span class=date>[2009-02-02]</span> Rephrased the rule for
+adjoining margins so that the 'min-height' and 'max-height' of an
+element have no influence over whether the element's bottom margin is
+adjoining to its last child's bottom margin.
 
 <!--========================== issue 70 ===========================-->
 
@@ -3407,6 +3418,16 @@ Section&nbsp;9.5 Floats</a></h3>
 may be misinterpreted: &ldquo;the float's parent<del>'s</del> stacking
 context.&rdquo;
 
+<!--========================== issue 97 ===========================-->
+
+<h3 id="s.9.5.2"><a
+href="/TR/2007/CR-CSS21-20070719/visuren.html#flow-control">
+Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
+property</a></h3>
+
+<p><span class=date>[2009-02-02]</span> Add an example of negative
+clearance after the first note.
+
 <!--========================== issue 77 ===========================-->
 
 <h3 id="s.9.6.1"><a
@@ -3449,6 +3470,29 @@ follows:
 </ol>
 </blockquote>
 
+<!--========================== issue 93 ===========================-->
+
+<h3 id="s.10.1"><a
+href="/TR/2007/CR-CSS21-20070719/visudet.html#containing-block-details">
+Section&nbsp;10.1 Definition of "containing block"</a></h3>
+
+<p><span class=date>[2009-02-02]</span> Rephrase first bullet point to
+make easier to read:
+
+<blockquote>
+<p><del>The containing block in which the root element lives is a
+rectangle with the dimensions of the viewport, anchored at the canvas
+origin for continuous media, and the page area for paged media. This
+containing block is called the initial containing block.</del>
+</blockquote>
+
+<blockquote>
+<p><ins>The containing block in which the root element lives is a
+rectangle called the initial containing block. For continuous media,
+it has the dimensions of the viewport and is anchored at the canvas
+origin; it is the page area for paged media.</ins>
+</blockquote>
+
 <!--========================== issue 12b ==========================-->
 
 <h3 id="s.10.3.2"><a
@@ -3762,10 +3806,21 @@ new line box. Note: This interaction may be more precisely defined in
 a future level of CSS.</ins>
 </blockquote>
 
+<!--========================== issue 95 ===========================-->
+
+<h3 id="s.13.2.1.1"><a
+href="/TR/2007/CR-CSS21-20070719/page.html#oversized-page-box">
+Section&nbsp;13.2.1.1 Rendering page boxes that do not fit a target
+sheet</a></h3>
+
+<p><span class=date>[2009-02-02]</span> <p>Remove sections 13.2.1.1
+and 13.2.1.2. (The described situations cannot occur in CSS&nbsp;2.1,
+because CSS&nbsp;2.1 doesn't have a 'size' property.)
+
 <!--========================== issue 76 ===========================-->
 
 <h3 id="s.13.2.3"><a
-href="/TR/2007/CR-CSS21-20070719/page.htmloutside-page-box">
+href="/TR/2007/CR-CSS21-20070719/page.html#outside-page-box">
 Section&nbsp;13.2.3 Content outside the page box</a></h3>
 
 <p><span class=date>[2008-11-03]</span> Clarified what locations are
@@ -3802,6 +3857,17 @@ Section&nbsp;13.3.1 Page break properties: 'page-break-before',
 'page-break-before', 'page-break-after' and 'page-break-inside' to
 other elements than block-level ones.
 
+<!--========================== issue 92 ===========================-->
+
+<h3 id="s.13.3.2"><a
+href="/TR/2007/CR-CSS21-20070719/page.html#break-inside">
+Section&nbsp;13.3.2 Breaks inside elements: 'orphans',
+'widows'</a></h3>
+
+<p><span class=date>[2009-02-02]</span> &ldquo;Paragraph&rdquo; is not
+a defined term. Change <del>of a paragraph</del> to <ins>in a block
+element</ins> (twice).
+
 <!--============== issue 44b = ISSUE-35b ==========================-->
 
 <h3 id="s.13.3.3"><a
@@ -3812,6 +3878,57 @@ Section&nbsp;13.3.3 Allowed page breaks</a></h3>
 property of all ancestors is checked for page-breaking restrictions,
 not just that of the breakpoint's parent.</p>
 
+<!--========================== issue 96 ===========================-->
+
+<h3 id="s.13.3.3a"><a
+href="/TR/2007/CR-CSS21-20070719/page.html#allowed-page-breaks">
+Section&nbsp;13.3.3 Allowed page breaks</a></h3>
+
+<p><span class=date>[2009-02-02]</span> Remove possible confusion:
+
+<blockquote>
+<p>Rule D: In addition, breaking at (2) is allowed only if the
+'page-break-inside' property of <ins>the element and</ins> all
+<ins>its</ins> ancestors is 'auto'.
+</blockquote>
+
+<!--========================== issue 98 ===========================-->
+
+<h3 id="s.13.3.3b"><a
+href="/TR/2007/CR-CSS21-20070719/page.html#allowed-page-breaks">
+Section&nbsp;13.3.3 Allowed page breaks</a></h3>
+
+<p><span class=date>[2009-02-02]</span> Top margins do <em>not</em>
+disappear at a page break that is forced by a 'page-break-after' or
+'page-break-before'. Correct the first bullet to:
+
+<blockquote>
+<p>When an <ins>unforced</ins> page break occurs here, the used values
+of the relevant 'margin-top' and 'margin-bottom' properties are set to
+'0'. <ins>When a forced page break occurs here, the used value of the
+relevant 'margin-bottom' property is set to '0'; the relevant
+'margin-top' used value may either be set to '0' or retained.</ins>
+</blockquote>
+
+<p>And add the following note:
+
+<blockquote>
+<p><ins> Note: It is expected that CSS3 will specify that the relevant
+'margin-top' applies (i.e., is not set to '0') after a forced page
+break.</ins>
+</blockquote>
+
+<!--========================== issue 74 ===========================-->
+
+<h3 id="s.13.3.5"><a
+href="/TR/2007/CR-CSS21-20070719/page.html#best-page-breaks">
+Section&nbsp;13.3.5 "Best" page breaks</a></h3>
+
+<p><span class=date>[2009-02-02]</span> Remove the advice to user
+agents to avoid breaking inside elements with borders, inside tables
+or inside floating elements; add the advice to avoid breaking inside
+replaced elements.
+
 <!--========================== issue 80 ===========================-->
 
 <h3 id="s.14.2"><a
@@ -3919,6 +4036,24 @@ td[nowrap] { white-space: nowrap }
 <del>:before,:after { white-space: pre-line }</del></pre>
 </blockquote>
 
+<!--========================== issue 91 ===========================-->
+
+<h3 id="s.16.6.1"><a
+href="/TR/2007/CR-CSS21-20070719/text.html#white-space-model">
+Section&nbsp;16.6.1 The 'white-space' processing model</a></h3>
+
+<p><span class=date>[2009-02-02]</span> Collapsing of white space does
+not remove any line breaking oppportunities. Add the following
+clarification:
+
+<blockquote>
+<p>Then, the entire block is rendered. Inlines are laid out, taking
+bidi reordering into account, and wrapping as specified by the
+'white-space' property. <ins>When wrapping, line breaking
+opportunities are determined based on the text prior to the white
+space collapsing steps above.</ins>
+</blockquote>
+
 <!--========================== issue 11a ==========================-->
 
 <h3 id="s.17.2.1"><a
@@ -3944,6 +4079,23 @@ anonymous inline box that contains only white space, then it is
 treated as if it has 'display: none'.</ins>
 </blockquote>
 
+<!--========================== issue 88 ===========================-->
+
+<h3 id="s.17.5.4"><a
+href="/TR/2007/CR-CSS21-20070719/tables.html#model">
+Section&nbsp;17.4 Tables in the visual formatting model</a></h3>
+
+<p><span class=date>[2009-02-02]</span> The anonymous block containing
+the table and its caption establishes a block formatting context:
+
+<blockquote>
+<p>The anonymous box is a 'block' box if the table is block-level, and
+an 'inline-block' box if the table is inline-level <del>except that
+this block is never considered as a block for 'run-in' interaction,
+and that </del> <ins>The anonymous box establishes a block formatting
+context.</ins> The table box (not the anonymous box) is used when
+doing baseline vertical alignment for an 'inline-table'.
+
 <!--========================== issue 20 ===========================-->
 
 <h3 id="s.17.5.4"><a
 
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: page.src,v 2.56 2008-11-03 16:46:07 bbos Exp $ -->
+<!-- $Id: page.src,v 2.57 2009-02-03 11:24:59 bbos Exp $ -->
 <HEAD>
 <TITLE>Paged media</TITLE>
 </HEAD> 
@@ -118,26 +118,11 @@ the paper cutter.
 
 
 
-<h4><a name="oversized-page-box">Rendering page boxes that do not fit a target sheet</a></h4>
+<h4><a name="oversized-page-box">[This section intentionally left blank]</a></h4>
 
-<P>If a page box does not fit the target sheet dimensions, the 
-user agent may choose to:</p>
 
-<UL>
-<LI>Rotate the page box 90&deg; if this will make the page box fit.
-<LI>Scale the page to fit the target.
-</UL>
+<h4><a name="positioning-page-box">[This section intentionally left blank]</a></h4>
 
-<P>The user agent should consult the user before performing these
-operations.
-
-<h4><a name="positioning-page-box">Positioning the page box on the sheet</a></h4>
-
-<P>When the page box is smaller than the target size, the user agent
-is free to place the page box anywhere on the sheet. However, it is
-recommended that the page box be centered on the sheet since this will
-align double-sided pages and avoid accidental loss of information that
-is printed near the edge of the sheet.
 
 
 <h3><a name="page-selectors">Page selectors: selecting left, right, and first pages</a></H3>
@@ -306,9 +291,9 @@ class="propinst-widows">'widows'</span></h3>
 <!-- #include src=properties/widows.srb -->
 
 <P>The <span class="propinst-orphans">'orphans'</span> property
-specifies the minimum number of lines of a paragraph that must be left
+specifies the minimum number of lines in a block element that must be left
 at the bottom of a page. The <span class="propinst-widows">'widows'</span> property specifies the minimum
-number of lines of a paragraph that must be left at the top of a page.
+number of lines in a block element that must be left at the top of a page.
 Examples of how they are used to control page breaks are given below.
 
 <P>For information about paragraph formatting, please consult the
@@ -320,16 +305,26 @@ section on <a href="visuren.html#line-box">line boxes</a>.
 
 <ol>
 <li>
-In the vertical margin between block boxes. When a page
+In the vertical margin between block boxes. When an unforced page
 break occurs here, the <a href="cascade.html#used-value">used
-values</a> of the relevant
-<span class="propinst-margin-top">'margin-top'</span>
-and <span class="propinst-margin-bottom">'margin-bottom'</span>
-properties are set to '0'.
+values</a> of the relevant <span
+class="propinst-margin-top">'margin-top'</span> and <span
+class="propinst-margin-bottom">'margin-bottom'</span> properties are
+set to '0'. When a forced page break occurs here, the used value of
+the relevant <span
+class="propinst-margin-bottom">'margin-bottom'</span> property is set
+to '0'; the relevant <span
+class="propinst-margin-top">'margin-top'</span> used value may either
+be set to '0' or retained.
+
 <li>Between <a href="visuren.html#line-box">line boxes</a>
 inside a <a href="visuren.html#block-box">block</a> box.
 </ol>
 
+<p class=note>Note: It is expected that CSS3 will specify that the
+relevant 'margin-top' applies (i.e., is not set to '0') after a forced
+page break.
+
 <!-- What about line boxes next to a float? -IJ -->
 
 <p>These breaks are subject to the following rules:
@@ -359,7 +354,7 @@ the value of <span class="propinst-widows">'widows'</span> or more.
 
 <li><strong>Rule D:</strong> In addition, breaking at (2) is allowed only if the <span
 class="propinst-page-break-inside">'page-break-inside'</span> property
-of all ancestors is 'auto'.
+of the elements and all its ancestors is 'auto'.
 </ul>
 
 <p>If the above doesn't provide enough break points to keep content
@@ -391,9 +386,7 @@ that they are sometimes contradictory):</p>
 <li>Break as few times as possible.
 <li>Make all pages that don't end with a forced break appear to have about
 the same height.
-<li>Avoid breaking inside a block that has a border.
-<li>Avoid breaking inside a table.
-<li>Avoid breaking inside a floated element
+<li>Avoid breaking inside a replaced element.
 </ul>
 
 <div class="example"><P>