[html5] r8358 - [ct] (2) Make the outline algorithm handle sectioning roots more sensibly Fixing [...]
whatwg at whatwg.org
whatwg at whatwg.org
Mon Dec 16 14:44:24 PST 2013
Author: ianh
Date: 2013-12-16 14:44:22 -0800 (Mon, 16 Dec 2013)
New Revision: 8358
Modified:
complete.html
index
source
Log:
[ct] (2) Make the outline algorithm handle sectioning roots more sensibly
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=24100
Affected topics: HTML
Modified: complete.html
===================================================================
--- complete.html 2013-12-16 22:30:35 UTC (rev 8357)
+++ complete.html 2013-12-16 22:44:22 UTC (rev 8358)
@@ -15452,26 +15452,16 @@
<p>Run these steps:</p>
- <ol><li>
+ <ol><li><p>If <var title="">current outline target</var> is not null, push <var title="">current outline target</var> onto the stack.</li>
- <p>If <var title="">current outline target</var> is not null, run these substeps:</p>
-
- <ol><li><p>If the <var title="">current section</var> has no heading, create an implied
- heading and let that be the heading for the <var title="">current section</var>.</li>
-
- <li><p>Push <var title="">current outline target</var> onto the stack.</li>
-
- </ol></li>
-
<li><p>Let <var title="">current outline target</var> be the element that is being
entered.</li>
+ <li><p>Let <var title="">current outline target</var>'s <i>parent section</i> be <var title="">current section</var>.</li>
+
<li><p>Let <var title="">current section</var> be a newly created <a href=#concept-section title=concept-section>section</a> for the <var title="">current outline target</var>
element.</li>
- <li><p>Associate <var title="">current outline target</var> with <var title="">current
- section</var>.</li>
-
<li><p>Let there be a new <a href=#outline>outline</a> for the new <var title="">current outline
target</var>, initialized with just the new <var title="">current section</var> as the only
<a href=#concept-section title=concept-section>section</a> in the outline.</li>
@@ -15488,25 +15478,17 @@
<ol><li><p>If the <var title="">current section</var> has no heading, create an implied heading
and let that be the heading for the <var title="">current section</var>.</li>
+ <li><p>Let <var title="">current section</var> be <var title="">current outline
+ target</var>'s <i>parent section</i>.</li>
+
<li><p>Pop the top element from the stack, and let the <var title="">current outline
target</var> be that element.</li>
- <li><p>Let <var title="">current section</var> be the last section in the
- <a href=#outline>outline</a> of the <var title="">current outline target</var> element.</li>
-
- <li><p><i>Finding the deepest child</i>: If <var title="">current section</var> has no child
- sections, stop these steps.</li>
-
- <li><p>Let <var title="">current section</var> be the last child <a href=#concept-section title=concept-section>section</a> of the current <var title="">current
- section</var>.</li>
-
- <li><p>Go back to the substep labeled <i>finding the deepest child</i>.</li>
-
</ol></dd>
<dt>When exiting a <a href=#sectioning-content>sectioning content</a> element or a <a href=#sectioning-root>sectioning root</a>
- element</dt>
+ element (when the stack is empty)</dt>
<dd>
@@ -102352,6 +102334,7 @@
Maik Merten,
Malcolm Rowe,
Manish Tripathi,
+ Marc Hoyois,
Marcus Bointon,
Mark Birbeck,
Mark Davis,
Modified: index
===================================================================
--- index 2013-12-16 22:30:35 UTC (rev 8357)
+++ index 2013-12-16 22:44:22 UTC (rev 8358)
@@ -15452,26 +15452,16 @@
<p>Run these steps:</p>
- <ol><li>
+ <ol><li><p>If <var title="">current outline target</var> is not null, push <var title="">current outline target</var> onto the stack.</li>
- <p>If <var title="">current outline target</var> is not null, run these substeps:</p>
-
- <ol><li><p>If the <var title="">current section</var> has no heading, create an implied
- heading and let that be the heading for the <var title="">current section</var>.</li>
-
- <li><p>Push <var title="">current outline target</var> onto the stack.</li>
-
- </ol></li>
-
<li><p>Let <var title="">current outline target</var> be the element that is being
entered.</li>
+ <li><p>Let <var title="">current outline target</var>'s <i>parent section</i> be <var title="">current section</var>.</li>
+
<li><p>Let <var title="">current section</var> be a newly created <a href=#concept-section title=concept-section>section</a> for the <var title="">current outline target</var>
element.</li>
- <li><p>Associate <var title="">current outline target</var> with <var title="">current
- section</var>.</li>
-
<li><p>Let there be a new <a href=#outline>outline</a> for the new <var title="">current outline
target</var>, initialized with just the new <var title="">current section</var> as the only
<a href=#concept-section title=concept-section>section</a> in the outline.</li>
@@ -15488,25 +15478,17 @@
<ol><li><p>If the <var title="">current section</var> has no heading, create an implied heading
and let that be the heading for the <var title="">current section</var>.</li>
+ <li><p>Let <var title="">current section</var> be <var title="">current outline
+ target</var>'s <i>parent section</i>.</li>
+
<li><p>Pop the top element from the stack, and let the <var title="">current outline
target</var> be that element.</li>
- <li><p>Let <var title="">current section</var> be the last section in the
- <a href=#outline>outline</a> of the <var title="">current outline target</var> element.</li>
-
- <li><p><i>Finding the deepest child</i>: If <var title="">current section</var> has no child
- sections, stop these steps.</li>
-
- <li><p>Let <var title="">current section</var> be the last child <a href=#concept-section title=concept-section>section</a> of the current <var title="">current
- section</var>.</li>
-
- <li><p>Go back to the substep labeled <i>finding the deepest child</i>.</li>
-
</ol></dd>
<dt>When exiting a <a href=#sectioning-content>sectioning content</a> element or a <a href=#sectioning-root>sectioning root</a>
- element</dt>
+ element (when the stack is empty)</dt>
<dd>
@@ -102352,6 +102334,7 @@
Maik Merten,
Malcolm Rowe,
Manish Tripathi,
+ Marc Hoyois,
Marcus Bointon,
Mark Birbeck,
Mark Davis,
Modified: source
===================================================================
--- source 2013-12-16 22:30:35 UTC (rev 8357)
+++ source 2013-12-16 22:44:22 UTC (rev 8358)
@@ -16050,31 +16050,19 @@
<ol>
- <li>
+ <li><p>If <var data-x="">current outline target</var> is not null, push <var
+ data-x="">current outline target</var> onto the stack.</p></li>
- <p>If <var data-x="">current outline target</var> is not null, run these substeps:</p>
-
- <ol>
-
- <li><p>If the <var data-x="">current section</var> has no heading, create an implied
- heading and let that be the heading for the <var data-x="">current section</var>.</p></li>
-
- <li><p>Push <var data-x="">current outline target</var> onto the stack.</p></li>
-
- </ol>
-
- </li>
-
<li><p>Let <var data-x="">current outline target</var> be the element that is being
entered.</p></li>
+ <li><p>Let <var data-x="">current outline target</var>'s <i>parent section</i> be <var
+ data-x="">current section</var>.</p></li>
+
<li><p>Let <var data-x="">current section</var> be a newly created <span
data-x="concept-section">section</span> for the <var data-x="">current outline target</var>
element.</p></li>
- <li><p>Associate <var data-x="">current outline target</var> with <var data-x="">current
- section</var>.</p></li>
-
<li><p>Let there be a new <span>outline</span> for the new <var data-x="">current outline
target</var>, initialized with just the new <var data-x="">current section</var> as the only
<span data-x="concept-section">section</span> in the outline.</p></li>
@@ -16095,28 +16083,19 @@
<li><p>If the <var data-x="">current section</var> has no heading, create an implied heading
and let that be the heading for the <var data-x="">current section</var>.</p></li>
+ <li><p>Let <var data-x="">current section</var> be <var data-x="">current outline
+ target</var>'s <i>parent section</i>.</p></li>
+
<li><p>Pop the top element from the stack, and let the <var data-x="">current outline
target</var> be that element.</p></li>
- <li><p>Let <var data-x="">current section</var> be the last section in the
- <span>outline</span> of the <var data-x="">current outline target</var> element.</p></li>
-
- <li><p><i>Finding the deepest child</i>: If <var data-x="">current section</var> has no child
- sections, stop these steps.</p></li>
-
- <li><p>Let <var data-x="">current section</var> be the last child <span
- data-x="concept-section">section</span> of the current <var data-x="">current
- section</var>.</p></li>
-
- <li><p>Go back to the substep labeled <i>finding the deepest child</i>.</p></li>
-
</ol>
</dd>
<dt>When exiting a <span>sectioning content</span> element or a <span>sectioning root</span>
- element</dt>
+ element (when the stack is empty)</dt>
<dd>
@@ -114357,6 +114336,7 @@
Maik Merten,
Malcolm Rowe,
Manish Tripathi,
+ Marc Hoyois,
Marcus Bointon,
Mark Birbeck,
Mark Davis,
More information about the Commit-Watchers
mailing list