html5/spec Overview.html,1.2909,1.2910

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv6705

Modified Files:
	Overview.html 
Log Message:
Define the rules for <meter>'s contents better. (whatwg r3736)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2909
retrieving revision 1.2910
diff -u -d -r1.2909 -r1.2910
--- Overview.html	3 Sep 2009 09:38:15 -0000	1.2909
+++ Overview.html	3 Sep 2009 10:36:25 -0000	1.2910
@@ -14452,12 +14452,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>
 
@@ -14472,6 +14473,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
@@ -14505,13 +14509,25 @@
     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>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,
+  (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>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>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>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 class="note">If no minimum or maximum is specified, then the
   range is assumed to be 0..1, and the value thus has to be within

Received on Thursday, 3 September 2009 10:36:37 UTC