- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 17 Aug 2011 19:46:26 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv10424
Modified Files:
content-models.html spec.html the-button-element.html
Log Message:
Make this text actually make sense. (whatwg r6488)
[updated by splitter]
Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- content-models.html 16 Aug 2011 05:46:26 -0000 1.85
+++ content-models.html 17 Aug 2011 19:46:24 -0000 1.86
@@ -937,10 +937,55 @@
algorithm.</p><p>The aforementioned restrictions are defined by specifying that
certain parts of documents form <a href="#bidirectional-algorithm-formatting-character-ranges">bidirectional-algorithm
formatting character ranges</a>, and then imposing a requirement
- on such ranges.</p><p>The string resulting from the concatenation of the data of all of
- an <a href="infrastructure.html#html-elements" title="HTML elements">HTML element</a>'s <a href="infrastructure.html#text-node" title="text node">text nodes</a>, if any, is a <a href="#bidirectional-algorithm-formatting-character-ranges" title="bidirectional-algorithm formatting character
- ranges">bidirectional-algorithm formatting character
- range</a>.</p><p>The value of a namespace-less attribute of an <a href="infrastructure.html#html-elements" title="HTML
+ on such ranges.</p><p>The strings resulting from the applying the following algorithm
+ to an <a href="infrastructure.html#html-elements" title="HTML elements">HTML element</a> <var title="">element</var> are <a href="#bidirectional-algorithm-formatting-character-ranges">bidirectional-algorithm formatting
+ character ranges</a>:</p><ol><li><p>Let <var title="">output</var> be an empty list of strings.</p></li>
+
+ <li><p>Let <var title="">string</var> be an empty string.</p></li>
+
+ <li><p>Let <var title="">node</var> be the first child node of <var title="">element</var>, if any, or null otherwise.</p></li>
+
+
+ <li><p><i>Loop</i>: If <var title="">node</var> is null, jump to
+ the step labeled <i>end</i>.</p></li>
+
+ <li>
+
+ <p>Process <var title="">node</var> according to the first
+ matching step from the following list:</p>
+
+ <dl class="switch"><dt>If <var title="">node</var> is a <a href="infrastructure.html#text-node">text node</a></dt>
+
+ <dd><p>Append the text data of <var title="">node</var> to <var title="">string</var>.</p></dd>
+
+
+ <dt>If <var title="">node</var> is an <a href="infrastructure.html#html-elements" title="HTML elements">HTML element</a> that is <a href="#flow-content">flow content</a> but that is not also <a href="#phrasing-content">phrasing content</a></dt>
+
+ <dd><p>If <var title="">string</var> is not the empty string,
+ push <var title="">string</var> onto <var title="">output</var>,
+ and let <var title="">string</var> be empty string.</p></dd>
+
+
+ <dt>Otherwise</dt>
+
+ <dd>Do nothing.</dd>
+
+ </dl></li>
+
+ <li><p>Let <var title="">node</var> be <var title="">node</var>'s
+ next sibling, if any, or null otherwise.</p></li>
+
+ <li><p>Jump to the step labeled <i>loop</i>.</p></li>
+
+
+ <li><p><i>End</i>: If <var title="">string</var> is not the empty
+ string, push <var title="">string</var> onto <var title="">output</var>.</p></li>
+
+ <li><p>Return <var title="">output</var> as the
+ <a href="#bidirectional-algorithm-formatting-character-ranges">bidirectional-algorithm formatting character
+ ranges</a>.</p></li>
+
+ </ol><p>The value of a namespace-less attribute of an <a href="infrastructure.html#html-elements" title="HTML
elements">HTML element</a> is a <a href="#bidirectional-algorithm-formatting-character-ranges" title="bidirectional-algorithm formatting character
ranges">bidirectional-algorithm formatting character
range</a>.</p><p>Any strings that, as described above, are
@@ -955,11 +1000,11 @@
rlo = %x202E ; U+202E RIGHT-TO-LEFT OVERRIDE
pdf = %x202C ; U+202C POP DIRECTIONAL FORMATTING
plaintext = *( %x0000-2029 / %x202F-10FFFF )
- ; any string with no bidirectional-algorithm formatting characters</pre><p class="note">For convenience, where possible authors will likely
- prefer to use the <code title="attr-dir"><a href="elements.html#the-dir-attribute">dir</a></code> attribute, the
- <code><a href="text-level-semantics.html#the-bdo-element">bdo</a></code> element, and the <code><a href="text-level-semantics.html#the-bdi-element">bdi</a></code> element, rather
- than maintaining the bidirectional-algorithm formatting characters
- manually.</p><h4 id="wai-aria"><span class="secno">3.2.7 </span><dfn>WAI-ARIA</dfn></h4><p>Authors may use the ARIA <code title="attr-aria-role">role</code>
+ ; any string with no bidirectional-algorithm formatting characters</pre><p class="note">Authors are encouraged to use the <code title="attr-dir"><a href="elements.html#the-dir-attribute">dir</a></code> attribute, the <code><a href="text-level-semantics.html#the-bdo-element">bdo</a></code> element,
+ and the <code><a href="text-level-semantics.html#the-bdi-element">bdi</a></code> element, rather than maintaining the
+ bidirectional-algorithm formatting characters manually. The
+ bidirectional-algorithm formatting characters interact poorly with
+ CSS.</p><h4 id="wai-aria"><span class="secno">3.2.7 </span><dfn>WAI-ARIA</dfn></h4><p>Authors may use the ARIA <code title="attr-aria-role">role</code>
and <code title="attr-aria-*">aria-*</code> attributes on <a href="infrastructure.html#html-elements">HTML
elements</a>, in accordance with the requirements described in
the ARIA specifications, except where these conflict with the
Index: the-button-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-button-element.html,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- the-button-element.html 16 Aug 2011 04:47:06 -0000 1.84
+++ the-button-element.html 17 Aug 2011 19:46:24 -0000 1.85
@@ -2190,11 +2190,14 @@
<dd>
<p>If the <code title="attr-meter-max"><a href="#attr-meter-max">max</a></code> attribute is
- specified and a value could be parsed out of it, the maximum value
- is that value. Otherwise, the maximum value is 1.0.</p>
+ specified and a value could be parsed out of it, then the
+ candidate maximum value is that value. Otherwise, the candidate
+ maximum value is 1.0.</p>
- <p>If the maximum value would be less than the minimum value, then
- the maximum value is actually the same as the minimum value.</p>
+ <p>If the candidate maximum value is greater than or equal to the
+ minimum value, then the maximum value is the candidate maximum
+ value. Otherwise, the maximum value is the same as the minimum
+ value.</p>
</dd>
@@ -2204,13 +2207,16 @@
<p>If the <code title="attr-meter-value"><a href="#attr-meter-value">value</a></code> attribute is
specified and a value could be parsed out of it, then that value
- is the actual value. Otherwise, the actual value is zero.</p>
+ is the candidate actual value. Otherwise, the candidate actual
+ value is zero.</p>
- <p>If the actual value would be less than the minimum value, then
- the actual value is actually the same as the minimum value.</p>
+ <p>If the candidate actual value is less than the minimum value,
+ then the actual value is the minimum value.</p>
- <p>If, on the other hand, the actual value would be greater than
- the maximum value, then the actual value is the maximum value.</p>
+ <p>Otherwise, if the candidate actual value is greater than the
+ maximum value, then the actual value is the maximum value.</p>
+
+ <p>Otherwise, the actual value is the candidate actual value.</p>
</dd>
@@ -2219,14 +2225,17 @@
<dd>
<p>If the <code title="attr-meter-low"><a href="#attr-meter-low">low</a></code> attribute is
- specified and a value could be parsed out of it, then the low
- boundary is that value. Otherwise, the low boundary is the same as
- the minimum value.</p>
+ specified and a value could be parsed out of it, then the
+ candidate low boundary is that value. Otherwise, the candidate low
+ boundary is the same as the minimum value.</p>
- <p>If the low boundary is then less than the minimum value, then
- the low boundary is actually the same as the minimum
- value. Similarly, if the low boundary is greater than the maximum
- value, then it is actually the maximum value instead.</p>
+ <p>If the candidate low boundary is less than the minimum value,
+ then the low boundary is the minimum value.</p>
+
+ <p>Otherwise, if the candidate low boundary is greater than the
+ maximum value, then the low boundary is the maximum value.</p>
+
+ <p>Otherwise, the low boundary is the candidate low boundary.</p>
</dd>
@@ -2235,14 +2244,17 @@
<dd>
<p>If the <code title="attr-meter-high"><a href="#attr-meter-high">high</a></code> attribute is
- specified and a value could be parsed out of it, then the high
- boundary is that value. Otherwise, the high boundary is the same
- as the maximum value.</p>
+ specified and a value could be parsed out of it, then the
+ candidate high boundary is that value. Otherwise, the candidate
+ high boundary is the same as the maximum value.</p>
- <p>If the high boundary is then less than the low boundary, then
- the high boundary is actually the same as the low
- boundary. Similarly, if the high boundary is greater than the
- maximum value, then it is actually the maximum value instead.</p>
+ <p>If the candidate high boundary is less than the low boundary,
+ then the high boundary is the low boundary.</p>
+
+ <p>Otherwise, if the candidate high boundary is greater than the
+ maximum value, then the high boundary is the maximum value.</p>
+
+ <p>Otherwise, the high boundary is the candidate high boundary.</p>
</dd>
@@ -2252,13 +2264,18 @@
<p>If the <code title="attr-meter-optimum"><a href="#attr-meter-optimum">optimum</a></code>
attribute is specified and a value could be parsed out of it, then
- the optimum point is that value. Otherwise, the optimum point is
- the midpoint between the minimum value and the maximum value.</p>
+ the candidate optimum point is that value. Otherwise, the
+ candidate optimum point is the midpoint between the minimum value
+ and the maximum value.</p>
- <p>If the optimum point is then less than the minimum value, then
- the optimum point is actually the same as the minimum
- value. Similarly, if the optimum point is greater than the maximum
- value, then it is actually the maximum value instead.</p>
+ <p>If the candidate optimum point is less than the minimum value,
+ then the optimum point is the minimum value.</p>
+
+ <p>Otherwise, if the candidate optimum point is greater than the
+ maximum value, then the optimum point is the maximum value.</p>
+
+ <p>Otherwise, the optimum point is the candidate optimum
+ point.</p>
</dd>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1635
retrieving revision 1.1636
diff -u -d -r1.1635 -r1.1636
--- spec.html 17 Aug 2011 05:46:37 -0000 1.1635
+++ spec.html 17 Aug 2011 19:46:24 -0000 1.1636
@@ -350,7 +350,7 @@
<a href="Overview.html">single page HTML</a>,
<a href="spec.html">multipage HTML</a>,
<a href="author/">web developer edition</a>.
-This is revision 1.5188.
+This is revision 1.5190.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2011 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Wednesday, 17 August 2011 19:46:28 UTC