[html5] r4956 - / images

whatwg at whatwg.org whatwg at whatwg.org
Fri Apr 2 00:16:27 PDT 2010


Author: ianh
Date: 2010-04-02 00:16:25 -0700 (Fri, 02 Apr 2010)
New Revision: 4956

Modified:
   complete.html
   images/content-venn.svg
   index
   source
Log:
[ac] (0) Make <wbr> valid.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9350

Modified: complete.html
===================================================================
--- complete.html	2010-04-02 06:30:56 UTC (rev 4955)
+++ complete.html	2010-04-02 07:16:25 UTC (rev 4956)
@@ -435,17 +435,18 @@
      <li><a href=#the-p-element><span class=secno>4.5.1 </span>The <code>p</code> element</a></li>
      <li><a href=#the-hr-element><span class=secno>4.5.2 </span>The <code>hr</code> element</a></li>
      <li><a href=#the-br-element><span class=secno>4.5.3 </span>The <code>br</code> element</a></li>
-     <li><a href=#the-pre-element><span class=secno>4.5.4 </span>The <code>pre</code> element</a></li>
-     <li><a href=#the-blockquote-element><span class=secno>4.5.5 </span>The <code>blockquote</code> element</a></li>
-     <li><a href=#the-ol-element><span class=secno>4.5.6 </span>The <code>ol</code> element</a></li>
-     <li><a href=#the-ul-element><span class=secno>4.5.7 </span>The <code>ul</code> element</a></li>
-     <li><a href=#the-li-element><span class=secno>4.5.8 </span>The <code>li</code> element</a></li>
-     <li><a href=#the-dl-element><span class=secno>4.5.9 </span>The <code>dl</code> element</a></li>
-     <li><a href=#the-dt-element><span class=secno>4.5.10 </span>The <code>dt</code> element</a></li>
-     <li><a href=#the-dd-element><span class=secno>4.5.11 </span>The <code>dd</code> element</a></li>
-     <li><a href=#the-figure-element><span class=secno>4.5.12 </span>The <code>figure</code> element</a></li>
-     <li><a href=#the-figcaption-element><span class=secno>4.5.13 </span>The <code>figcaption</code> element</a></li>
-     <li><a href=#the-div-element><span class=secno>4.5.14 </span>The <code>div</code> element</a></ol></li>
+     <li><a href=#the-wbr-element><span class=secno>4.5.4 </span>The <code>wbr</code> element</a></li>
+     <li><a href=#the-pre-element><span class=secno>4.5.5 </span>The <code>pre</code> element</a></li>
+     <li><a href=#the-blockquote-element><span class=secno>4.5.6 </span>The <code>blockquote</code> element</a></li>
+     <li><a href=#the-ol-element><span class=secno>4.5.7 </span>The <code>ol</code> element</a></li>
+     <li><a href=#the-ul-element><span class=secno>4.5.8 </span>The <code>ul</code> element</a></li>
+     <li><a href=#the-li-element><span class=secno>4.5.9 </span>The <code>li</code> element</a></li>
+     <li><a href=#the-dl-element><span class=secno>4.5.10 </span>The <code>dl</code> element</a></li>
+     <li><a href=#the-dt-element><span class=secno>4.5.11 </span>The <code>dt</code> element</a></li>
+     <li><a href=#the-dd-element><span class=secno>4.5.12 </span>The <code>dd</code> element</a></li>
+     <li><a href=#the-figure-element><span class=secno>4.5.13 </span>The <code>figure</code> element</a></li>
+     <li><a href=#the-figcaption-element><span class=secno>4.5.14 </span>The <code>figcaption</code> element</a></li>
+     <li><a href=#the-div-element><span class=secno>4.5.15 </span>The <code>div</code> element</a></ol></li>
    <li><a href=#text-level-semantics><span class=secno>4.6 </span>Text-level semantics</a>
     <ol>
      <li><a href=#the-a-element><span class=secno>4.6.1 </span>The <code>a</code> element</a></li>
@@ -9610,6 +9611,7 @@
    <li><code><a href=#the-ul-element>ul</a></code></li>
    <li><code><a href=#the-var-element>var</a></code></li>
    <li><code><a href=#video>video</a></code></li>
+   <li><code><a href=#the-wbr-element>wbr</a></code></li>
    <li><a href=#text-content title="text content">Text</a></li>
   </ul><p>As a general rule, elements whose content model allows any
   <a href=#flow-content>flow content</a> should have either at least one descendant
@@ -9721,6 +9723,7 @@
    <li><code><a href=#the-time-element>time</a></code></li>
    <li><code><a href=#the-var-element>var</a></code></li>
    <li><code><a href=#video>video</a></code></li>
+   <li><code><a href=#the-wbr-element>wbr</a></code></li>
    <li><a href=#text-content title="text content">Text</a></li>
   </ul><p>As a general rule, elements whose content model allows any
   <a href=#phrasing-content>phrasing content</a> should have either at least one
@@ -16050,10 +16053,47 @@
   </div>
 
 
-  <h4 id=the-pre-element><span class=secno>4.5.4 </span>The <dfn><code>pre</code></dfn> element</h4>
+  <h4 id=the-wbr-element><span class=secno>4.5.4 </span>The <dfn><code>wbr</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dt>Contexts in which this element may be used:</dt>
+   <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd>Empty.</dd>
+   <dt>Content attributes:</dt>
+   <dd><a href=#global-attributes>Global attributes</a></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
+  </dl><p>The <code><a href=#the-wbr-element>wbr</a></code> element <a href=#represents>represents</a> a line break
+  opportunity.</p>
+
+  <div class=example>
+
+   <p>In the following example, someone is quoted as saying something
+   which, for effect, is written as one long word. However, to ensure
+   that the text can be wrapped in a readable fashion, the individual
+   words in the quote are separated using a <code><a href=#the-wbr-element>wbr</a></code>
+   element.</p>
+
+   <pre><p>So then he pointed at the tiger and screamed
+"there<wbr>is<wbr>no<wbr>way<wbr>you<wbr>are<wbr>ever<wbr>going<wbr>to<wbr>catch<wbr>me"!</p></pre>
+
+  </div>
+
+  <div class=impl>
+
+  <p>Any content inside <code><a href=#the-wbr-element>wbr</a></code> elements must not be
+  considered part of the surrounding text.</p>
+
+  </div>
+
+
+  <h4 id=the-pre-element><span class=secno>4.5.5 </span>The <dfn><code>pre</code></dfn> element</h4>
+
+  <dl class=element><dt>Categories</dt>
+   <dd><a href=#flow-content>Flow content</a>.</dd>
    <dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
@@ -16155,7 +16195,7 @@
 
 
 
-  <h4 id=the-blockquote-element><span class=secno>4.5.5 </span>The <dfn><code>blockquote</code></dfn> element</h4>
+  <h4 id=the-blockquote-element><span class=secno>4.5.6 </span>The <dfn><code>blockquote</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16264,7 +16304,7 @@
 
 
 
-  <h4 id=the-ol-element><span class=secno>4.5.6 </span>The <dfn><code>ol</code></dfn> element</h4>
+  <h4 id=the-ol-element><span class=secno>4.5.7 </span>The <dfn><code>ol</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16366,7 +16406,7 @@
   </div>
 
 
-  <h4 id=the-ul-element><span class=secno>4.5.7 </span>The <dfn><code>ul</code></dfn> element</h4>
+  <h4 id=the-ul-element><span class=secno>4.5.8 </span>The <dfn><code>ul</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16421,7 +16461,7 @@
   </div>
 
 
-  <h4 id=the-li-element><span class=secno>4.5.8 </span>The <dfn><code>li</code></dfn> element</h4>
+  <h4 id=the-li-element><span class=secno>4.5.9 </span>The <dfn><code>li</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16519,7 +16559,7 @@
 
 
 
-  <h4 id=the-dl-element><span class=secno>4.5.9 </span>The <dfn><code>dl</code></dfn> element</h4>
+  <h4 id=the-dl-element><span class=secno>4.5.10 </span>The <dfn><code>dl</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16670,7 +16710,7 @@
 
 
 
-  <h4 id=the-dt-element><span class=secno>4.5.10 </span>The <dfn><code>dt</code></dfn> element</h4>
+  <h4 id=the-dt-element><span class=secno>4.5.11 </span>The <dfn><code>dt</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16713,7 +16753,7 @@
 
 
 
-  <h4 id=the-dd-element><span class=secno>4.5.11 </span>The <dfn><code>dd</code></dfn> element</h4>
+  <h4 id=the-dd-element><span class=secno>4.5.12 </span>The <dfn><code>dd</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16751,7 +16791,7 @@
   </div>
 
 
-  <h4 id=the-figure-element><span class=secno>4.5.12 </span>The <dfn><code>figure</code></dfn> element</h4>
+  <h4 id=the-figure-element><span class=secno>4.5.13 </span>The <dfn><code>figure</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16881,7 +16921,7 @@
   </div>
 
 
-  <h4 id=the-figcaption-element><span class=secno>4.5.13 </span>The <dfn><code>figcaption</code></dfn> element</h4>
+  <h4 id=the-figcaption-element><span class=secno>4.5.14 </span>The <dfn><code>figcaption</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16900,7 +16940,7 @@
 
 
 
-  <h4 id=the-div-element><span class=secno>4.5.14 </span>The <dfn><code>div</code></dfn> element</h4>
+  <h4 id=the-div-element><span class=secno>4.5.15 </span>The <dfn><code>div</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -72795,7 +72835,7 @@
    <code><a href=#the-col-element>col</a></code>, <code><a href=#the-command>command</a></code>, <code><a href=#the-embed-element>embed</a></code>,
    <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>,
    <code><a href=#the-keygen-element>keygen</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>,
-   <code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code></dd>
+   <code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code>, <code><a href=#the-wbr-element>wbr</a></code></dd>
 
    <dt><dfn id=raw-text-elements>Raw text elements</dfn></dt>
 
@@ -74581,7 +74621,7 @@
    <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>, <code><a href=#the-tbody-element>tbody</a></code>,
    <code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-thead-element>thead</a></code>,
    <code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>,
-   <code><a href=#wbr>wbr</a></code>, and <code><a href=#xmp>xmp</a></code>.</dd>
+   <code><a href=#the-wbr-element>wbr</a></code>, and <code><a href=#xmp>xmp</a></code>.</dd>
 
    <dt><dfn id=scoping>Scoping</dfn></dt>
    <dd><p>The following HTML elements introduce new <a href=#has-an-element-in-scope title="has
@@ -81058,7 +81098,7 @@
         <code><a href=#the-embed-element>embed</a></code>, <code><a href=#frame>frame</a></code>, <code><a href=#the-hr-element>hr</a></code>,
         <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#the-keygen-element>keygen</a></code>,
         <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>, <code><a href=#the-param-element>param</a></code>, or
-        <code><a href=#wbr>wbr</a></code> element, then continue on to the next child
+        <code><a href=#the-wbr-element>wbr</a></code> element, then continue on to the next child
         node at this point.</p> <!-- also, i guess: image and isindex,
         but we don't list those because we don't consider those
         "elements", more "macros", and thus we should never serialize
@@ -82568,7 +82608,7 @@
   error, a default value of 1px is expected to be used for that
   property instead.</p>
 
-  <p>The <code><a href=#wbr>wbr</a></code> element is expected to override the
+  <p>The <code><a href=#the-wbr-element>wbr</a></code> element is expected to override the
   'white-space' property and always provide a line-breaking
   opportunity.</p>
 
@@ -84191,7 +84231,6 @@
    <dt><dfn id=strike><code>strike</code></dfn></dt>
    <dt><dfn id=tt><code>tt</code></dfn></dt>
    <dt><dfn id=u><code>u</code></dfn></dt>
-   <dt><dfn id=wbr><code>wbr</code></dfn></dt>
 
    <dd>
 
@@ -87186,6 +87225,14 @@
          <code title=attr-dim-width><a href=#attr-dim-width>width</a></code>;
          <code title=attr-dim-height><a href=#attr-dim-height>height</a></code></td>
      <td><code><a href=#htmlvideoelement>HTMLVideoElement</a></code></td>
+    <tr><th><code><a href=#the-wbr-element>wbr</a></code></th>
+     <td>Line breaking opportunity</td>
+     <td><a href=#flow-content title="Flow content">flow</a>;
+         <a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td>empty</td>
+     <td><a href=#global-attributes title="global attributes">globals</a></td>
+     <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     </table><p>An asterisk (*) in a cell indicates that the actual rules are more complicated than indicated in the table above.</p>
 
 
@@ -87292,6 +87339,7 @@
       <code><a href=#the-ul-element>ul</a></code>;
       <code><a href=#the-var-element>var</a></code>;
       <code><a href=#video>video</a></code>;
+      <code><a href=#the-wbr-element>wbr</a></code>;
       <a href=#text-content title="text content">Text</a>
      <td>
       <code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element);
@@ -87367,6 +87415,7 @@
       <code><a href=#the-time-element>time</a></code>;
       <code><a href=#the-var-element>var</a></code>;
       <code><a href=#video>video</a></code>;
+      <code><a href=#the-wbr-element>wbr</a></code>;
       <a href=#text-content title="text content">Text</a>
      <td>
       <code><a href=#the-a-element>a</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
@@ -88863,6 +88912,9 @@
     <tr><td> <code><a href=#video>video</a></code>
      <td> <code><a href=#htmlvideoelement>HTMLVideoElement</a></code> : <code><a href=#htmlmediaelement>HTMLMediaElement</a></code> : <code><a href=#htmlelement>HTMLElement</a></code>
 
+    <tr><td> <code><a href=#the-wbr-element>wbr</a></code>
+     <td> <code><a href=#htmlelement>HTMLElement</a></code>
+
   </table><h2 class=no-num id=references>References</h2><!--REFS-->
 
   <p>All references are normative unless marked "Non-normative".</p>

Modified: images/content-venn.svg
===================================================================
--- images/content-venn.svg	2010-04-02 06:30:56 UTC (rev 4955)
+++ images/content-venn.svg	2010-04-02 07:16:25 UTC (rev 4956)
@@ -100,6 +100,7 @@
      <li><code>ul</code></li>
      <li><code>var</code></li>
      <li><code>video</code></li>
+     <li><code>wbr</code></li>
      <li><span>Text*</span></li>
     </ul>
     <p>* Under certain circumstances (see prose).</p>
@@ -242,6 +243,7 @@
      <li><code>time</code></li>
      <li><code>var</code></li>
      <li><code>video</code></li>
+     <li><code>wbr</code></li>
      <li><span title="text content">Text</span>*</li>
     </ul>
     <p>* Under certain circumstances; see prose.</p>

Modified: index
===================================================================
--- index	2010-04-02 06:30:56 UTC (rev 4955)
+++ index	2010-04-02 07:16:25 UTC (rev 4956)
@@ -444,17 +444,18 @@
      <li><a href=#the-p-element><span class=secno>4.5.1 </span>The <code>p</code> element</a></li>
      <li><a href=#the-hr-element><span class=secno>4.5.2 </span>The <code>hr</code> element</a></li>
      <li><a href=#the-br-element><span class=secno>4.5.3 </span>The <code>br</code> element</a></li>
-     <li><a href=#the-pre-element><span class=secno>4.5.4 </span>The <code>pre</code> element</a></li>
-     <li><a href=#the-blockquote-element><span class=secno>4.5.5 </span>The <code>blockquote</code> element</a></li>
-     <li><a href=#the-ol-element><span class=secno>4.5.6 </span>The <code>ol</code> element</a></li>
-     <li><a href=#the-ul-element><span class=secno>4.5.7 </span>The <code>ul</code> element</a></li>
-     <li><a href=#the-li-element><span class=secno>4.5.8 </span>The <code>li</code> element</a></li>
-     <li><a href=#the-dl-element><span class=secno>4.5.9 </span>The <code>dl</code> element</a></li>
-     <li><a href=#the-dt-element><span class=secno>4.5.10 </span>The <code>dt</code> element</a></li>
-     <li><a href=#the-dd-element><span class=secno>4.5.11 </span>The <code>dd</code> element</a></li>
-     <li><a href=#the-figure-element><span class=secno>4.5.12 </span>The <code>figure</code> element</a></li>
-     <li><a href=#the-figcaption-element><span class=secno>4.5.13 </span>The <code>figcaption</code> element</a></li>
-     <li><a href=#the-div-element><span class=secno>4.5.14 </span>The <code>div</code> element</a></ol></li>
+     <li><a href=#the-wbr-element><span class=secno>4.5.4 </span>The <code>wbr</code> element</a></li>
+     <li><a href=#the-pre-element><span class=secno>4.5.5 </span>The <code>pre</code> element</a></li>
+     <li><a href=#the-blockquote-element><span class=secno>4.5.6 </span>The <code>blockquote</code> element</a></li>
+     <li><a href=#the-ol-element><span class=secno>4.5.7 </span>The <code>ol</code> element</a></li>
+     <li><a href=#the-ul-element><span class=secno>4.5.8 </span>The <code>ul</code> element</a></li>
+     <li><a href=#the-li-element><span class=secno>4.5.9 </span>The <code>li</code> element</a></li>
+     <li><a href=#the-dl-element><span class=secno>4.5.10 </span>The <code>dl</code> element</a></li>
+     <li><a href=#the-dt-element><span class=secno>4.5.11 </span>The <code>dt</code> element</a></li>
+     <li><a href=#the-dd-element><span class=secno>4.5.12 </span>The <code>dd</code> element</a></li>
+     <li><a href=#the-figure-element><span class=secno>4.5.13 </span>The <code>figure</code> element</a></li>
+     <li><a href=#the-figcaption-element><span class=secno>4.5.14 </span>The <code>figcaption</code> element</a></li>
+     <li><a href=#the-div-element><span class=secno>4.5.15 </span>The <code>div</code> element</a></ol></li>
    <li><a href=#text-level-semantics><span class=secno>4.6 </span>Text-level semantics</a>
     <ol>
      <li><a href=#the-a-element><span class=secno>4.6.1 </span>The <code>a</code> element</a></li>
@@ -9508,6 +9509,7 @@
    <li><code><a href=#the-ul-element>ul</a></code></li>
    <li><code><a href=#the-var-element>var</a></code></li>
    <li><code><a href=#video>video</a></code></li>
+   <li><code><a href=#the-wbr-element>wbr</a></code></li>
    <li><a href=#text-content title="text content">Text</a></li>
   </ul><p>As a general rule, elements whose content model allows any
   <a href=#flow-content>flow content</a> should have either at least one descendant
@@ -9619,6 +9621,7 @@
    <li><code><a href=#the-time-element>time</a></code></li>
    <li><code><a href=#the-var-element>var</a></code></li>
    <li><code><a href=#video>video</a></code></li>
+   <li><code><a href=#the-wbr-element>wbr</a></code></li>
    <li><a href=#text-content title="text content">Text</a></li>
   </ul><p>As a general rule, elements whose content model allows any
   <a href=#phrasing-content>phrasing content</a> should have either at least one
@@ -15948,10 +15951,47 @@
   </div>
 
 
-  <h4 id=the-pre-element><span class=secno>4.5.4 </span>The <dfn><code>pre</code></dfn> element</h4>
+  <h4 id=the-wbr-element><span class=secno>4.5.4 </span>The <dfn><code>wbr</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dt>Contexts in which this element may be used:</dt>
+   <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd>Empty.</dd>
+   <dt>Content attributes:</dt>
+   <dd><a href=#global-attributes>Global attributes</a></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
+  </dl><p>The <code><a href=#the-wbr-element>wbr</a></code> element <a href=#represents>represents</a> a line break
+  opportunity.</p>
+
+  <div class=example>
+
+   <p>In the following example, someone is quoted as saying something
+   which, for effect, is written as one long word. However, to ensure
+   that the text can be wrapped in a readable fashion, the individual
+   words in the quote are separated using a <code><a href=#the-wbr-element>wbr</a></code>
+   element.</p>
+
+   <pre><p>So then he pointed at the tiger and screamed
+"there<wbr>is<wbr>no<wbr>way<wbr>you<wbr>are<wbr>ever<wbr>going<wbr>to<wbr>catch<wbr>me"!</p></pre>
+
+  </div>
+
+  <div class=impl>
+
+  <p>Any content inside <code><a href=#the-wbr-element>wbr</a></code> elements must not be
+  considered part of the surrounding text.</p>
+
+  </div>
+
+
+  <h4 id=the-pre-element><span class=secno>4.5.5 </span>The <dfn><code>pre</code></dfn> element</h4>
+
+  <dl class=element><dt>Categories</dt>
+   <dd><a href=#flow-content>Flow content</a>.</dd>
    <dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
@@ -16053,7 +16093,7 @@
 
 
 
-  <h4 id=the-blockquote-element><span class=secno>4.5.5 </span>The <dfn><code>blockquote</code></dfn> element</h4>
+  <h4 id=the-blockquote-element><span class=secno>4.5.6 </span>The <dfn><code>blockquote</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16162,7 +16202,7 @@
 
 
 
-  <h4 id=the-ol-element><span class=secno>4.5.6 </span>The <dfn><code>ol</code></dfn> element</h4>
+  <h4 id=the-ol-element><span class=secno>4.5.7 </span>The <dfn><code>ol</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16264,7 +16304,7 @@
   </div>
 
 
-  <h4 id=the-ul-element><span class=secno>4.5.7 </span>The <dfn><code>ul</code></dfn> element</h4>
+  <h4 id=the-ul-element><span class=secno>4.5.8 </span>The <dfn><code>ul</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16319,7 +16359,7 @@
   </div>
 
 
-  <h4 id=the-li-element><span class=secno>4.5.8 </span>The <dfn><code>li</code></dfn> element</h4>
+  <h4 id=the-li-element><span class=secno>4.5.9 </span>The <dfn><code>li</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16417,7 +16457,7 @@
 
 
 
-  <h4 id=the-dl-element><span class=secno>4.5.9 </span>The <dfn><code>dl</code></dfn> element</h4>
+  <h4 id=the-dl-element><span class=secno>4.5.10 </span>The <dfn><code>dl</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16568,7 +16608,7 @@
 
 
 
-  <h4 id=the-dt-element><span class=secno>4.5.10 </span>The <dfn><code>dt</code></dfn> element</h4>
+  <h4 id=the-dt-element><span class=secno>4.5.11 </span>The <dfn><code>dt</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16611,7 +16651,7 @@
 
 
 
-  <h4 id=the-dd-element><span class=secno>4.5.11 </span>The <dfn><code>dd</code></dfn> element</h4>
+  <h4 id=the-dd-element><span class=secno>4.5.12 </span>The <dfn><code>dd</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16649,7 +16689,7 @@
   </div>
 
 
-  <h4 id=the-figure-element><span class=secno>4.5.12 </span>The <dfn><code>figure</code></dfn> element</h4>
+  <h4 id=the-figure-element><span class=secno>4.5.13 </span>The <dfn><code>figure</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16779,7 +16819,7 @@
   </div>
 
 
-  <h4 id=the-figcaption-element><span class=secno>4.5.13 </span>The <dfn><code>figcaption</code></dfn> element</h4>
+  <h4 id=the-figcaption-element><span class=secno>4.5.14 </span>The <dfn><code>figcaption</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd>None.</dd>
@@ -16798,7 +16838,7 @@
 
 
 
-  <h4 id=the-div-element><span class=secno>4.5.14 </span>The <dfn><code>div</code></dfn> element</h4>
+  <h4 id=the-div-element><span class=secno>4.5.15 </span>The <dfn><code>div</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -66067,7 +66107,7 @@
    <code><a href=#the-col-element>col</a></code>, <code><a href=#the-command>command</a></code>, <code><a href=#the-embed-element>embed</a></code>,
    <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>,
    <code><a href=#the-keygen-element>keygen</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>,
-   <code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code></dd>
+   <code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code>, <code><a href=#the-wbr-element>wbr</a></code></dd>
 
    <dt><dfn id=raw-text-elements>Raw text elements</dfn></dt>
 
@@ -67853,7 +67893,7 @@
    <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>, <code><a href=#the-tbody-element>tbody</a></code>,
    <code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-thead-element>thead</a></code>,
    <code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>,
-   <code><a href=#wbr>wbr</a></code>, and <code><a href=#xmp>xmp</a></code>.</dd>
+   <code><a href=#the-wbr-element>wbr</a></code>, and <code><a href=#xmp>xmp</a></code>.</dd>
 
    <dt><dfn id=scoping>Scoping</dfn></dt>
    <dd><p>The following HTML elements introduce new <a href=#has-an-element-in-scope title="has
@@ -74330,7 +74370,7 @@
         <code><a href=#the-embed-element>embed</a></code>, <code><a href=#frame>frame</a></code>, <code><a href=#the-hr-element>hr</a></code>,
         <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#the-keygen-element>keygen</a></code>,
         <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>, <code><a href=#the-param-element>param</a></code>, or
-        <code><a href=#wbr>wbr</a></code> element, then continue on to the next child
+        <code><a href=#the-wbr-element>wbr</a></code> element, then continue on to the next child
         node at this point.</p> <!-- also, i guess: image and isindex,
         but we don't list those because we don't consider those
         "elements", more "macros", and thus we should never serialize
@@ -75840,7 +75880,7 @@
   error, a default value of 1px is expected to be used for that
   property instead.</p>
 
-  <p>The <code><a href=#wbr>wbr</a></code> element is expected to override the
+  <p>The <code><a href=#the-wbr-element>wbr</a></code> element is expected to override the
   'white-space' property and always provide a line-breaking
   opportunity.</p>
 
@@ -77463,7 +77503,6 @@
    <dt><dfn id=strike><code>strike</code></dfn></dt>
    <dt><dfn id=tt><code>tt</code></dfn></dt>
    <dt><dfn id=u><code>u</code></dfn></dt>
-   <dt><dfn id=wbr><code>wbr</code></dfn></dt>
 
    <dd>
 
@@ -80458,6 +80497,14 @@
          <code title=attr-dim-width><a href=#attr-dim-width>width</a></code>;
          <code title=attr-dim-height><a href=#attr-dim-height>height</a></code></td>
      <td><code><a href=#htmlvideoelement>HTMLVideoElement</a></code></td>
+    <tr><th><code><a href=#the-wbr-element>wbr</a></code></th>
+     <td>Line breaking opportunity</td>
+     <td><a href=#flow-content title="Flow content">flow</a>;
+         <a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+     <td>empty</td>
+     <td><a href=#global-attributes title="global attributes">globals</a></td>
+     <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     </table><p>An asterisk (*) in a cell indicates that the actual rules are more complicated than indicated in the table above.</p>
 
 
@@ -80564,6 +80611,7 @@
       <code><a href=#the-ul-element>ul</a></code>;
       <code><a href=#the-var-element>var</a></code>;
       <code><a href=#video>video</a></code>;
+      <code><a href=#the-wbr-element>wbr</a></code>;
       <a href=#text-content title="text content">Text</a>
      <td>
       <code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element);
@@ -80639,6 +80687,7 @@
       <code><a href=#the-time-element>time</a></code>;
       <code><a href=#the-var-element>var</a></code>;
       <code><a href=#video>video</a></code>;
+      <code><a href=#the-wbr-element>wbr</a></code>;
       <a href=#text-content title="text content">Text</a>
      <td>
       <code><a href=#the-a-element>a</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
@@ -82135,6 +82184,9 @@
     <tr><td> <code><a href=#video>video</a></code>
      <td> <code><a href=#htmlvideoelement>HTMLVideoElement</a></code> : <code><a href=#htmlmediaelement>HTMLMediaElement</a></code> : <code><a href=#htmlelement>HTMLElement</a></code>
 
+    <tr><td> <code><a href=#the-wbr-element>wbr</a></code>
+     <td> <code><a href=#htmlelement>HTMLElement</a></code>
+
   </table><!-- (only has events from HTML5) --><h3 class=no-num id=events-0>Events</h3>
 
   <p><i>This section is non-normative.</i></p>

Modified: source
===================================================================
--- source	2010-04-02 06:30:56 UTC (rev 4955)
+++ source	2010-04-02 07:16:25 UTC (rev 4956)
@@ -3,10 +3,11 @@
  !   Adding a new element involves editing the following sections:
  !    - description of the element's categories
  !    - images/content-venn.svg
- !    - element, attribute, content model, and interface indexes
+ !    - syntax, if it's void or otherwise special
  !    - parser
  !    - rendering
  !    - obsolete section
+ !    - element, attribute, content model, and interface indexes
  !
  !-->
 <!--START validation-->
@@ -9679,6 +9680,7 @@
    <li><code>ul</code></li>
    <li><code>var</code></li>
    <li><code>video</code></li>
+   <li><code>wbr</code></li>
    <li><span title="text content">Text</span></li>
   </ul>
 
@@ -9803,6 +9805,7 @@
    <li><code>time</code></li>
    <li><code>var</code></li>
    <li><code>video</code></li>
+   <li><code>wbr</code></li>
    <li><span title="text content">Text</span></li>
   </ul>
 
@@ -16936,6 +16939,46 @@
   </div>
 
 
+  <h4>The <dfn><code>wbr</code></dfn> element</h4>
+
+  <dl class="element">
+   <dt>Categories</dt>
+   <dd><span>Flow content</span>.</dd>
+   <dd><span>Phrasing content</span>.</dd>
+   <dt>Contexts in which this element may be used:</dt>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd>Empty.</dd>
+   <dt>Content attributes:</dt>
+   <dd><span>Global attributes</span></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code>HTMLElement</code>.</dd>
+  </dl>
+
+  <p>The <code>wbr</code> element <span>represents</span> a line break
+  opportunity.</p>
+
+  <div class="example">
+
+   <p>In the following example, someone is quoted as saying something
+   which, for effect, is written as one long word. However, to ensure
+   that the text can be wrapped in a readable fashion, the individual
+   words in the quote are separated using a <code>wbr</code>
+   element.</p>
+
+   <pre><p>So then he pointed at the tiger and screamed
+"there<wbr>is<wbr>no<wbr>way<wbr>you<wbr>are<wbr>ever<wbr>going<wbr>to<wbr>catch<wbr>me"!</p></pre>
+
+  </div>
+
+  <div class="impl">
+
+  <p>Any content inside <code>wbr</code> elements must not be
+  considered part of the surrounding text.</p>
+
+  </div>
+
+
   <h4>The <dfn><code>pre</code></dfn> element</h4>
 
   <dl class="element">
@@ -82954,7 +82997,7 @@
    <code>col</code>, <code>command</code>, <code>embed</code>,
    <code>hr</code>, <code>img</code>, <code>input</code>,
    <code>keygen</code>, <code>link</code>, <code>meta</code>,
-   <code>param</code>, <code>source</code></dd>
+   <code>param</code>, <code>source</code>, <code>wbr</code></dd>
 
    <dt><dfn>Raw text elements</dfn></dt>
 
@@ -95877,7 +95920,6 @@
    <dt><dfn><code>strike</code></dfn></dt>
    <dt><dfn><code>tt</code></dfn></dt>
    <dt><dfn><code>u</code></dfn></dt>
-   <dt><dfn><code>wbr</code></dfn></dt>
 
    <dd>
 
@@ -99540,6 +99582,17 @@
      <td><code>HTMLVideoElement</code></td>
     </tr>
 
+    <tr>
+     <th><code>wbr</code></th>
+     <td>Line breaking opportunity</td>
+     <td><span title="Flow content">flow</span>;
+         <span title="Phrasing content">phrasing</span></td>
+     <td><span title="Phrasing content">phrasing</span></td>
+     <td>empty</td>
+     <td><span title="global attributes">globals</span></td>
+     <td><code>HTMLElement</code></td>
+    </tr>
+
   </table>
   <p>An asterisk (*) in a cell indicates that the actual rules are more complicated than indicated in the table above.</p>
 
@@ -99653,6 +99706,7 @@
       <code>ul</code>;
       <code>var</code>;
       <code>video</code>;
+      <code>wbr</code>;
       <span title="text content">Text</span>
      <td>
       <code>area</code> (if it is a descendant of a <code>map</code> element);
@@ -99731,6 +99785,7 @@
       <code>time</code>;
       <code>var</code>;
       <code>video</code>;
+      <code>wbr</code>;
       <span title="text content">Text</span>
      <td>
       <code>a</code> (if it contains only <span>phrasing content</span>);
@@ -101562,6 +101617,10 @@
      <td> <code>video</code>
      <td> <code>HTMLVideoElement</code> : <code>HTMLMediaElement</code> : <code>HTMLElement</code>
 
+    <tr>
+     <td> <code>wbr</code>
+     <td> <code>HTMLElement</code>
+
   </table>
 
 <!--END complete--><!-- (only has events from HTML5) -->




More information about the Commit-Watchers mailing list