- From: poot <cvsmail@w3.org>
- Date: Wed, 23 Sep 2009 21:52:58 +0900 (JST)
- To: public-html-diffs@w3.org
hixie: Apparently 'tool bar' isn't right. (whatwg r3980)
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.3141&r2=1.3142&f=h
http://html5.org/tools/web-apps-tracker?from=3979&to=3980
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3141
retrieving revision 1.3142
diff -u -d -r1.3141 -r1.3142
--- Overview.html 23 Sep 2009 08:36:09 -0000 1.3141
+++ Overview.html 23 Sep 2009 12:52:26 -0000 1.3142
@@ -739,9 +739,9 @@
<li><a href="#menus"><span class="secno">4.11.3 </span>The <code>menu</code> element</a>
<ol>
<li><a href="#menus-intro"><span class="secno">4.11.3.1 </span>Introduction</a></li>
- <li><a href="#building-menus-and-tool-bars"><span class="secno">4.11.3.2 </span>Building menus and tool bars</a></li>
+ <li><a href="#building-menus-and-toolbars"><span class="secno">4.11.3.2 </span>Building menus and toolbars</a></li>
<li><a href="#context-menus"><span class="secno">4.11.3.3 </span>Context menus</a></li>
- <li><a href="#tool-bars"><span class="secno">4.11.3.4 </span>Tool bars</a></ol></li>
+ <li><a href="#toolbars"><span class="secno">4.11.3.4 </span>Toolbars</a></ol></li>
<li><a href="#commands"><span class="secno">4.11.4 </span>Commands</a>
<ol>
<li><a href="#using-the-a-element-to-define-a-command"><span class="secno">4.11.4.1 </span>Using the <code>a</code> element to define a command</a></li>
@@ -1145,7 +1145,7 @@
<li><a href="#images-0"><span class="secno">11.3.2 </span>Images</a></li>
<li><a href="#attributes-for-embedded-content-and-images"><span class="secno">11.3.3 </span>Attributes for embedded content and images</a></li>
<li><a href="#image-maps-0"><span class="secno">11.3.4 </span>Image maps</a></li>
- <li><a href="#tool-bars-0"><span class="secno">11.3.5 </span>Tool bars</a></ol></li>
+ <li><a href="#toolbars-0"><span class="secno">11.3.5 </span>Toolbars</a></ol></li>
<li><a href="#bindings"><span class="secno">11.4 </span>Bindings</a>
<ol>
<li><a href="#introduction-8"><span class="secno">11.4.1 </span>Introduction</a></li>
@@ -7711,7 +7711,7 @@
<li><code><a href="#the-input-element">input</a></code> (if the <code title="attr-input-type"><a href="#attr-input-type">type</a></code> attribute is <em>not</em> in the <a href="#hidden-state" title="attr-input-type-hidden">Hidden</a> state)</li>
<li><code><a href="#the-keygen-element">keygen</a></code></li>
<li><code><a href="#the-label-element">label</a></code></li>
- <li><code><a href="#menus">menu</a></code> (if the <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#tool-bar-state" title="tool bar state">tool bar</a> state)</li>
+ <li><code><a href="#menus">menu</a></code> (if the <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state)</li>
<li><code><a href="#the-object-element">object</a></code> (if the <code title="attr-hyperlink-usemap"><a href="#attr-hyperlink-usemap">usemap</a></code> attribute is present)<!-- see also comment in <object> section --></li>
<li><code><a href="#the-select-element">select</a></code></li>
<li><code><a href="#the-textarea-element">textarea</a></code></li>
@@ -8118,7 +8118,7 @@
<tr><td><code><a href="#menus">menu</a></code> element with a <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute in the <a href="#list-state" title="list state">list</a> state
<td><code title="attr-aria-role-menu">menu</code> role
- <tr><td><code><a href="#menus">menu</a></code> element with a <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute in the <a href="#tool-bar-state" title="tool bar state">tool bar</a> state
+ <tr><td><code><a href="#menus">menu</a></code> element with a <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state
<td><code title="attr-aria-role-toolbar">toolbar</code> role
<tr><td><code><a href="#the-nav-element">nav</a></code> element
@@ -13428,7 +13428,7 @@
otherwise have been placed, if it had been relevant.<p>The <code title="attr-hyperlink-target"><a href="#attr-hyperlink-target">target</a></code>, <code title="attr-hyperlink-ping"><a href="#ping">ping</a></code>, <code title="attr-hyperlink-rel"><a href="#attr-hyperlink-rel">rel</a></code>, <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code>, <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code>, and <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> attributes must be omitted
if the <code title="attr-hyperlink-href"><a href="#attr-hyperlink-href">href</a></code> attribute is
not present.<div class="example">
- <p>If a site uses a consistent navigation tool bar on every page,
+ <p>If a site uses a consistent navigation toolbar on every page,
then the link that would normally link to the page itself could be
marked up using an <code><a href="#the-a-element">a</a></code> element:</p>
<pre><nav>
@@ -37736,7 +37736,7 @@
</div><p class="note"><code><a href="#the-command">command</a></code> elements are not rendered
unless they <a href="#menus" title="menu">form part of a menu</a>.<h4 id="menus"><span class="secno">4.11.3 </span>The <dfn><code>menu</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Working draft</i><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd>If the element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#tool-bar-state" title="tool bar state">tool bar</a> state: <a href="#interactive-content">Interactive content</a>.</dd>
+ <dd>If the element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state: <a href="#interactive-content">Interactive content</a>.</dd>
<dt>Contexts in which this element may be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -37757,15 +37757,15 @@
being declared. The attribute has three states. The <code title="attr-menu-type-context">context</code> keyword maps to the
<dfn id="context-menu-state" title="context menu state">context menu</dfn> state, in which
the element is declaring a context menu. The <code title="attr-menu-type-toolbar">toolbar</code> keyword maps to the
- <dfn id="tool-bar-state" title="tool bar state">tool bar</dfn> state, in which the
- element is declaring a tool bar. The attribute may also be
+ <dfn id="toolbar-state" title="toolbar state">toolbar</dfn> state, in which the
+ element is declaring a toolbar. The attribute may also be
omitted. The <i>missing value default</i> is the <dfn id="list-state" title="list
state">list</dfn> state, which indicates that the element is merely
a list of commands that is neither declaring a context menu nor
- defining a tool bar.<p>If a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#context-menu-state" title="context menu state">context menu</a> state, then the
+ defining a toolbar.<p>If a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#context-menu-state" title="context menu state">context menu</a> state, then the
element <a href="#represents">represents</a> the commands of a context menu, and
the user can only interact with the commands if that context menu is
- activated.<p>If a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#tool-bar-state" title="tool bar state">tool bar</a> state, then the element
+ activated.<p>If a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state, then the element
<a href="#represents">represents</a> a list of active commands that the user can
immediately interact with.<p>If a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#list-state" title="list state">list</a> state, then the element either
<a href="#represents">represents</a> an unordered list of items (each represented
@@ -37783,7 +37783,7 @@
name.</p>
</div><h5 id="menus-intro"><span class="secno">4.11.3.1 </span>Introduction</h5><p><i>This section is non-normative.</i><p>The <code><a href="#menus">menu</a></code> element is used to define context menus and
- tool bars.<p>For example, the following represents a toolbar with three menu
+ toolbars.<p>For example, the following represents a toolbar with three menu
buttons on it, each of which has a dropdown menu with a series of
options:<pre><menu type="toolbar">
<li>
@@ -37833,9 +37833,9 @@
the <code><a href="#menus">menu</a></code> element or of its <code><a href="#the-li-element">li</a></code>
children.<div class="impl">
- <h5 id="building-menus-and-tool-bars"><span class="secno">4.11.3.2 </span><dfn>Building menus and tool bars</dfn></h5>
+ <h5 id="building-menus-and-toolbars"><span class="secno">4.11.3.2 </span><dfn>Building menus and toolbars</dfn></h5>
- <p>A menu (or tool bar) consists of a list of zero or more of the
+ <p>A menu (or toolbar) consists of a list of zero or more of the
following components:</p>
<ul class="brief"><li><a href="#concept-command" title="concept-command">Commands</a>, which can be marked as default commands</li>
@@ -37942,8 +37942,8 @@
<!-- v2: include modifier key information -->
<p>The default action of <em>this</em> event is that the user agent
- must show a context menu <a href="#building-menus-and-tool-bars" title="building menus and tool
- bars">built</a> from the <code><a href="#menus">menu</a></code> element.</p>
+ must show a context menu <a href="#building-menus-and-toolbars" title="building menus and
+ toolbars">built</a> from the <code><a href="#menus">menu</a></code> element.</p>
<p>The user agent may also provide access to its default context
menu, if any, with the context menu shown. For example, it could
@@ -37972,16 +37972,16 @@
</div><div class="impl">
- <h5 id="tool-bars"><span class="secno">4.11.3.4 </span><dfn>Tool bars</dfn></h5>
+ <h5 id="toolbars"><span class="secno">4.11.3.4 </span><dfn>Toolbars</dfn></h5>
- <p>When a <code><a href="#menus">menu</a></code> element has a <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute in the <a href="#tool-bar-state" title="tool bar state">tool bar</a> state, then the user agent
- must <a href="#building-menus-and-tool-bars" title="building menus and tool bars">build</a> the
+ <p>When a <code><a href="#menus">menu</a></code> element has a <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state, then the user agent
+ must <a href="#building-menus-and-toolbars" title="building menus and toolbars">build</a> the
menu for that <code><a href="#menus">menu</a></code> element, and use the result in the
rendering.</p>
<p>The user agent must reflect changes made to the
- <code><a href="#menus">menu</a></code>'s DOM, by immediately <a href="#building-menus-and-tool-bars" title="building menus
- and tool bars">rebuilding</a> the menu.</p>
+ <code><a href="#menus">menu</a></code>'s DOM, by immediately <a href="#building-menus-and-toolbars" title="building menus
+ and toolbars">rebuilding</a> the menu.</p>
</div><h4 id="commands"><span class="secno">4.11.4 </span>Commands</h4><p>A <dfn id="concept-command" title="concept-command">command</dfn> is the abstraction
behind menu items, buttons, and links.<!--v2COMMAND: Once a command
@@ -43974,7 +43974,7 @@
<dt><var title="">window</var> . <code title="dom-window-toolbar"><a href="#dom-window-toolbar">toolbar</a></code> . <code title="dom-BarProp-visible"><a href="#dom-barprop-visible">visible</a></code></dt>
<dd>
- <p>Returns true if the tool bar is visible; otherwise, returns false.</p>
+ <p>Returns true if the toolbar is visible; otherwise, returns false.</p>
</dd>
</dl><div class="impl">
@@ -44023,7 +44023,7 @@
interface element was absent (i.e. its <code title="dom-BarProp-visible"><a href="#dom-barprop-visible">visible</a></code> attribute may return
false).</dd>
- <dt><dfn id="the-tool-bar-barprop-object">The tool bar <code>BarProp</code> object</dfn></dt>
+ <dt><dfn id="the-toolbar-barprop-object">The toolbar <code>BarProp</code> object</dfn></dt>
<dd>Represents the user interface element found immediately above
or before the document, as appropriate for the <a href="#default-view">default
@@ -44053,7 +44053,7 @@
object</a>.</p>
<p>The <dfn id="dom-window-toolbar" title="dom-window-toolbar"><code>toolbar</code></dfn>
- attribute must return <a href="#the-tool-bar-barprop-object">the tool bar <code>BarProp</code>
+ attribute must return <a href="#the-toolbar-barprop-object">the toolbar <code>BarProp</code>
object</a>.</p>
<!--
@@ -66129,15 +66129,15 @@
</div><div class="impl">
- <h4 id="tool-bars-0"><span class="secno">11.3.5 </span>Tool bars</h4>
+ <h4 id="toolbars-0"><span class="secno">11.3.5 </span>Toolbars</h4>
- <p>When a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#tool-bar-state" title="tool bar state">tool bar</a> state, the element is
+ <p>When a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state, the element is
expected to be treated as a replaced element with a height about two
lines high and a width derived from the contents of the element.</p>
<p>The element is expected to have, by default, the appearance of a
- tool bar on the user agent's platform. It is expected to contain the
- menu that is <a href="#building-menus-and-tool-bars" title="building menus and tool bars">built</a>
+ toolbar on the user agent's platform. It is expected to contain the
+ menu that is <a href="#building-menus-and-toolbars" title="building menus and toolbars">built</a>
from the element.</p>
<p class="example XXX">...example with screenshot...</p>
Received on Wednesday, 23 September 2009 12:53:35 UTC