[css2] Hakon's edits per http://www.damowmow.com/temp/csswg/css21/issues-cr

bert-github · bert-github · commit 6667ad4c87cf · 2004-12-07T10:10:25.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402263
diff --git a/css2/cascade.src b/css2/cascade.src
@@ -1,10 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: cascade.src,v 2.49 2004-02-18 00:19:03 bbos Exp $ -->
+<!-- $Id: cascade.src,v 2.50 2004-12-07 10:10:25 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
-<!-- Changed by Kimberly Blessing, 2004-02-13 -->
 </HEAD>
 <BODY>
 
@@ -146,6 +145,9 @@ value as the property for the element's parent. The 'inherit' value
 can be used to strengthen inherited values, and it can also be used on
 properties that are not normally inherited.
 
+<p>If the 'inherit' value is set on the root element, the property is
+assigned its initial value.
+
 <div class="example"><P>In the example below, the <span
 class="propinst-color">'color'</span> and <span
 class="propinst-background">'background'</span> properties are set on
@@ -295,11 +297,11 @@ must apply the following sorting order:</p>
 
 </OL>
 
-<P> Apart from the "!important" setting on individual declarations,
+<P>Apart from the "!important" setting on individual declarations,
 this strategy gives author's style sheets higher weight than those of
-the reader. It is therefore important that the user agent give the
-user the ability to turn off the influence of a certain style sheet,
-e.g., through a pull-down menu.
+the reader. User agents must give the user the ability to turn off the
+influence of specific author style sheets, e.g., through a pull-down
+menu. 
 
 <H3><a name="important-rules">!important rules</a></H3>
 
diff --git a/css2/conform.src b/css2/conform.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: conform.src,v 2.58 2004-02-17 21:40:55 bbos Exp $ -->
+<!-- $Id: conform.src,v 2.59 2004-12-07 10:10:25 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Conformance: requirements and recommendations</TITLE>
@@ -11,9 +11,6 @@
 
 <H2>Definitions</H2>
 
-<p>In this section, we begin the formal specification of CSS&nbsp;2.1,
-starting with the contract between authors, users, and implementors.
-
 <P>The key words <span class="index-def" title="MUST">"MUST"</span>,
 <span class="index-def" title="MUST NOT">"MUST NOT"</span>, <span
 class="index-def" title="REQUIRED">"REQUIRED"</span>, <span
@@ -313,6 +310,10 @@ href="cascade.html">cascading and inheritance</a>.
 with the "alternate" keyword in HTML 4.0 [[-HTML40]]), the UA must
 allow the user to select which style sheet set the UA should apply.
 
+<li>User agents must give the user the ability to turn off the
+influence of specific author style sheets. Conformance to UAAG 1.0
+checkpoint 4.14 satisfies this condition [[-UUAG]].
+
 </ol>
 
 <P>Not every user agent must observe every point, however:</p>
diff --git a/css2/generate.src b/css2/generate.src
@@ -163,8 +163,7 @@ class="value-inst-string"><strong>&lt;string&gt;</strong></span></span>
 <dt><span class="index-inst" title="&lt;uri&gt;"><span
 class="value-inst-uri"><strong>&lt;uri&gt;</strong></span></span>
 <dd>The value is a URI that designates an external resource.
-If a user agent cannot support the resource because of the
-<a href="media.html">media types</a> it supports, it must ignore the resource.
+If a user agent cannot display the resource it must ignore it.
 
 <dt><span class="index-inst" title="&lt;counter&gt;"><span
 class="value-inst-counter"><strong>&lt;counter&gt;</strong></span></span>
@@ -431,7 +430,7 @@ which inserts nothing, but increments the quotation depth by one.
 <h2>Automatic <span class="index-def" title="counters"><a
 name="counters">counters</a></span> and numbering</h2>
 
-<p>Automatic numbering in CSS2 is controlled with two properties,
+<p>Automatic numbering in CSS2.1 is controlled with two properties,
 <span class="propinst-counter-increment">'counter-increment'</span>
 and <span class="propinst-counter-reset">'counter-reset'</span>. The
 counters defined by these properties are used with the counter() and
@@ -482,12 +481,8 @@ reset first and then incremented.
 <p>If the same counter is specified more than once in the value of the
 <span class="propinst-counter-reset">'counter-reset'</span> and <span
 class="propinst-counter-increment">'counter-increment'</span>
-properties, all counters are processed in the order specified. 
-
-<p>If the same counter is specified more than once in the value of the
-<span class="propinst-counter-reset">'counter-reset'</span> and <span
-class="propinst-counter-increment">'counter-increment'</span>
-properties, the counter will be processed accordingly.
+properties, each reset/increment of the counter is processed in the order
+specified.
 
 <div class="example">
 <p>The following example will reset the 'section' counter to 0:
@@ -728,9 +723,6 @@ rendering depends on the user agent.
 <dd>Traditional Armenian numbering.
 </dl>
 
-<P>A user agent that does not recognize a numbering system should use
-'decimal'.
-
 
 <P>Alphabetic systems are specified with:</P>
 
diff --git a/css2/page.src b/css2/page.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: page.src,v 2.41 2004-02-14 00:59:12 bbos Exp $ -->
+<!-- $Id: page.src,v 2.42 2004-12-07 10:10:25 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Paged media</TITLE>
@@ -16,7 +16,7 @@
 on computer screens, etc.) differ from <a
 href="./media.html#continuous-media-group">continuous media</a> in
 that the content of the document is split into one or more discrete
-pages. To handle pages, CSS 2.1 describes how page margins are set
+pages. To handle pages, CSS&nbsp;2.1 describes how page margins are set
 on <a href="#page-box">page boxes</a>, and how <a href="#page-breaks">page breaks</a> are declared.
 
 <p>The user agent is responsible for transferring the page boxes of a
@@ -50,7 +50,7 @@ box</dfn></span> is a rectangular region that contains two areas:</p>
 <li>The <span class="index-def" title="page area"><a
 name="page-area"><dfn>page area</dfn></a></span>. The page
 area includes the boxes laid out on that page.
-The edges of the page area act as the initial <a
+The edges of the first page area act as the initial <a
 href="visudet.html#containing-block-details">containing block</a> 
 for layout that occurs between page breaks. 
 
@@ -73,7 +73,7 @@ all left pages, or all right pages</p>
 
 <h3><a name="page-margins">Page margins</a></h3>
 
-<P>In CSS 2.1, only the <a href="box.html#margin-properties">margin
+<P>In CSS&nbsp;2.1, only the <a href="box.html#margin-properties">margin
 properties</a> (<span class="propinst-margin-top">'margin-top'</span>,
 <span class="propinst-margin-right">'margin-right'</span>, <span
 class="propinst-margin-bottom">'margin-bottom'</span>, <span
@@ -101,9 +101,9 @@ Here is a simple example which sets all page margins on all pages:
 fonts, so 'em' and 'ex' units are not allowed. Percentage values on
 the margin properties are relative to the dimensions of the <a
 href="#page-box">page box</a>; for left and right margins, they refer
-to page box width while for top and bottom margins, they refer to page
-box height.  All other units associated with the respective CSS&nbsp;2.1
-properties are allowed.
+to the width of the page box while for top and bottom margins, they
+refer to the height of the page box. All other units associated with
+the respective CSS&nbsp;2.1 properties are allowed.
 
 <P>Due to negative margin values (either on the page box or on
 elements) or <a href="visuren.html#absolute-positioning">absolute
@@ -282,8 +282,10 @@ of the following element.  When these properties have values other
 than 'auto', the values 'always', 'left', and 'right' take precedence
 over 'avoid'.  
 
-<P>These properties only apply to block level elements that
-are in the normal flow of the root element.
+<P>User Agents must apply these properties to block-level elements
+in the normal flow of the root element. User agents may also apply
+these properties to other elements, e.g., 'table-row' elements.
+
 
 <h3><a name="break-inside">Breaks inside elements</a>: <span
 class="propinst-orphans">'orphans'</span>, <span
@@ -369,9 +371,9 @@ margin, there is at least one with the value 'always', 'left', or
 
 <h3>"Best" page breaks</h3>
 
-<p>CSS2 does <em>not</em> define which of a set of allowed page breaks
-must be used; CSS2 does not forbid a user agent from breaking at every
-possible break point, or not to break at all. But CSS2 does recommend
+<p>CSS&nbsp;2.1 does <em>not</em> define which of a set of allowed page breaks
+must be used; CSS&nbsp;2.1 does not forbid a user agent from breaking at every
+possible break point, or not to break at all. But CSS&nbsp;2.1 does recommend
 that user agents observe the following heuristics (while recognizing
 that they are sometimes contradictory):</p>
 
@@ -424,7 +426,7 @@ as a block to the next page.
 <h2>Cascading in the page context</H2>
 
 <P>Declarations in the <a href="#page-context">page context</a> obey
-the <a href="cascade.html">cascade</a> just like normal CSS2
+the <a href="cascade.html">cascade</a> just like normal CSS
 declarations.
 
 <div class="example"><P>
diff --git a/css2/sample.src b/css2/sample.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: sample.src,v 2.38 2004-02-17 19:42:43 bbos Exp $ -->
+<!-- $Id: sample.src,v 2.39 2004-12-07 10:10:25 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Default style sheet for HTML 4.0</TITLE>
@@ -46,11 +46,11 @@ tbody           { display: table-row-group }
 tfoot           { display: table-footer-group }
 col             { display: table-column }
 colgroup        { display: table-column-group }
-td, th          { display: table-cell; }
+td, th          { display: table-cell }
 caption         { display: table-caption }
 th              { font-weight: bolder; text-align: center }
 caption         { text-align: center }
-body            { margin: 8px; line-height: 1.12 }
+body            { margin: 8px }
 h1              { font-size: 2em; margin: .67em 0 }
 h2              { font-size: 1.5em; margin: .75em 0 }
 h3              { font-size: 1.17em; margin: .83em 0 }
@@ -71,7 +71,7 @@ pre, tt, code,
 kbd, samp       { font-family: monospace }
 pre             { white-space: pre }
 button, textarea,
-input, object, 
+input, img,
 select          { display:inline-block; }
 big             { font-size: 1.17em }
 small, sub, sup { font-size: .83em }
