[css2] Edits by Håkon and Tantek.

bert-github · bert-github · commit 593eceed95d9 · 2004-04-01T13:01:22.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402248
diff --git a/css2/fonts.src b/css2/fonts.src
@@ -1,12 +1,12 @@
 <!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: fonts.src,v 2.77 2003-08-24 20:03:42 bbos Exp $ -->
+<!-- $Id: fonts.src,v 2.78 2004-04-01 13:01:21 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Fonts</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
-<!-- Changed by: Tantek Celik, 2003-06-24 -->
+<!-- Changed by: Tantek Celik, 2004-03-29 -->
 <style type="text/css">
 #AutoNumber2 td { text-align:center }
 </style>
@@ -58,7 +58,7 @@ complete set of properties, the UA uses the 'font-family' property to
 choose a tentative font family. The remaining properties are tested
 against the family according to the matching criteria described with
 each property. If there are matches for all the remaining properties,
-then that is the matching font face for the given element.
+then that is the matching font face for the given element or character.
 </li>
 <li>If there is no matching font face within the 'font-family' being
 processed by step 2, and if there is a next alternative 'font-family'
diff --git a/css2/generate.src b/css2/generate.src
@@ -3,7 +3,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Generated content, automatic numbering, and lists</title>
-<!-- Changed by Kimberly Blessing, 2004-02-13 -->
 </head>
 <body>
 <h1 align="center">
@@ -199,7 +198,7 @@ class="value-inst-no-open-quote"><strong>no-open-quote</strong></span></span>
 and <span class="index-inst" title="no-close-quote"><span
 class="value-inst-no-close-quote"><strong>no-close-quote</strong></span></span>
 
-<dd>Same as 'none', but increments (decrements) the level of nesting for quotes.
+<dd>Introduces no content, but increments (decrements) the level of nesting for quotes.
 
 <dt><span class="index-def" title="attr()"><strong>attr(X)</strong></span>
 <dd>This function returns as a string the value of attribute X 
@@ -212,8 +211,7 @@ attribute values for other elements than the subject of the selector.
 </dl>
 
 <P>The <span class="propinst-display">'display'</span> property
-controls whether the content is placed in a block, inline, or marker
-box.
+controls whether the content is placed in a block or inline box.
 
 <div class="example"><p>The following rule causes the string "Chapter: " to be generated before each H1 element:</p>
 
@@ -456,12 +454,6 @@ one optionally followed by an integer. The integer gives the value that
 the counter is set to on each occurrence of the element. The default
 is 0.
 
-<p>If <span
-class="propinst-counter-increment">'counter-increment'</span> refers
-to a counter that is not in the <a href="#scope">scope (see below</a>) of any
-<span class="propinst-counter-reset">'counter-reset'</span>, the
-counter is assumed to have been reset to 0 by the root element.
-
 <div class="example">
 <p>This example shows a way to number chapters and sections with
 "Chapter 1", "1.1", "1.2", etc.
@@ -505,11 +497,12 @@ H1 { counter-reset: section -1 imagenum 99 }
 
 <h3><a name="scope">Nested counters and scope</a></h3>
 
-<p>Counters are "self-nesting", in the sense that re-using a counter
-in a child element automatically creates a new instance of the
-counter. This is important for situations like lists in HTML, where
-elements can be nested inside themselves to arbitrary depth. It would
-be impossible to define uniquely named counters for each level.
+<p>Counters are "self-nesting", in the sense that resetting a counter
+in a descendant element automatically creates a new instance of
+the counter. This is important for situations like lists in HTML,
+where elements can be nested inside themselves to arbitrary depth.
+It would be impossible to define uniquely named counters for each
+level.
 
 <div class="example">
 <p>Thus, the following suffices to number nested list items. The
@@ -523,12 +516,18 @@ LI:before { content: counter(item) ". "; counter-increment: item }
 </pre>
 </div>
 
-<p>The self-nesting is based on the principle that every element that
-has a <span class="propinst-counter-reset">'counter-reset'</span> for
-a counter X, creates a fresh counter X, the <span class="index-def"
-title="scope"><dfn>scope</dfn></span> of which is the element, its
-following siblings, and all the descendants of the element and its
-following siblings.
+<p>The <span class="index-def" title="scope"><dfn>scope</dfn></span>
+of a counter starts at the first element in the document that has a
+<span class="propinst-counter-reset">'counter-reset'</span> for that
+counter and includes the element's descendants and its following
+siblings with their descendants.
+
+<p>If <span
+class="propinst-counter-increment">'counter-increment'</span> or <span
+class="propinst-content">'content'</span> refers to a counter that is
+not in the scope of any <span
+class="propinst-counter-reset">'counter-reset'</span>, the counter is
+assumed to have been reset to 0 by the root element.
 
 <p>In the example above, an OL will create a counter, and all children
 of the OL will refer to that counter.
@@ -549,24 +548,25 @@ counters. (We assume the style sheet as given in the example above).
       &lt;LI&gt;item     &lt;!--   increment item[1] (= 3)  --&gt;
         &lt;OL&gt;       &lt;!--   (set item[2] to 0        --&gt;
           &lt;LI&gt;item &lt;!--    increment item[2] (= 1) --&gt;
-        &lt;/OL&gt;      &lt;!--   )                        --&gt;
-        &lt;OL&gt;       &lt;!--   (set item[3] to 0        --&gt;
-          &lt;LI&gt;     &lt;!--    increment item[3] (= 1) --&gt;
+        &lt;/OL&gt;      &lt;!--                            --&gt;
+        &lt;OL&gt;       &lt;!--    set item[2] to 0        --&gt;
+          &lt;LI&gt;item &lt;!--    increment item[2] (= 1) --&gt;
         &lt;/OL&gt;      &lt;!--   )                        --&gt;
       &lt;LI&gt;item     &lt;!--   increment item[1] (= 4)  --&gt;
     &lt;/OL&gt;          &lt;!--  )                         --&gt;
   &lt;LI&gt;item         &lt;!--  increment item[0] (= 3)   --&gt;
   &lt;LI&gt;item         &lt;!--  increment item[0] (= 4)   --&gt;
-&lt;/OL&gt;              &lt;!-- )                          --&gt;
-&lt;OL&gt;               &lt;!-- (reset item[4] to 0        --&gt;
-  &lt;LI&gt;item         &lt;!--  increment item[4] (= 1)   --&gt;
-  &lt;LI&gt;item         &lt;!--  increment item[4] (= 2)   --&gt;
-&lt;/OL&gt;              &lt;!-- )                          --&gt;
+&lt;/OL&gt;              &lt;!--                            --&gt;
+&lt;OL&gt;               &lt;!--  reset item[0] to 0        --&gt;
+  &lt;LI&gt;item         &lt;!--  increment item[0] (= 1)   --&gt;
+  &lt;LI&gt;item         &lt;!--  increment item[0] (= 2)   --&gt;
+&lt;/OL&gt;              &lt;!--                            --&gt;
 </pre>
 </div>
 
-<p>The 'counters()' function generates a string composed of
-the values of all counters with the same name, separated by a given string.
+<p>The 'counters()' function generates a string composed of the values
+of all counters with the same name on the element and its ancestors,
+separated by a given string.
 
 <div class="example"><P>
 <P>The following style sheet numbers nested list items 
diff --git a/css2/media.src b/css2/media.src
@@ -1,10 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: media.src,v 2.34 2004-02-18 01:06:27 bbos Exp $ -->
+<!-- $Id: media.src,v 2.35 2004-04-01 13:01:22 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Media types</TITLE>
-<!-- Changed by Kimberly Blessing, 2004-02-13 -->
 </HEAD>
 <BODY>
 <H1>Media types</H1>
@@ -170,12 +169,18 @@ resolution, color, limited-scrollability screens, sound available).
 
 <P>Media type names are case-insensitive.  
 
-<P>Media types are mutually exclusive in the sense that a user agent
-can only support one media type when rendering a document. However,
-user agents may have different modes which support different media
-types.
+<P>Media types are mutually exclusive in the sense that a user agent can
+only support one media type when rendering a document. However, user
+agents may use different media types on different canvases. For
+example, a document may (simultaneously) be shown in 'screen' mode on
+one canvas and 'print' mode on another canvas. 
 
-<P>Unknown media type names should not result in the @media rule being ignored.
+<p>Note that a multimodal media type is still only one media
+type. The 'tv' media type, for example, is a multimodal media
+type that renders both visually and aurally to a single canvas.
+
+
+<P>Unknown media type names must not result in the @media rule being ignored.
 
 <!--
 <P>Due to rapidly changing technologies, CSS2 does not specify a
diff --git a/css2/text.src b/css2/text.src
@@ -1,13 +1,13 @@
 <!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: text.src,v 2.43 2004-02-10 17:23:55 bbos Exp $ -->
+<!-- $Id: text.src,v 2.44 2004-04-01 13:01:22 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Text</title>
 <meta http-equiv="Content-Style-Type" content="text/css">
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
-<!-- Changed by: Tantek Celik, 2004-02-09 -->
+<!-- Changed by: Tantek Celik, 2004-03-29 -->
 <style type="text/css">
 .current,.proposed,span.delcurrent { background:#feb }
 ins.proposed,span.insproposed { background:#bfb }
@@ -379,8 +379,7 @@ class="propinst-white-space">'white-space'</span> property</h2>
 
 <!-- #include src=properties/white-space.srb -->
 
-<p> This property declares how <a
-href="syndata.html#whitespace">whitespace</a> inside the element is
+<p> This property declares how whitespace inside the element is
 handled. Values have the following meanings:</p>
 
 
@@ -434,9 +433,10 @@ performed, ignoring bidi formatting characters as if they were not
 there:
 </p>
 <ol>
-<li>Each non-linefeed whitespace character surrounding a linefeed
-     character is removed if 'white-space' is set to 'normal',
-     'no-wrap', or 'pre-line'.
+<li>
+Each tab (U+0009), carriage return (U+000D), or space (U+0020) 
+character surrounding a linefeed (U+000A) character is removed if 
+'white-space' is set to 'normal', 'no-wrap', or 'pre-line'.
      </li>
 <li>If 'white-space' is set to 'pre' or 'pre-wrap', any sequence of
      spaces (U+0020) unbroken by an element boundary is treated as a
@@ -514,8 +514,10 @@ algorithm, with the end result being:
 </pre>
 <p>
 Note that there are two spaces between A and B, and none between B 
-and C. This is best avoided by using the natural bidirectionality 
-of characters instead of explicit embedding levels.
+and C. This can sometimes be avoided by using the natural bidirectionality 
+of characters instead of explicit embedding levels. Also, it is good 
+to avoid spaces immediately inside start and end tags, as these tend 
+to do weird things when dealing with white space collapsing.
 </p>
 
 </body>
