- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 30 Nov 2008 07:08:38 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv19184
Modified Files:
Overview.html
Log Message:
Define authoring requirements for <meter> and <progress> in more detail; add v2 note for <credit>. (whatwg r2484)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1654
retrieving revision 1.1655
diff -u -d -r1.1654 -r1.1655
--- Overview.html 30 Nov 2008 00:56:22 -0000 1.1654
+++ Overview.html 30 Nov 2008 07:08:35 -0000 1.1655
@@ -10323,7 +10323,7 @@
have a value greater than zero. The <code title=attr-progress-value><a href=#attr-progress-value>value</a></code> attribute, if present, must
have a value equal to or greater than zero, and less than or equal
to the value of the <code title=attr-progress-max><a href=#attr-progress-max>max</a></code>
- attribute, if present.<p class=note>The <code><a href=#the-progress-element>progress</a></code> element is the wrong
+ attribute, if present, or 1, otherwise.<p class=note>The <code><a href=#the-progress-element>progress</a></code> element is the wrong
element to use for something that is just a gauge, as opposed to
task progress. For instance, indicating disk space usage using
<code><a href=#the-progress-element>progress</a></code> would be inappropriate. Instead, the
@@ -10455,15 +10455,84 @@
as two numbers (the higher number represents the maximum, the other
number the current value, and the minimum is assumed to be zero), or
as a percentage or similar (using one of the characters such as
- "%"), or as a fraction.<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 are all
- optional. When present, they must have values that are <a href=#valid-floating-point-number title="valid floating point number">valid floating point
- numbers</a>, and their values must satisfy the following
- inequalities:<ul class=brief><li><code title=attr-meter-min><a href=#attr-meter-min>min</a></code> ≤ <code title=attr-meter-value><a href=#attr-meter-value>value</a></code> ≤ <code title=attr-meter-max><a href=#attr-meter-max>max</a></code></li>
- <li><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></li>
- <li><code title=attr-meter-min><a href=#attr-meter-min>min</a></code> ≤ <code title=attr-meter-optimum><a href=#attr-meter-optimum>optimum</a></code> ≤ <code title=attr-meter-max><a href=#attr-meter-max>max</a></code></li>
- </ul><p>All <code><a href=#the-meter-element>meter</a></code> elements must have a value specified
- somehow, either using the <code title=attr-meter-value><a href=#attr-meter-value>value</a></code> attribute or by including a
- number in the contents of the element.<p class=note>If no minimum or maximum is specified, then the
+ "%"), or as a fraction. However, it is also possible to use the
+ attributes to specify these values.<p>One of the following conditions, along with all the requirements
+ that are listed with that condition, must be met:<dl><dt>There are exactly two numbers 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>
+
+ <p>If specified, the <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>, and <code title=attr-meter-optimum><a href=#attr-meter-optimum>optimum</a></code> attributes must have
+ values greater than or equal to zero and less than or equal to the
+ bigger of the two numbers in the contents of the element.</p>
+
+ <p>If both the <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> and <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> attributes are specified, then
+ 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>
+
+ </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>
+
+ <dd>
+
+ <p>If specified, the <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>, and <code title=attr-meter-optimum><a href=#attr-meter-optimum>optimum</a></code> attributes must have
+ values greater than or equal to zero and less than or equal to the
+ <a href=#values-associated-with-denominator-punctuation-characters title="values associated with denominator punctuation
+ characters">value associated with the denominator punctuation
+ character</a>.</p>
+
+ <p>If both the <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> and <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> attributes are specified, then
+ 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>
+
+ </dd>
+
+ <dt>There is exactly one number in the contents of the element, and
+ the <code title=attr-meter-value><a href=#attr-meter-value>value</a></code> attribute is
+ omitted</dt>
+
+ <dt>There are no numbers in the contents of the element, and the
+ <code title=attr-meter-value><a href=#attr-meter-value>value</a></code> attribute is
+ specified.</dt>
+
+ <dd>
+
+ <p>If the <code title=attr-meter-min><a href=#attr-meter-min>min</a></code> attribute
+ attribute is specified, then the <var title="">minimum</var> is
+ that attribue's value; otherwise, it is 0.</p>
+
+ <p>If the <code title=attr-meter-max><a href=#attr-meter-max>max</a></code> attribute
+ attribute is specified, then the <var title="">maximum</var> is
+ that attribue's value; otherwise, it is 1.</p>
+
+ <p>If there is exactly one number in the contents of the element,
+ then <var title="">value</var> is that number; otherwise, <var title="">value</var> is the value of the <code title=attr-meter-value><a href=#attr-meter-value>value</a></code> attribute.</p>
+
+ <p>The following inequalities must hold, as applicable:</p>
+
+ <ul class=brief><li><var title="">minimum</var> ≤ <var title="">value</var> ≤ <var title="">maximum</var></li>
+ <li><var title="">minimum</var> ≤ <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> ≤ <var title="">maximum</var> (if <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> is specified)</li>
+ <li><var title="">minimum</var> ≤ <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> ≤ <var title="">maximum</var> (if <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> is specified)</li>
+ <li><var title="">minimum</var> ≤ <code title=attr-meter-optimum><a href=#attr-meter-optimum>optimum</a></code> ≤ <var title="">maximum</var> (if <code title=attr-meter-optimum><a href=#attr-meter-optimum>optimum</a></code> is specified)</li>
+ </ul><p>If both the <code title=attr-meter-low><a href=#attr-meter-low>low</a></code> and <code title=attr-meter-high><a href=#attr-meter-high>high</a></code> attributes are specified, then
+ 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>
+
+ </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,
+ 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
that range.<div class=example>
@@ -11383,7 +11452,7 @@
<dd>None.</dd>
<dt>DOM interface:</dt>
<dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
- </dl><p>The <code><a href=#the-figure-element>figure</a></code> element represents some <a href=#flow-content-0>flow
+ </dl><!-- v2: Add a <credit> element for photo credits --><p>The <code><a href=#the-figure-element>figure</a></code> element represents some <a href=#flow-content-0>flow
content</a>, optionally with a caption, which can be moved away
from the main flow of the document without affecting the document's
meaning.<p>The element can thus be used to annotate illustrations, diagrams,
Received on Sunday, 30 November 2008 07:08:56 UTC