diff options
4 files changed, 17 insertions, 5 deletions
diff --git a/docutils/docutils/writers/html4css1.py b/docutils/docutils/writers/html4css1.py index 4375b889c..f57b775d4 100644 --- a/docutils/docutils/writers/html4css1.py +++ b/docutils/docutils/writers/html4css1.py @@ -1360,7 +1360,7 @@ class SimpleListChecker(nodes.GenericNodeVisitor): def invisible_visit(self, node): """Invisible nodes should be ignored.""" - pass + raise nodes.SkipNode visit_comment = invisible_visit visit_substitution_definition = invisible_visit diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 2ed3dcf64..029e1ebdc 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -198,6 +198,8 @@ live link to PEP 258 here.</p> </ul> </li> <li>Nested item 3.</li> +<li>This nested list should be compacted by the HTML writer.<a class="target" id="target" name="target"></a><!-- Even if this item contains a target and a comment. --> +</li> </ul> </li> </ul> @@ -849,16 +851,16 @@ section, "Docutils System Messages":</p> <p class="system-message-title">System Message: <a name="id19">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 89); <em><a href="#id20">backlink</a></em></p> Undefined substitution referenced: "problematic".</div> <div class="system-message" id="id66"> -<p class="system-message-title">System Message: <a name="id66">ERROR/3</a> (<tt>functional/input/standalone_rst_html4css1.txt</tt>, line 337); <em><a href="#id67">backlink</a></em></p> +<p class="system-message-title">System Message: <a name="id66">ERROR/3</a> (<tt>functional/input/standalone_rst_html4css1.txt</tt>, line 343); <em><a href="#id67">backlink</a></em></p> Unknown target name: "5".</div> <div class="system-message" id="id68"> -<p class="system-message-title">System Message: <a name="id68">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 346); <em><a href="#id69">backlink</a></em></p> +<p class="system-message-title">System Message: <a name="id68">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 352); <em><a href="#id69">backlink</a></em></p> Unknown target name: "nonexistent".</div> <div class="system-message" id="id70"> -<p class="system-message-title">System Message: <a name="id70">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 371); <em><a href="#id71">backlink</a></em></p> +<p class="system-message-title">System Message: <a name="id70">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 377); <em><a href="#id71">backlink</a></em></p> Unknown target name: "hyperlink reference without a target".</div> <div class="system-message" id="id72"> -<p class="system-message-title">System Message: <a name="id72">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 384); <em><a href="#id73">backlink</a></em></p> +<p class="system-message-title">System Message: <a name="id72">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 390); <em><a href="#id73">backlink</a></em></p> Duplicate target name, cannot be used as a unique reference: "duplicate target names".</div> </div> </div> diff --git a/docutils/test/functional/expected/standalone_rst_latex.tex b/docutils/test/functional/expected/standalone_rst_latex.tex index 69dfba65d..38d308d70 100644 --- a/docutils/test/functional/expected/standalone_rst_latex.tex +++ b/docutils/test/functional/expected/standalone_rst_latex.tex @@ -345,6 +345,10 @@ Item 2. \item {} Nested item 3. +\item {} +This nested list should be compacted by the HTML writer. +\hypertarget{target}{}% Even if this item contains a target and a comment. + \end{itemize} \end{itemize} diff --git a/docutils/test/functional/input/data/standard.txt b/docutils/test/functional/input/data/standard.txt index 838cfc0f5..fcf3c7ad8 100644 --- a/docutils/test/functional/input/data/standard.txt +++ b/docutils/test/functional/input/data/standard.txt @@ -136,6 +136,12 @@ Bullet Lists * Nested item 3. + * This nested list should be compacted by the HTML writer. + + .. _target: + + .. Even if this item contains a target and a comment. + Enumerated Lists ---------------- |