[css2] Hakon's edits

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402291

Author: bert-github

css2/generate.src

@@ -172,21 +172,21 @@ with two different functions: 'counter()' or 'counters()'.
 The former has two forms:
 'counter(<var>name</var>)' or 'counter(<var>name</var>,
 <var>style</var>)'. 
-The generated text is the value of the named
-counter at this point in the formatting structure; it
-is formatted in the indicated
-<a href="#counter-styles">style</a> ('decimal' by default).
-The latter function also has two forms:
-'counters(<var>name</var>, <var>string</var>)' or 'counters(<var>name</var>,
-<var>string</var>, <var>style</var>)'. The generated text is the value of all
-counters with the given name at this point in the formatting structure,
-separated by the specified string. The counters are rendered
-in the indicated <a href="#counter-styles">style</a> ('decimal' by default).
-See the section on <a href="#counters">automatic counters and
-numbering</a> for more information.
-<dt><span class="index-inst" title="open-quote"><span
-class="value-inst-open-quote"><strong>open-quote</strong></span></span> and 
-<span class="index-inst" title="close-quote"><span
+
+The generated text is the value of the innermost counter of the given
+name in scope at this pseudo-element; it is formatted in the indicated
+<a href="#counter-styles">style</a> ('decimal' by default). The latter
+function also has two forms: 'counters(<var>name</var>,
+<var>string</var>)' or 'counters(<var>name</var>, <var>string</var>,
+<var>style</var>)'. The generated text is the value of all counters
+with the given name in scope at this pseudo-element, from outermost to
+innermost separated by the specified string. The counters are rendered
+in the indicated <a href="#counter-styles">style</a> ('decimal' by
+default). See the section on <a href="#counters">automatic counters
+and numbering</a> for more information. <dt><span class="index-inst"
+title="open-quote"><span
+class="value-inst-open-quote"><strong>open-quote</strong></span></span>
+and <span class="index-inst" title="close-quote"><span
 class="value-inst-close-quote"><strong>close-quote</strong></span></span>
 
 <dd>These values are replaced by the appropriate string
@@ -461,6 +461,8 @@ is 0.
 H1:before {
     content: "Chapter " counter(chapter) ". ";
     counter-increment: chapter;  /* Add 1 to chapter */
+}
+H1 {
     counter-reset: section;      /* Set section to 0 */
 }
 H2:before {
@@ -542,14 +544,19 @@ LI:before { content: counter(item) ". "; counter-increment: item }
 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.
+siblings with their descendants. However, it does not include any
+elements in the scope of a counter created by a 'counter-reset' on a
+later sibling of the element or by a later 'counter-reset' on the same
+element.
 
 <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.
+class="propinst-content">'content'</span> on an element or
+pseudo-element refers to a counter that is not in the scope of any
+<span class="propinst-counter-reset">'counter-reset'</span>,
+implementations should behave as though a <span
+class="propinst-counter-reset">'counter-reset'</span> had reset the
+counter to 0 on that element or pseudo-element.
 
 <p>In the example above, an OL will create a counter, and all children
 of the OL will refer to that counter.
@@ -586,9 +593,9 @@ counters. (We assume the style sheet as given in the example above).
 </pre>
 </div>
 
-<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.
+<p>The 'counters()' function generates a string composed of all of the
+counters with the same name that are in scope, separated by a given
+string.
 
 <div class="example"><P>
 <P>The following style sheet numbers nested list items 
@@ -597,7 +604,7 @@ as "1", "1.1", "1.1.1", etc.
 <PRE>
 OL { counter-reset: item }
 LI { display: block }
-LI:before { content: counters(item, "."); counter-increment: item }
+LI:before { content: counters(item, ".") " "; counter-increment: item }
 </PRE>
 </div>