[html5] r3736 - [c] (0) Define the rules for <meter>'s contents better.

[whatwg at whatwg.org]

Author: ianh
Date: 2009-09-03 03:39:29 -0700 (Thu, 03 Sep 2009)
New Revision: 3736

Modified:
   index
   source
Log:
[c] (0) Define the rules for <meter>'s contents better.

Modified: index
===================================================================
--- index	2009-09-03 09:41:16 UTC (rev 3735)
+++ index	2009-09-03 10:39:29 UTC (rev 3736)
@@ -16571,12 +16571,13 @@
     the <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> attribute's value must
     be less than or equal to the value of the <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> attribute.</p>
 
+    <p>The numbers in the contents of the element must not be followed
+    by denomination punctuation characters.</p>
+
    </dd>
 
-   <dt>There is exactly one number followed by zero or more
-   <a href=#white_space>White_Space</a> characters and a <a href=#valid-denominator-punctuation-character>valid denominator
-   punctuation character</a> in the contents of the element, and
-   the <code title=attr-meter-value><a href=#attr-meter-value>value</a></code>, <code title=attr-meter-min><a href=#attr-meter-min>min</a></code>, and <code title=attr-meter-max><a href=#attr-meter-max>max</a></code> attributes are all omitted</dt>
+   <dt>There is exactly one number followed by a denomination
+   punctuation character in the contents of the element, and the <code title=attr-meter-value><a href=#attr-meter-value>value</a></code>, <code title=attr-meter-min><a href=#attr-meter-min>min</a></code>, and <code title=attr-meter-max><a href=#attr-meter-max>max</a></code> attributes are all omitted</dt>
 
    <dd>
 
@@ -16591,6 +16592,9 @@
     the <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> attribute's value must
     be less than or equal to the value of the <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> attribute.</p>
 
+    <p>There must not be more than one number in the contents of the
+    element.</p>
+
    </dd>
 
    <dt>There is exactly one number in the contents of the element, and
@@ -16624,14 +16628,30 @@
     the <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> attribute's value must
     be less than or equal to the value of the <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> attribute.</p>
 
+    <p>If there is a number in the contents of the element, it must
+    not be followed by a denominator punctuation character.</p>
+
    </dd>
 
   </dl><p>For the purposes of these requirements, a number is a sequence of
   characters in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE
-  (9), optionally including with a single U+002E FULL STOP character
-  (.), and separated from other numbers by at least one character that
-  isn't any of those; interpreted as a base ten number.</p>
+  (9), optionally including a single U+002E FULL STOP character (.) in
+  some position after the first digit, interpreted as a base ten
+  number. Numbers must be separated from other numbers by at least one
+  character that isn't any of the aforementioned. In addition, the
+  contents of the element must not contain any U+002E FULL STOP
+  characters (.) that aren't part of numbers.</p>
 
+  <p>A number if said to be followed by a <a href=#valid-denominator-punctuation-character title="valid
+  denominator punctuation character">denominator punctuation
+  character</a> if it is followed by zero or more
+  <a href=#white_space>White_Space</a> characters and a <a href=#valid-denominator-punctuation-character>valid denominator
+  punctuation character</a>.</p>
+
+  <p>The contents of the element consist of the concatenation of
+  the <a href=#text-node title="text node">text nodes</a> of all the descendants
+  of the element, in <a href=#tree-order>tree order</a>.</p>
+
   <p>The <code title=attr-meter-value><a href=#attr-meter-value>value</a></code>, <code title=attr-meter-min><a href=#attr-meter-min>min</a></code>, <code title=attr-meter-low><a href=#attr-meter-low>low</a></code>, <code title=attr-meter-high><a href=#attr-meter-high>high</a></code>, <code title=attr-meter-max><a href=#attr-meter-max>max</a></code>, and <code title=attr-meter-optimum><a href=#attr-meter-optimum>optimum</a></code> attributes, when present,
   must have values that are <a href=#valid-floating-point-number title="valid floating point
   number">valid floating point numbers</a>.</p>

Modified: source
===================================================================
--- source	2009-09-03 09:41:16 UTC (rev 3735)
+++ source	2009-09-03 10:39:29 UTC (rev 3736)
@@ -17767,12 +17767,14 @@
     be less than or equal to the value of the <code
     title="attr-meter-high">high</code> attribute.</p>
 
+    <p>The numbers in the contents of the element must not be followed
+    by denomination punctuation characters.</p>
+
    </dd>
 
-   <dt>There is exactly one number followed by zero or more
-   <span>White_Space</span> characters and a <span>valid denominator
-   punctuation character</span> in the contents of the element, and
-   the <code title="attr-meter-value">value</code>, <code
+   <dt>There is exactly one number followed by a denomination
+   punctuation character in the contents of the element, and the <code
+   title="attr-meter-value">value</code>, <code
    title="attr-meter-min">min</code>, and <code
    title="attr-meter-max">max</code> attributes are all omitted</dt>
 
@@ -17792,6 +17794,9 @@
     be less than or equal to the value of the <code
     title="attr-meter-high">high</code> attribute.</p>
 
+    <p>There must not be more than one number in the contents of the
+    element.</p>
+
    </dd>
 
    <dt>There is exactly one number in the contents of the element, and
@@ -17832,16 +17837,32 @@
     be less than or equal to the value of the <code
     title="attr-meter-high">high</code> attribute.</p>
 
+    <p>If there is a number in the contents of the element, it must
+    not be followed by a denominator punctuation character.</p>
+
    </dd>
 
   </dl>
 
   <p>For the purposes of these requirements, a number is a sequence of
   characters in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE
-  (9), optionally including with a single U+002E FULL STOP character
-  (.), and separated from other numbers by at least one character that
-  isn't any of those; interpreted as a base ten number.</p>
+  (9), optionally including a single U+002E FULL STOP character (.) in
+  some position after the first digit, interpreted as a base ten
+  number. Numbers must be separated from other numbers by at least one
+  character that isn't any of the aforementioned. In addition, the
+  contents of the element must not contain any U+002E FULL STOP
+  characters (.) that aren't part of numbers.</p>
 
+  <p>A number if said to be followed by a <span title="valid
+  denominator punctuation character">denominator punctuation
+  character</span> if it is followed by zero or more
+  <span>White_Space</span> characters and a <span>valid denominator
+  punctuation character</span>.</p>
+
+  <p>The contents of the element consist of the concatenation of
+  the <span title="text node">text nodes</span> of all the descendants
+  of the element, in <span>tree order</span>.</p>
+
   <p>The <code title="attr-meter-value">value</code>, <code
   title="attr-meter-min">min</code>, <code
   title="attr-meter-low">low</code>, <code