[ac] (0) Rename <header> to <hgroup> and restrict it just to supporti…

…ng subheadings. git-svn-id: http://svn.whatwg.org/webapps@3039 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Apr 30, 2009 · 7e9b2d1 · 7e9b2d1
1 parent e7ba60f
commit 7e9b2d1
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 96 deletions.
diff --git a/index b/index
@@ -384,7 +384,7 @@
   <code>h3</code>, <code>h4</code>,
   <code>h5</code>, and <code>h6</code>
   elements</a></li>
-     <li><a href=#the-header-element><span class=secno>4.4.7 </span>The <code>header</code> element</a></li>
+     <li><a href=#the-hgroup-element><span class=secno>4.4.7 </span>The <code>hgroup</code> element</a></li>
      <li><a href=#the-footer-element><span class=secno>4.4.8 </span>The <code>footer</code> element</a></li>
      <li><a href=#the-address-element><span class=secno>4.4.9 </span>The <code>address</code> element</a></li>
      <li><a href=#headings-and-sections><span class=secno>4.4.10 </span>Headings and sections</a>
@@ -7723,14 +7723,14 @@ interface <dfn id=htmldocument>HTMLDocument</dfn> {
  &lt;h2&gt;Leading the way in widget design since 1432&lt;/h2&gt;
  ...</pre>
 
-   <p>The <code><a href=#the-header-element>header</a></code> element should be used in these kinds of
+   <p>The <code><a href=#the-hgroup-element>hgroup</a></code> element should be used in these kinds of
    situations:</p>
 
    <pre>&lt;body&gt;
- &lt;header&gt;
+ &lt;hgroup&gt;
   &lt;h1&gt;ABC Company&lt;/h1&gt;
   &lt;h2&gt;Leading the way in widget design since 1432&lt;/h2&gt;
- &lt;/header&gt;
+ &lt;/hgroup&gt;
  ...</pre>
 
   </div>
@@ -12128,10 +12128,10 @@ not-slash     = %x0000-002E / %x0030-%10FFFF
    Web page) about apples, containing two short sections.</p>
 
    <pre>&lt;article&gt;
- &lt;header&gt;
+ &lt;hgroup&gt;
   &lt;h1&gt;Apples&lt;/h1&gt;
-  &lt;p&gt;Tasty, delicious fruit!&lt;/p&gt;
- &lt;/header&gt;
+  &lt;h2&gt;Tasty, delicious fruit!&lt;/h2&gt;
+ &lt;/hgroup&gt;
  &lt;p&gt;The apple is the pomaceous fruit of the apple tree.&lt;/p&gt;
  &lt;section&gt;
   &lt;h1&gt;Red Delicious&lt;/h1&gt;
@@ -12182,12 +12182,12 @@ not-slash     = %x0000-002E / %x0030-%10FFFF
    navigation section.</p>
 
    <pre>&lt;body&gt;
- &lt;header&gt;
+ <!--&lt;header>-->
   &lt;h1&gt;Wake up sheeple!&lt;/h1&gt;
   &lt;p&gt;&lt;a href="news.html"&gt;News&lt;/a&gt; -
      &lt;a href="blog.html"&gt;Blog&lt;/a&gt; -
      &lt;a href="forums.html"&gt;Forums&lt;/a&gt;&lt;/p&gt;
- &lt;/header&gt;
+ <!--&lt;/header>-->
  &lt;nav&gt;
   &lt;h1&gt;Navigation&lt;/h1&gt;
   &lt;ul&gt;
@@ -12344,47 +12344,41 @@ isn't his only passion. He also enjoys other pleasures.&lt;/p&gt;
   elements with the same name have equal rank.</p>
 
 
-  <h4 id=the-header-element><span class=secno>4.4.7 </span>The <dfn><code>header</code></dfn> element</h4>
+  <h4 id=the-hgroup-element><span class=secno>4.4.7 </span>The <dfn><code>hgroup</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dd><a href=#heading-content-0>Heading content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#flow-content-0>flow content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#flow-content-0>Flow content</a>, including at least one descendant
-   that is <a href=#heading-content-0>heading content</a>, but no <a href=#sectioning-content-0>sectioning
-   content</a> descendants, no <code><a href=#the-header-element>header</a></code> element
-   descendants, and no <code><a href=#the-footer-element>footer</a></code> element descendants.</dd>
+   <dd>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and/or <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements.</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-header-element>header</a></code> element <a href=#represents>represents</a> the
-  header of a section. The element is typically used to group a set of
+  </dl><p>The <code><a href=#the-hgroup-element>hgroup</a></code> element <a href=#represents>represents</a> the
+  header of a section. The element is used to group a set of
   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>&ndash;<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements to mark up a page's
-  title with its subtitle or tagline. However, <code><a href=#the-header-element>header</a></code>
-  elements may contain more than just the section's headings and
-  subheadings &mdash; for example it would be reasonable for the
-  header to include version history information.
+  title with its subtitle or tagline.</p>
 
   <p>For the purposes of document summaries, outlines, and the like,
-  the text of <code><a href=#the-header-element>header</a></code> elements is defined to be the text
+  the text of <code><a href=#the-hgroup-element>hgroup</a></code> elements is defined to be the text
   of the highest <a href=#rank title=rank>ranked</a>
   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>&ndash;<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> element descendant of the
-  <code><a href=#the-header-element>header</a></code> element, if there are any such elements, and the
+  <code><a href=#the-hgroup-element>hgroup</a></code> element, if there are any such elements, and the
   first such element if there are multiple elements with that
   <a href=#rank>rank</a>. If there are no such elements, then the text of
-  the <code><a href=#the-header-element>header</a></code> element is the empty string.</p>
+  the <code><a href=#the-hgroup-element>hgroup</a></code> element is the empty string.</p>
 
-  <p>Other heading elements in the <code><a href=#the-header-element>header</a></code> element
+  <p>Other heading elements in the <code><a href=#the-hgroup-element>hgroup</a></code> element
   indicate subheadings or subtitles.</p>
 
-  <p>The <a href=#rank>rank</a> of a <code><a href=#the-header-element>header</a></code> element is the
+  <p>The <a href=#rank>rank</a> of a <code><a href=#the-hgroup-element>hgroup</a></code> element is the
   same as for an <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code> element (the highest rank).</p>
 
   <p>The section on <a href=#headings-and-sections>headings and sections</a>
-  defines how <code><a href=#the-header-element>header</a></code> elements are assigned to individual
+  defines how <code><a href=#the-hgroup-element>hgroup</a></code> elements are assigned to individual
   sections.</p>
 
   <div class=example>
@@ -12394,24 +12388,31 @@ isn't his only passion. He also enjoys other pleasures.&lt;/p&gt;
    header in an application extracting header data and ignoring
    subheadings.</p>
 
-   <pre>&lt;header&gt;
+   <pre>&lt;hgroup&gt;
  &lt;h1&gt;<strong>The reality dysfunction</strong>&lt;/h1&gt;
  &lt;h2&gt;Space is not the only void&lt;/h2&gt;
-&lt;/header&gt;</pre>
+&lt;/hgroup&gt;</pre>
 
-   <pre>&lt;header&gt;
+   <pre>&lt;hgroup&gt;
  &lt;h1&gt;<strong>Dr. Strangelove</strong>&lt;/h1&gt;
  &lt;h2&gt;Or: How I Learned to Stop Worrying and Love the Bomb&lt;/h2&gt;
-&lt;/header&gt;</pre>
+&lt;/hgroup&gt;</pre>
+
+<!--
+  The <code>header</code> element may contain more than just the
+  section's headings and subheadings &mdash; for example it would be
+  reasonable for the header to include version history information.
 
    <pre>&lt;header&gt;
  &lt;p&gt;Welcome to...&lt;/p&gt;
  &lt;h1&gt;<strong>Voidwars!</strong>&lt;/h1&gt;
 &lt;/header&gt;</pre>
 
    <pre>&lt;header&gt;
- &lt;h1&gt;<strong>Scalable Vector Graphics (SVG) 1.2</strong>&lt;/h1&gt;
- &lt;h2&gt;W3C Working Draft 27 October 2004&lt;/h2&gt;
+ &lt;hgroup&gt;
+  &lt;h1&gt;<strong>Scalable Vector Graphics (SVG) 1.2</strong>&lt;/h1&gt;
+  &lt;h2&gt;W3C Working Draft 27 October 2004&lt;/h2&gt;
+ &lt;/hgroup&gt;
  &lt;dl&gt;
   &lt;dt&gt;This version:&lt;/dt&gt;
   &lt;dd&gt;&lt;a href="http://www.w3.org/TR/2004/WD-SVG12-20041027/"&gt;http://www.w3.org/TR/2004/WD-SVG12-20041027/&lt;/a&gt;&lt;/dd&gt;
@@ -12428,6 +12429,7 @@ isn't his only passion. He also enjoys other pleasures.&lt;/p&gt;
  &lt;/dl&gt;
  &lt;p class="copyright"&gt;&lt;a href="http://www.w3.org/Consortium/Legal/ipr-notic <em>...</em>
 &lt;/header&gt;</pre>
+-->
   </div>
 
 
@@ -12465,10 +12467,10 @@ isn't his only passion. He also enjoys other pleasures.&lt;/p&gt;
 
    <pre>&lt;body&gt;
  &lt;footer&gt;&lt;a href="../"&gt;Back to index...&lt;/a&gt;&lt;/footer&gt;
- &lt;header&gt;
+ &lt;hgroup&gt;
   &lt;h1&gt;Lorem ipsum&lt;/h1&gt;
   &lt;h2&gt;The ipsum of all lorems&lt;/h2&gt;
- &lt;/header&gt;
+ &lt;/hgroup&gt;
  &lt;p&gt;A dolor sit amet, consectetur adipisicing elit, sed do eiusmod
  tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
  veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex
@@ -12552,7 +12554,7 @@ isn't his only passion. He also enjoys other pleasures.&lt;/p&gt;
   <h4 id=headings-and-sections><span class=secno>4.4.10 </span><dfn>Headings and sections</dfn></h4>
 
   <p>The <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>&ndash;<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements and the
-  <code><a href=#the-header-element>header</a></code> element are headings.</p>
+  <code><a href=#the-hgroup-element>hgroup</a></code> element are headings.</p>
 
   <p>The first element of <a href=#heading-content-0>heading content</a> in an element
   of <a href=#sectioning-content-0>sectioning content</a> <a href=#represents>represents</a> the
@@ -17466,33 +17468,35 @@ document.write(), passes data to the Tokenizer."&gt;</strong>&lt;/p&gt;</pre>
   it means; the icon is supposed to be self-explanatory. In those
   cases, an equivalent textual label must be given in the <code title=attr-img-alt><a href=#attr-img-alt>alt</a></code> attribute.</p>
 
-  <div class=example>
+<!--
+  <div class="example">
 
    <p>Here, posts on a news site are labeled with an icon
    indicating their topic.</p>
 
-   <pre>&lt;body&gt;
- &lt;article&gt;
-  &lt;header&gt;
-   &lt;h1&gt;Ratatouille wins &lt;i&gt;Best Movie of the Year&lt;/i&gt; award&lt;/h1&gt;
-   &lt;p&gt;<strong>&lt;img src="movies.png" alt="Movies"&gt;</strong>&lt;/p&gt;
-  &lt;/header&gt;
-  &lt;p&gt;Pixar has won yet another &lt;i&gt;Best Movie of the Year&lt;/i&gt; award,
-  making this its 8th win in the last 12 years.&lt;/p&gt;
- &lt;/article&gt;
- &lt;article&gt;
-  &lt;header&gt;
-   &lt;h1&gt;Latest TWiT episode is online&lt;/h1&gt;
-   &lt;p&gt;<strong>&lt;img src="podcasts.png" alt="Podcasts"&gt;</strong>&lt;/p&gt;
-  &lt;/header&gt;
-  &lt;p&gt;The latest TWiT episode has been posted, in which we hear
+   <pre>&lt;body>
+ &lt;article>
+  &lt;header>
+   &lt;h1>Ratatouille wins &lt;i>Best Movie of the Year&lt;/i> award&lt;/h1>
+   &lt;p><strong>&lt;img src="movies.png" alt="Movies"></strong>&lt;/p>
+  &lt;/header>
+  &lt;p>Pixar has won yet another &lt;i>Best Movie of the Year&lt;/i> award,
+  making this its 8th win in the last 12 years.&lt;/p>
+ &lt;/article>
+ &lt;article>
+  &lt;header>
+   &lt;h1>Latest TWiT episode is online&lt;/h1>
+   &lt;p><strong>&lt;img src="podcasts.png" alt="Podcasts"></strong>&lt;/p>
+  &lt;/header>
+  &lt;p>The latest TWiT episode has been posted, in which we hear
   several tech news stories as well as learning much more about the
   iPhone. This week, the panelists compare how reflective their
-  iPhones' Apple logos are.&lt;/p&gt;
- &lt;/article&gt;
-&lt;/body&gt;</pre>
+  iPhones' Apple logos are.&lt;/p>
+ &lt;/article>
+&lt;/body></pre>
 
   </div>
+-->
 
   <p>Many pages include logos, insignia, flags, or emblems, which
   stand for a particular entity such as a company, organization,
@@ -19884,6 +19888,8 @@ interface <dfn id=cuerangecallback>CueRangeCallback</dfn> {
        - an event that reports playback difficulties?
        - an arbitrary quality metric?
     * bufferingRate/bufferingThrottled (see v3BUF)
+    * events for when the user agent's controls get shown or hidden
+      so that the author's controls can get away of the UA's
   -->
 
   <p><a href=#media-element title="media element">Media elements</a> are used to
@@ -52576,7 +52582,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
   <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>,
   <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>,
   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>,
-  <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-header-element>header</a></code>, <code><a href=#the-hr-element>hr</a></code>,
+  <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>,
   <code><a href=#menus>menu</a></code>, <code><a href=#the-nav-element>nav</a></code>, <code><a href=#the-ol-element>ol</a></code>,
   <code><a href=#the-p-element>p</a></code>, <code><a href=#the-pre-element>pre</a></code>, <code><a href=#the-section-element>section</a></code>,
   <code><a href=#the-table-element>table</a></code>, or <code><a href=#the-ul-element>ul</a></code>, element, or if there is no
@@ -53671,7 +53677,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
    <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code>frame</code>,
    <code>frameset</code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
    <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>,
-   <code><a href=#the-head-element>head</a></code>, <code><a href=#the-header-element>header</a></code>, <code><a href=#the-hr-element>hr</a></code>,
+   <code><a href=#the-head-element>head</a></code>, <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>,
    <code><a href=#the-iframe-element>iframe</a></code>, <!-- <code>image</code>, (commented out
    because this isn't an element that can end up on the stack, so it
    doesn't matter) --> <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>,
@@ -56295,7 +56301,7 @@ document.body.appendChild(text);
    <!-- the normal ones -->
    <dt>A start tag whose tag name is one of: "address", "article",
    "aside", "blockquote", "center", "datagrid", "details", "dialog",
-   "dir", "div", "dl", "fieldset", "figure", "footer", "header",
+   "dir", "div", "dl", "fieldset", "figure", "footer", "hgroup",
    "menu", "nav", "ol", "p", "section", "ul"</dt>
    <dd>
 
@@ -56498,7 +56504,7 @@ document.body.appendChild(text);
    <!-- the normal ones -->
    <dt>An end tag whose tag name is one of: "address", "article",
    "aside", "blockquote", "center", "datagrid", "details", "dialog",
-   "dir", "div", "dl", "fieldset", "figure", "footer", "header",
+   "dir", "div", "dl", "fieldset", "figure", "footer", "hgroup",
    "listing", "menu", "nav", "ol", "pre", "section", "ul"</dt>
    <dd>