Made 'range' accept multiple ranges (useful for complex additive styles)

Author: tabatkins

css3-lists/Overview.html

@@ -1405,9 +1405,8 @@ <h2 id=counter-style><span class=secno>8. </span> Defining Custom Counter
    <li>a <dfn id=suffix title=counter-suffix>suffix</dfn>, to append to the
     representation
 
-   <li>an <dfn id=upper title=counter-upper-bound>upper</dfn> and <dfn
-    id=lower-range-bound title=counter-lower-bound>lower range bound</dfn>,
-    to specify the (inclusive) range that the counter style can handle
+   <li>a <dfn id=range title=counter-range>range</dfn>, which limits the
+    values that a counter style can handle
 
    <li>and a <dfn id=fallback-style title=counter-fallback>fallback
     style</dfn>, to render the representation with when the counter value is
@@ -1429,12 +1428,12 @@ <h2 id=counter-style><span class=secno>8. </span> Defining Custom Counter
    counter value, follow these steps:
 
   <ol>
-   <li>If the counter value is less than the <a href="#lower-range-bound"><i
-    title=counter-lower-bound>lower bound</i></a> or greater than the <a
-    href="#upper"><i title=counter-upper-bound>upper bound</i></a> of the
-    counter style, exit this algorithm and instead <i
-    title=generate-a-counter>generate a counter representation</i> using the
-    counter style's fallback style and the same counter value.
+   <li>If the counter value is less than the <i
+    title=counter-lower-bound>lower bound</i> or greater than the <i
+    title=counter-upper-bound>upper bound</i> of the counter style, exit this
+    algorithm and instead <i title=generate-a-counter>generate a counter
+    representation</i> using the counter style's fallback style and the same
+    counter value.
 
    <li>Using the counter value and the <a href="#algorithm"><i
     title=counter-algorithm>counter algorithm</i></a> for the counter style,
@@ -2114,7 +2113,7 @@ <h3 id=counter-style-range><span class=secno>8.5. </span> Limiting the
     <tr>
      <th>Value:
 
-     <td>[ &lt;integer> | infinite ]{2} | auto
+     <td>[ [ &lt;integer> | infinite ]{2} ]# | auto
 
     <tr>
      <th>Initial:
@@ -2123,19 +2122,21 @@ <h3 id=counter-style-range><span class=secno>8.5. </span> Limiting the
   </table>
 
   <p>The &lsquo;<a href="#descdef-range"><code
-   class=property>range</code></a>&rsquo; descriptor defines the range over
+   class=property>range</code></a>&rsquo; descriptor defines the ranges over
    which the counter style is defined. If a counter style is used to
-   represent a counter value outside of its range, the counter style instead
+   represent a counter value outside of its ranges, the counter style instead
    drops down to its fallback counter style.
 
   <p>If the value is not &lsquo;<code class=css>auto</code>&rsquo;, the first
-   value represents the lower bound of the range (with &lsquo;<code
-   class=property>infinite</code>&rsquo; representing negative infinity), and
-   the second value represents the upper bound of the range (with
-   &lsquo;<code class=property>infinite</code>&rsquo; representing positive
-   infinity). This is an inclusive range - it includes both the lower and
-   upper bound numbers. If the lower bound is higher than the higher bound,
-   the descriptor is invalid and must be ignored.
+   value of each range in the list represents the lower bound of the range
+   (with &lsquo;<code class=css>infinite</code>&rsquo; representing negative
+   infinity), and the second value represents the upper bound of the range
+   (with &lsquo;<code class=property>infinite</code>&rsquo; representing
+   positive infinity). This is an inclusive range - it includes both the
+   lower and upper bound numbers. The range of the counter style as a whole
+   is the union of the individual ranges. If the lower bound of any range is
+   higher than the higher bound, the entire descriptor is invalid and must be
+   ignored.
 
   <p>If the value is &lsquo;<code class=css>auto</code>&rsquo;, the range
    depends on the counter type. For &lsquo;<code
@@ -2335,14 +2336,13 @@ <h2 id=symbols-function><span class=secno>9. </span> Defining Anonymous
    counter style with no <a href="#name"><i title=counter-name>name</i></a>,
    a <a href="#prefix"><i title=counter-prefix>prefix</i></a> and <a
    href="#suffix"><i title=counter-suffix>suffix</i></a> of &lsquo;<code
-   class=css>""</code>&rsquo; (the empty string), a <a
-   href="#lower-range-bound"><i title=counter-lower-bound>lower bound</i></a>
-   of negative infinity, an <a href="#upper"><i
-   title=counter-upper-bound>upper bound</i></a> of infinity, an <a
-   href="#fallback-style"><i title=counter-fallback>fallback style</i></a> of
-   &lsquo;<a href="#decimal"><code class=css>decimal</code></a>&rsquo;, and a
-   <a href="#negative-sign"><i title=counter-negative>negative sign</i></a>
-   of "\2D" ("-" hyphen-minus). The counter style's <a href="#algorithm"><i
+   class=css>""</code>&rsquo; (the empty string), a <a href="#range"><i
+   title=counter-range>range</i></a> from negative infinity to positive
+   infinity, an <a href="#fallback-style"><i title=counter-fallback>fallback
+   style</i></a> of &lsquo;<a href="#decimal"><code
+   class=css>decimal</code></a>&rsquo;, and a <a href="#negative-sign"><i
+   title=counter-negative>negative sign</i></a> of "\2D" ("-" hyphen-minus).
+   The counter style's <a href="#algorithm"><i
    title=counter-algorithm>algorithm</i></a> is constructed by consulting the
    previous chapter using the provided type - or &lsquo;<code
    class=css>symbolic</code>&rsquo; if the type was omitted - and the
@@ -2896,9 +2896,6 @@ <h2 class=no-num id=index>Index</h2>
    <li>counter-fallback, <a href="#fallback-style"
     title=counter-fallback><strong>8.</strong></a>
 
-   <li>counter-lower-bound, <a href="#lower-range-bound"
-    title=counter-lower-bound><strong>8.</strong></a>
-
    <li>counter-name, <a href="#name"
     title=counter-name><strong>8.</strong></a>
 
@@ -2908,6 +2905,9 @@ <h2 class=no-num id=index>Index</h2>
    <li>counter-prefix, <a href="#prefix"
     title=counter-prefix><strong>8.</strong></a>
 
+   <li>counter-range, <a href="#range"
+    title=counter-range><strong>8.</strong></a>
+
    <li>&lt;counter-style>, <a href="#ltcounter-style"
     title="&lt;counter-style>"><strong>3.</strong></a>
 
@@ -2920,9 +2920,6 @@ <h2 class=no-num id=index>Index</h2>
    <li>counter symbol, <a href="#counter-symbol"
     title="counter symbol"><strong>8.7.</strong></a>
 
-   <li>counter-upper-bound, <a href="#upper"
-    title=counter-upper-bound><strong>8.</strong></a>
-
    <li>current tuple, <a href="#current-tuple"
     title="current tuple"><strong>8.1.6.</strong></a>
 

css3-lists/Overview.src.html

@@ -846,9 +846,7 @@ <h2 id='counter-style'>
 
 		<li>a <dfn title='counter-suffix'>suffix</dfn>, to append to the representation</li>
 
-		<li>an <dfn title='counter-upper-bound'>upper</dfn> and 
-		<dfn title='counter-lower-bound'>lower range bound</dfn>, to specify the 
-		(inclusive) range that the counter style can handle</li>
+		<li>a <dfn title='counter-range'>range</dfn>, which limits the values that a counter style can handle</li>
 
 		<li>and a <dfn title='counter-fallback'>fallback style</dfn>, to render the 
 		representation with when the counter value is outside the counter style's 
@@ -1422,22 +1420,17 @@ <h3 id='counter-style-range'>
 			<td><dfn id="descdef-range">range</dfn>
 		<tr>
 			<th>Value:
-			<td>[ &lt;integer> | infinite ]{2} | auto
+			<td>[ [ &lt;integer> | infinite ]{2} ]# | auto
 		<tr>
 			<th>Initial:
 			<td>auto
 	</table>
 
-	<p>The 'range' descriptor defines the range over which the counter style is defined.
-	If a counter style is used to represent a counter value outside of its range,
+	<p>The 'range' descriptor defines the ranges over which the counter style is defined.
+	If a counter style is used to represent a counter value outside of its ranges,
 	the counter style instead drops down to its fallback counter style.</p>
 
-	<p>If the value is not ''auto'', the first value represents the lower bound of the range (with 'infinite'
-	representing negative infinity), and the second value represents the upper bound
-	of the range (with 'infinite' representing positive infinity).  This is an inclusive
-	range - it includes both the lower and upper bound numbers.  If the lower
-	bound is higher than the higher bound, the descriptor is invalid and must
-	be ignored.</p>
+	<p>If the value is not ''auto'', the first value of each range in the list represents the lower bound of the range (with ''infinite'' representing negative infinity), and the second value represents the upper bound of the range (with 'infinite' representing positive infinity).  This is an inclusive range - it includes both the lower and upper bound numbers.  The range of the counter style as a whole is the union of the individual ranges.  If the lower bound of any range is higher than the higher bound, the entire descriptor is invalid and must be ignored.</p>
 
 	<p>If the value is ''auto'', the range depends on the counter type.  For ''repeating'', ''numeric'', and ''non-repeating'' types, it must be treated identically to specifying ''infinite infinite''.  For ''alphabetic'' and ''symbolic'', it must be treated identically to ''1 infinite''.  For ''additive'', it must be treated identically to ''0 infinite''.  For ''override'', it must be treated according to the type of the counter style it is overriding.</p>
 
@@ -1556,7 +1549,7 @@ <h2 id='symbols-function'>
 
 	<p>Where &lt;type> is one of the following keywords: ''repeating'', ''numeric'', ''alphabetic'', ''symbolic'', or ''non-repeating''.</p>
 
-	<p>The ''symbols()'' function defines an anonymous counter style with no <i title="counter-name">name</i>, a <i title="counter-prefix">prefix</i> and <i title="counter-suffix">suffix</i> of ''""'' (the empty string), a <i title="counter-lower-bound">lower bound</i> of negative infinity, an <i title="counter-upper-bound">upper bound</i> of infinity, an <i title="counter-fallback">fallback style</i> of ''decimal'', and a <i title="counter-negative">negative sign</i> of "\2D" ("-" hyphen-minus).  The counter style's <i title="counter-algorithm">algorithm</i> is constructed by consulting the previous chapter using the provided type - or ''symbolic'' if the type was omitted - and the provided &lt;string>s and &lt;image>s as the value of the 'symbols' property.  If the type is ''non-repeating'', the <i>first symbol value</i> is ''1''.</p>
+	<p>The ''symbols()'' function defines an anonymous counter style with no <i title="counter-name">name</i>, a <i title="counter-prefix">prefix</i> and <i title="counter-suffix">suffix</i> of ''""'' (the empty string), a <i title="counter-range">range</i> from negative infinity to positive infinity, an <i title="counter-fallback">fallback style</i> of ''decimal'', and a <i title="counter-negative">negative sign</i> of "\2D" ("-" hyphen-minus).  The counter style's <i title="counter-algorithm">algorithm</i> is constructed by consulting the previous chapter using the provided type - or ''symbolic'' if the type was omitted - and the provided &lt;string>s and &lt;image>s as the value of the 'symbols' property.  If the type is ''non-repeating'', the <i>first symbol value</i> is ''1''.</p>
 
 	<div class='example'>
 		<p>This code:</p>