[c] (0) Define <map> as transparent.

git-svn-id: http://svn.whatwg.org/webapps@3009 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Apr 28, 2009 · b3793fe · b3793fe
1 parent 7e93d30
commit b3793fe
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 23 deletions.
diff --git a/index b/index
@@ -8754,9 +8754,9 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
 
   <p>Paragraphs in <a href=#flow-content-0>flow content</a> are defined relative to
   what the document looks like without the <code><a href=#the-a-element>a</a></code>,
-  <code><a href=#the-ins-element>ins</a></code> and <code><a href=#the-del-element>del</a></code> elements complicating matters,
-  since those elements, with their hybrid content models, can straddle
-  paragraph boundaries.</p>
+  <code><a href=#the-ins-element>ins</a></code>, <code><a href=#the-del-element>del</a></code>, and <code><a href=#the-map-element>map</a></code> elements
+  complicating matters, since those elements, with their hybrid
+  content models, can straddle paragraph boundaries.</p>
 
   <p class=note>Generally, having elements straddle paragraph
   boundaries is best avoided. Maintaining such markup can be
@@ -8765,8 +8765,9 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   <div class=impl>
 
   <p>Let <var title="">view</var> be a view of the DOM that replaces
-  all <code><a href=#the-a-element>a</a></code>, <code><a href=#the-ins-element>ins</a></code> and <code><a href=#the-del-element>del</a></code> elements
-  in the document with their contents. Then, in <var title="">view</var>, for each run of sibling <a href=#phrasing-content-0>phrasing
+  all <code><a href=#the-a-element>a</a></code>, <code><a href=#the-ins-element>ins</a></code>, <code><a href=#the-del-element>del</a></code>, and
+  <code><a href=#the-map-element>map</a></code> elements in the document with their contents. Then,
+  in <var title="">view</var>, for each run of sibling <a href=#phrasing-content-0>phrasing
   content</a> nodes uninterrupted by other types of content, in an
   element that accepts content other than <a href=#phrasing-content-0>phrasing
   content</a>, let <var title="">first</var> be the first node of
@@ -8776,10 +8777,13 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   whitespace</a>, a paragraph exists in the original DOM from
   immediately before <var title="">first</var> to immediately after
   <var title="">last</var>. (Paragraphs can thus span across
-  <code><a href=#the-a-element>a</a></code>, <code><a href=#the-ins-element>ins</a></code> and <code><a href=#the-del-element>del</a></code> elements.)</p>
+  <code><a href=#the-a-element>a</a></code>, <code><a href=#the-ins-element>ins</a></code>, <code><a href=#the-del-element>del</a></code>, and
+  <code><a href=#the-map-element>map</a></code> elements.)</p>
 
   <p>Conformance checkers may warn authors of cases where they have
-  paragraphs that overlap each other.</p>
+  paragraphs that overlap each other (this can happen with
+  <code><a href=#the-object-element>object</a></code>, <code><a href=#video>video</a></code>, <code><a href=#audio>audio</a></code>, and
+  <code><a href=#the-canvas-element>canvas</a></code> elements).</p> <!-- example below -->
 
   </div>
 
@@ -13919,8 +13923,8 @@ first matching case):&lt;/p&gt;
   the user follows the link.</p>
 
   <p>The <a href=#activation-behavior>activation behavior</a> of <code><a href=#the-a-element>a</a></code> elements
-  that represent <span>hyperlinks</span> is to run the following
-  steps:</p>
+  that represent <a href=#hyperlink title=hyperlink>hyperlinks</a> is to run
+  the following steps:</p>
 
   <ol><li><p>If the <code title=event-DOMActivate>DOMActivate</code>
    event in question is not <span title=concept-events-trusted>trusted</span> (i.e. a <code title=dom-click><a href=#dom-click>click()</a></code> method call was the reason for the
@@ -24889,10 +24893,11 @@ function AddCloud(data, x, y) { ... }</pre>
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
+   <dd>When the element only contains <a href=#phrasing-content-0>phrasing content</a>: <a href=#phrasing-content-0>phrasing 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>
+   <dd>Where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#flow-content-0>Flow content</a>.</dd>
+   <dd><a href=#transparent>Transparent</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-map-name><a href=#attr-map-name>name</a></code></dd>

diff --git a/source b/source
@@ -9095,9 +9095,9 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
 
   <p>Paragraphs in <span>flow content</span> are defined relative to
   what the document looks like without the <code>a</code>,
-  <code>ins</code> and <code>del</code> elements complicating matters,
-  since those elements, with their hybrid content models, can straddle
-  paragraph boundaries.</p>
+  <code>ins</code>, <code>del</code>, and <code>map</code> elements
+  complicating matters, since those elements, with their hybrid
+  content models, can straddle paragraph boundaries.</p>
 
   <p class="note">Generally, having elements straddle paragraph
   boundaries is best avoided. Maintaining such markup can be
@@ -9106,9 +9106,9 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   <div class="impl">
 
   <p>Let <var title="">view</var> be a view of the DOM that replaces
-  all <code>a</code>, <code>ins</code> and <code>del</code> elements
-  in the document with their contents. Then, in <var
-  title="">view</var>, for each run of sibling <span>phrasing
+  all <code>a</code>, <code>ins</code>, <code>del</code>, and
+  <code>map</code> elements in the document with their contents. Then,
+  in <var title="">view</var>, for each run of sibling <span>phrasing
   content</span> nodes uninterrupted by other types of content, in an
   element that accepts content other than <span>phrasing
   content</span>, let <var title="">first</var> be the first node of
@@ -9118,10 +9118,13 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   whitespace</span>, a paragraph exists in the original DOM from
   immediately before <var title="">first</var> to immediately after
   <var title="">last</var>. (Paragraphs can thus span across
-  <code>a</code>, <code>ins</code> and <code>del</code> elements.)</p>
+  <code>a</code>, <code>ins</code>, <code>del</code>, and
+  <code>map</code> elements.)</p>
 
   <p>Conformance checkers may warn authors of cases where they have
-  paragraphs that overlap each other.</p>
+  paragraphs that overlap each other (this can happen with
+  <code>object</code>, <code>video</code>, <code>audio</code>, and
+  <code>canvas</code> elements).</p> <!-- example below -->
 
   </div>
 
@@ -14897,8 +14900,8 @@ first matching case):&lt;/p&gt;
   the user follows the link.</p>
 
   <p>The <span>activation behavior</span> of <code>a</code> elements
-  that represent <span>hyperlinks</span> is to run the following
-  steps:</p>
+  that represent <span title="hyperlink">hyperlinks</span> is to run
+  the following steps:</p>
 
   <ol>
 
@@ -27439,10 +27442,11 @@ function AddCloud(data, x, y) { ... }</pre>
   <dl class="element">
    <dt>Categories</dt>
    <dd><span>Flow content</span>.</dd>
+   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
-   <dd>Where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Flow content</span>.</dd>
+   <dd><span>Transparent</span>.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-map-name">name</code></dd>