[html5] r1483 - /
whatwg at whatwg.org
whatwg at whatwg.org
Tue Apr 22 22:10:10 PDT 2008
Author: ianh
Date: 2008-04-22 22:10:09 -0700 (Tue, 22 Apr 2008)
New Revision: 1483
Modified:
index
source
Log:
[e] (0) Various comments on edits and paragraphs and lists.
Modified: index
===================================================================
--- index 2008-04-23 03:33:10 UTC (rev 1482)
+++ index 2008-04-23 05:10:09 UTC (rev 1483)
@@ -609,6 +609,12 @@
<li><a href="#attributes"><span class=secno>3.11.3 </span>Attributes
common to <code>ins</code> and <code>del</code> elements</a>
+
+ <li><a href="#edits0"><span class=secno>3.11.4 </span>Edits and
+ paragraphs</a>
+
+ <li><a href="#edits1"><span class=secno>3.11.5 </span>Edits and
+ lists</a>
</ul>
<li><a href="#embedded0"><span class=secno>3.12 </span>Embedded
@@ -12653,71 +12659,6 @@
<p>The <code><a href="#ins">ins</a></code> and <code><a
href="#del">del</a></code> elements represent edits to the document.
- <div class=note>
- <p>Since the <code><a href="#ins">ins</a></code> and <code><a
- href="#del">del</a></code> elements do not affect <a href="#paragraph"
- title=paragraph>paragraphing</a>, it is possible, in some cases where
- paragraphs are <a href="#paragraph" title=paragraph>implied</a> (without
- explicit <code><a href="#p">p</a></code> elements), for an <code><a
- href="#ins">ins</a></code> or <code><a href="#del">del</a></code> element
- to span both an entire paragraph or other non-<a
- href="#phrasing0">phrasing content</a> elements and part of another
- paragraph.</p>
-
- <p>For example:</p>
-
- <pre><section>
- <ins>
- <p>
- This is a paragraph that was inserted.
- </p>
- This is another paragraph whose first sentence was inserted
- at the same time as the paragraph above.
- </ins>
- This is a second sentence, which was there all along.
-</section></pre>
-
- <p>By only wrapping some paragraphs in <code><a href="#p">p</a></code>
- elements, one can even get the end of one paragraph, a whole second
- paragraph, and the start of a third paragraph to be covered by the same
- <code><a href="#ins">ins</a></code> or <code><a
- href="#del">del</a></code> element (though this is very confusing, and
- not considered good practice):</p>
-
- <pre><section>
- This is the first paragraph. <ins>This sentence was
- inserted.
- <p>This second paragraph was inserted.</p>
- This sentence was inserted too.</ins> This is the
- third paragraph in this example.
-</section></pre>
-
- <p>However, due to the way <a href="#paragraph" title=paragraph>implied
- paragraphs</a> are defined, it is not possible to mark up the end of one
- paragraph and the start of the very next one using the same <code><a
- href="#ins">ins</a></code> or <code><a href="#del">del</a></code>
- element. You instead have to use one (or two) <code><a
- href="#p">p</a></code> element(s) and two <code><a
- href="#ins">ins</a></code> or <code><a href="#del">del</a></code>
- elements:
-
- <p>For example:</p>
-
- <pre><section>
- <p>This is the first paragraph. <del>This sentence was
- deleted.</p>
- <p><del>This sentence was deleted too.</del> That
- sentence needed a separate <del> element.</p>
-</section></pre>
-
- <p>Partly because of the confusion described above, authors are strongly
- recommended to always mark up all paragraphs with the <code><a
- href="#p">p</a></code> element, and to not have any <code><a
- href="#ins">ins</a></code> or <code><a href="#del">del</a></code>
- elements that cross across any <a href="#paragraph"
- title=paragraph>implied paragraphs</a>.</p>
- </div>
-
<h4 id=the-ins><span class=secno>3.11.1 </span>The <dfn
id=ins><code>ins</code></dfn> element</h4>
@@ -12906,6 +12847,122 @@
title=dom-mod-datetime><code>dateTime</code></dfn> DOM attribute must
reflect the element's <code title="">datetime</code> content attribute.
+ <h4 id=edits0><span class=secno>3.11.4 </span>Edits and paragraphs</h4>
+
+ <p>Since the <code><a href="#ins">ins</a></code> and <code><a
+ href="#del">del</a></code> elements do not affect <a href="#paragraph"
+ title=paragraph>paragraphing</a>, it is possible, in some cases where
+ paragraphs are <a href="#paragraph" title=paragraph>implied</a> (without
+ explicit <code><a href="#p">p</a></code> elements), for an <code><a
+ href="#ins">ins</a></code> or <code><a href="#del">del</a></code> element
+ to span both an entire paragraph or other non-<a
+ href="#phrasing0">phrasing content</a> elements and part of another
+ paragraph.
+
+ <p>For example:
+
+ <pre><section>
+ <ins>
+ <p>
+ This is a paragraph that was inserted.
+ </p>
+ This is another paragraph whose first sentence was inserted
+ at the same time as the paragraph above.
+ </ins>
+ This is a second sentence, which was there all along.
+</section></pre>
+
+ <p>By only wrapping some paragraphs in <code><a href="#p">p</a></code>
+ elements, one can even get the end of one paragraph, a whole second
+ paragraph, and the start of a third paragraph to be covered by the same
+ <code><a href="#ins">ins</a></code> or <code><a href="#del">del</a></code>
+ element (though this is very confusing, and not considered good practice):
+
+ <pre><section>
+ This is the first paragraph. <ins>This sentence was
+ inserted.
+ <p>This second paragraph was inserted.</p>
+ This sentence was inserted too.</ins> This is the
+ third paragraph in this example.
+</section></pre>
+
+ <p>However, due to the way <a href="#paragraph" title=paragraph>implied
+ paragraphs</a> are defined, it is not possible to mark up the end of one
+ paragraph and the start of the very next one using the same <code><a
+ href="#ins">ins</a></code> or <code><a href="#del">del</a></code> element.
+ You instead have to use one (or two) <code><a href="#p">p</a></code>
+ element(s) and two <code><a href="#ins">ins</a></code> or <code><a
+ href="#del">del</a></code> elements:
+
+ <p>For example:
+
+ <pre><section>
+ <p>This is the first paragraph. <del>This sentence was
+ deleted.</del></p>
+ <p><del>This sentence was deleted too.</del> That
+ sentence needed a separate <del> element.</p>
+</section></pre>
+
+ <p>Partly because of the confusion described above, authors are strongly
+ recommended to always mark up all paragraphs with the <code><a
+ href="#p">p</a></code> element, and to not have any <code><a
+ href="#ins">ins</a></code> or <code><a href="#del">del</a></code> elements
+ that cross across any <a href="#paragraph" title=paragraph>implied
+ paragraphs</a>.
+
+ <h4 id=edits1><span class=secno>3.11.5 </span>Edits and lists</h4>
+
+ <p>The content models of the <code><a href="#ol">ol</a></code> and <code><a
+ href="#ul">ul</a></code> elements do not allow <code><a
+ href="#ins">ins</a></code> and <code><a href="#del">del</a></code>
+ elements as children. Lists always represent all their items, including
+ items that would otherwise have been marked as deleted.
+
+ <p>To indicate that an item is inserted or deleted, an <code><a
+ href="#ins">ins</a></code> or <code><a href="#del">del</a></code> element
+ can be wrapped around the contents of the <code><a
+ href="#li">li</a></code> element. To indicate that an item has been
+ replaced by another, a single <code><a href="#li">li</a></code> element
+ can have one or more <code><a href="#del">del</a></code> elements followed
+ by one or more <code><a href="#ins">ins</a></code> elements.
+
+ <div class=example>
+ <p>In the following example, a list that started empty had items added and
+ removed from it over time. The bits in the example that have been
+ emphasised show the parts that are the "current" state of the list. The
+ list item numbers don't take into account the edits, though.</p>
+
+ <pre><h1>Stop-ship bugs</h1>
+<ol>
+ <li><ins datetime="2008-02-12 15:20 Z"><em>Bug 225: Rain detector
+ doesn't work in snow</em></ins></li>
+ <li><del datetime="2008-03-01 20:22 Z"><ins datetime="2008-02-14
+ 12:02 Z">Bug 228: Water buffer overflows in April</ins></del></li>
+ <li><ins datetime="2008-02-16 13:50 Z"><em>Bug 230: Water heater
+ doesn't use renewable fuels</em></ins></li>
+ <li><del datetime="2008-02-20 21:15 Z"><ins datetime="2008-02-16
+ 14:25 Z">Bug 232: Carbon dioxide emissions detected after
+ startup</ins></del></li>
+</ol></pre>
+ </div>
+
+ <div class=example>
+ <p>In the following example, a list that started with just fruit was
+ replaced by a list with just colors.</p>
+
+ <pre><h1>List of <del>fruits</del><ins>colors</ins></h1>
+<ul>
+ <li><del>Lime</del><ins>Green</ins></li>
+ <li><del>Apple</del></li>
+ <li>Orange</li>
+ <li><del>Pear</del></li>
+ <li><ins>Teal</ins></li>
+ <li><del>Lemon</del><ins>Yellow</ins></li>
+ <li>Olive</li>
+ <li><ins>Purple</ins>
+</ul></pre>
+ </div>
+
<h3 id=embedded0><span class=secno>3.12 </span>Embedded content</h3>
<h4 id=the-figure><span class=secno>3.12.1 </span>The <dfn
Modified: source
===================================================================
--- source 2008-04-23 03:33:10 UTC (rev 1482)
+++ source 2008-04-23 05:10:09 UTC (rev 1483)
@@ -10668,68 +10668,7 @@
<p>The <code>ins</code> and <code>del</code> elements represent
edits to the document.</p>
- <div class="note">
- <p>Since the <code>ins</code> and <code>del</code> elements do not
- affect <span title="paragraph">paragraphing</span>, it is possible,
- in some cases where paragraphs are <span
- title="paragraph">implied</span> (without explicit <code>p</code>
- elements), for an <code>ins</code> or <code>del</code> element to
- span both an entire paragraph or other non-<span>phrasing
- content</span> elements and part of another paragraph.</p>
-
- <p>For example:</p>
-
- <pre><section>
- <ins>
- <p>
- This is a paragraph that was inserted.
- </p>
- This is another paragraph whose first sentence was inserted
- at the same time as the paragraph above.
- </ins>
- This is a second sentence, which was there all along.
-</section></pre>
-
- <p>By only wrapping some paragraphs in <code>p</code> elements, one
- can even get the end of one paragraph, a whole second paragraph,
- and the start of a third paragraph to be covered by the same
- <code>ins</code> or <code>del</code> element (though this is very
- confusing, and not considered good practice):</p>
-
- <pre><section>
- This is the first paragraph. <ins>This sentence was
- inserted.
- <p>This second paragraph was inserted.</p>
- This sentence was inserted too.</ins> This is the
- third paragraph in this example.
-</section></pre>
-
- <p>However, due to the way <span title="paragraph">implied
- paragraphs</span> are defined, it is not possible to mark up the
- end of one paragraph and the start of the very next one using the
- same <code>ins</code> or <code>del</code> element. You instead have
- to use one (or two) <code>p</code> element(s) and two
- <code>ins</code> or <code>del</code> elements:
-
- <p>For example:</p>
-
- <pre><section>
- <p>This is the first paragraph. <del>This sentence was
- deleted.</p>
- <p><del>This sentence was deleted too.</del> That
- sentence needed a separate <del> element.</p>
-</section></pre>
-
- <p>Partly because of the confusion described above, authors are
- strongly recommended to always mark up all paragraphs with the
- <code>p</code> element, and to not have any <code>ins</code> or
- <code>del</code> elements that cross across any <span
- title="paragraph">implied paragraphs</span>.</p>
-
- </div>
-
-
<h4>The <dfn><code>ins</code></dfn> element</h4>
<dl class="element">
@@ -10886,7 +10825,125 @@
attribute.</p>
+ <h4>Edits and paragraphs</h4>
+ <p>Since the <code>ins</code> and <code>del</code> elements do not
+ affect <span title="paragraph">paragraphing</span>, it is possible,
+ in some cases where paragraphs are <span
+ title="paragraph">implied</span> (without explicit <code>p</code>
+ elements), for an <code>ins</code> or <code>del</code> element to
+ span both an entire paragraph or other non-<span>phrasing
+ content</span> elements and part of another paragraph.</p>
+
+ <p>For example:</p>
+
+ <pre><section>
+ <ins>
+ <p>
+ This is a paragraph that was inserted.
+ </p>
+ This is another paragraph whose first sentence was inserted
+ at the same time as the paragraph above.
+ </ins>
+ This is a second sentence, which was there all along.
+</section></pre>
+
+ <p>By only wrapping some paragraphs in <code>p</code> elements, one
+ can even get the end of one paragraph, a whole second paragraph,
+ and the start of a third paragraph to be covered by the same
+ <code>ins</code> or <code>del</code> element (though this is very
+ confusing, and not considered good practice):</p>
+
+ <pre><section>
+ This is the first paragraph. <ins>This sentence was
+ inserted.
+ <p>This second paragraph was inserted.</p>
+ This sentence was inserted too.</ins> This is the
+ third paragraph in this example.
+</section></pre>
+
+ <p>However, due to the way <span title="paragraph">implied
+ paragraphs</span> are defined, it is not possible to mark up the
+ end of one paragraph and the start of the very next one using the
+ same <code>ins</code> or <code>del</code> element. You instead have
+ to use one (or two) <code>p</code> element(s) and two
+ <code>ins</code> or <code>del</code> elements:
+
+ <p>For example:</p>
+
+ <pre><section>
+ <p>This is the first paragraph. <del>This sentence was
+ deleted.</del></p>
+ <p><del>This sentence was deleted too.</del> That
+ sentence needed a separate <del> element.</p>
+</section></pre>
+
+ <p>Partly because of the confusion described above, authors are
+ strongly recommended to always mark up all paragraphs with the
+ <code>p</code> element, and to not have any <code>ins</code> or
+ <code>del</code> elements that cross across any <span
+ title="paragraph">implied paragraphs</span>.</p>
+
+
+ <h4>Edits and lists</h4>
+
+ <p>The content models of the <code>ol</code> and <code>ul</code>
+ elements do not allow <code>ins</code> and <code>del</code> elements
+ as children. Lists always represent all their items, including items
+ that would otherwise have been marked as deleted.</p>
+
+ <p>To indicate that an item is inserted or deleted, an
+ <code>ins</code> or <code>del</code> element can be wrapped around
+ the contents of the <code>li</code> element. To indicate that an
+ item has been replaced by another, a single <code>li</code> element
+ can have one or more <code>del</code> elements followed by one or
+ more <code>ins</code> elements.</p>
+
+ <div class="example">
+
+ <p>In the following example, a list that started empty had items
+ added and removed from it over time. The bits in the example that
+ have been emphasised show the parts that are the "current" state of
+ the list. The list item numbers don't take into account the edits,
+ though.</p>
+
+ <pre><h1>Stop-ship bugs</h1>
+<ol>
+ <li><ins datetime="2008-02-12 15:20 Z"><em>Bug 225: Rain detector
+ doesn't work in snow</em></ins></li>
+ <li><del datetime="2008-03-01 20:22 Z"><ins datetime="2008-02-14
+ 12:02 Z">Bug 228: Water buffer overflows in April</ins></del></li>
+ <li><ins datetime="2008-02-16 13:50 Z"><em>Bug 230: Water heater
+ doesn't use renewable fuels</em></ins></li>
+ <li><del datetime="2008-02-20 21:15 Z"><ins datetime="2008-02-16
+ 14:25 Z">Bug 232: Carbon dioxide emissions detected after
+ startup</ins></del></li>
+</ol></pre>
+
+ </div>
+
+ <div class="example">
+
+ <p>In the following example, a list that started with just fruit
+ was replaced by a list with just colors.</p>
+
+ <pre><h1>List of <del>fruits</del><ins>colors</ins></h1>
+<ul>
+ <li><del>Lime</del><ins>Green</ins></li>
+ <li><del>Apple</del></li>
+ <li>Orange</li>
+ <li><del>Pear</del></li>
+ <li><ins>Teal</ins></li>
+ <li><del>Lemon</del><ins>Yellow</ins></li>
+ <li>Olive</li>
+ <li><ins>Purple</ins>
+</ul></pre>
+
+ </div>
+
+
+
+
<h3>Embedded content</h3>
<h4>The <dfn><code>figure</code></dfn> element</h4>
More information about the Commit-Watchers
mailing list