moved container test to the end of standard.txt test data file;

implemented container for latex2e

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4076 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

5 files changed, 142 insertions, 111 deletions

diff --git a/test/functional/expected/standalone_rst_html4css1.html b/test/functional/expected/standalone_rst_html4css1.html
index a898da047..f95d99cb9 100644
--- a/test/functional/expected/standalone_rst_html4css1.html
+++ b/test/functional/expected/standalone_rst_html4css1.html
@@ -125,13 +125,14 @@ They are transformed from section titles after parsing. -->
 <li><a class="reference" href="#substitution-definitions" id="id62" name="id62">2.15&nbsp;&nbsp;&nbsp;Substitution Definitions</a></li>
 <li><a class="reference" href="#comments" id="id63" name="id63">2.16&nbsp;&nbsp;&nbsp;Comments</a></li>
 <li><a class="reference" href="#raw-text" id="id64" name="id64">2.17&nbsp;&nbsp;&nbsp;Raw text</a></li>
-<li><a class="reference" href="#colspanning-tables" id="id65" name="id65">2.18&nbsp;&nbsp;&nbsp;Colspanning tables</a></li>
-<li><a class="reference" href="#rowspanning-tables" id="id66" name="id66">2.19&nbsp;&nbsp;&nbsp;Rowspanning tables</a></li>
-<li><a class="reference" href="#complex-tables" id="id67" name="id67">2.20&nbsp;&nbsp;&nbsp;Complex tables</a></li>
-<li><a class="reference" href="#list-tables" id="id68" name="id68">2.21&nbsp;&nbsp;&nbsp;List Tables</a></li>
+<li><a class="reference" href="#container" id="id65" name="id65">2.18&nbsp;&nbsp;&nbsp;Container</a></li>
+<li><a class="reference" href="#colspanning-tables" id="id66" name="id66">2.19&nbsp;&nbsp;&nbsp;Colspanning tables</a></li>
+<li><a class="reference" href="#rowspanning-tables" id="id67" name="id67">2.20&nbsp;&nbsp;&nbsp;Rowspanning tables</a></li>
+<li><a class="reference" href="#complex-tables" id="id68" name="id68">2.21&nbsp;&nbsp;&nbsp;Complex tables</a></li>
+<li><a class="reference" href="#list-tables" id="id69" name="id69">2.22&nbsp;&nbsp;&nbsp;List Tables</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#error-handling" id="id69" name="id69">3&nbsp;&nbsp;&nbsp;Error Handling</a></li>
+<li><a class="reference" href="#error-handling" id="id70" name="id70">3&nbsp;&nbsp;&nbsp;Error Handling</a></li>
 </ul>
 </div>
 <div class="section">
@@ -476,7 +477,7 @@ Here's a reference to the next footnote: <a class="footnote-reference" href="#id
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
 <tr><td class="label"><a name="id15">[4]</a></td><td>Here's an unreferenced footnote, with a reference to a
-nonexistent footnote: <a href="#id78" name="id79"><span class="problematic" id="id79"><span id="id16"></span>[5]_</span></a>.</td></tr>
+nonexistent footnote: <a href="#id79" name="id80"><span class="problematic" id="id80"><span id="id16"></span>[5]_</span></a>.</td></tr>
 </tbody>
 </table>
 </div>
@@ -489,7 +490,7 @@ nonexistent footnote: <a href="#id78" name="id79"><span class="problematic" id="
 rendered separately and differently from footnotes.</td></tr>
 </tbody>
 </table>
-<p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id17" name="id17">[CIT2002]</a>, and a <a href="#id80" name="id81"><span class="problematic" id="id81"><span id="id18"></span>[nonexistent]_</span></a>
+<p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id17" name="id17">[CIT2002]</a>, and a <a href="#id81" name="id82"><span class="problematic" id="id82"><span id="id18"></span>[nonexistent]_</span></a>
 citation.</p>
 </div>
 <div class="section">
@@ -503,7 +504,7 @@ hyperlink targets</a> are also possible.</p>
 &quot;<a class="reference" href="http://www.python.org/">Python</a> <a class="footnote-reference" href="#id25" id="id27" name="id27">[5]</a>&quot;.</p>
 <p>Targets may be indirect and anonymous.  Thus <a class="reference" href="#id22">this phrase</a> may also
 refer to the <a class="reference" href="#id22">Targets</a> section.</p>
-<p>Here's a <a href="#id82" name="id83"><span class="problematic" id="id83">`hyperlink reference without a target`_</span></a>, which generates an
+<p>Here's a <a href="#id83" name="id84"><span class="problematic" id="id84">`hyperlink reference without a target`_</span></a>, which generates an
 error.</p>
 <div class="section">
 <h3><a class="toc-backref" href="#id51" id="duplicate-target-names" name="duplicate-target-names">2.13.1&nbsp;&nbsp;&nbsp;Duplicate Target Names</a></h3>
@@ -515,34 +516,34 @@ explicit targets will generate &quot;warning&quot; (level-2) system messages.</p
 <h3><a class="toc-backref" href="#id52" id="id20" name="id20">2.13.2&nbsp;&nbsp;&nbsp;Duplicate Target Names</a></h3>
 <p>Since there are two &quot;Duplicate Target Names&quot; section headers, we
 cannot uniquely refer to either of them by name.  If we try to (like
-this: <a href="#id84" name="id85"><span class="problematic" id="id85">`Duplicate Target Names`_</span></a>), an error is generated.</p>
+this: <a href="#id85" name="id86"><span class="problematic" id="id86">`Duplicate Target Names`_</span></a>), an error is generated.</p>
 </div>
 </div>
 <div class="section">
 <h2><a class="toc-backref" href="#id53" id="directives" name="directives">2.14&nbsp;&nbsp;&nbsp;Directives</a></h2>
 <div class="contents local topic">
 <ul class="auto-toc simple">
-<li><a class="reference" href="#document-parts" id="id70" name="id70">2.14.1&nbsp;&nbsp;&nbsp;Document Parts</a></li>
-<li><a class="reference" href="#images" id="id71" name="id71">2.14.2&nbsp;&nbsp;&nbsp;Images</a></li>
-<li><a class="reference" href="#admonitions" id="id72" name="id72">2.14.3&nbsp;&nbsp;&nbsp;Admonitions</a></li>
-<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id73" name="id73">2.14.4&nbsp;&nbsp;&nbsp;Topics, Sidebars, and Rubrics</a></li>
-<li><a class="reference" href="#target-footnotes" id="id74" name="id74">2.14.5&nbsp;&nbsp;&nbsp;Target Footnotes</a></li>
-<li><a class="reference" href="#replacement-text" id="id75" name="id75">2.14.6&nbsp;&nbsp;&nbsp;Replacement Text</a></li>
-<li><a class="reference" href="#compound-paragraph" id="id76" name="id76">2.14.7&nbsp;&nbsp;&nbsp;Compound Paragraph</a></li>
-<li><a class="reference" href="#parsed-literal-blocks" id="id77" name="id77">2.14.8&nbsp;&nbsp;&nbsp;Parsed Literal Blocks</a></li>
+<li><a class="reference" href="#document-parts" id="id71" name="id71">2.14.1&nbsp;&nbsp;&nbsp;Document Parts</a></li>
+<li><a class="reference" href="#images" id="id72" name="id72">2.14.2&nbsp;&nbsp;&nbsp;Images</a></li>
+<li><a class="reference" href="#admonitions" id="id73" name="id73">2.14.3&nbsp;&nbsp;&nbsp;Admonitions</a></li>
+<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id74" name="id74">2.14.4&nbsp;&nbsp;&nbsp;Topics, Sidebars, and Rubrics</a></li>
+<li><a class="reference" href="#target-footnotes" id="id75" name="id75">2.14.5&nbsp;&nbsp;&nbsp;Target Footnotes</a></li>
+<li><a class="reference" href="#replacement-text" id="id76" name="id76">2.14.6&nbsp;&nbsp;&nbsp;Replacement Text</a></li>
+<li><a class="reference" href="#compound-paragraph" id="id77" name="id77">2.14.7&nbsp;&nbsp;&nbsp;Compound Paragraph</a></li>
+<li><a class="reference" href="#parsed-literal-blocks" id="id78" name="id78">2.14.8&nbsp;&nbsp;&nbsp;Parsed Literal Blocks</a></li>
 </ul>
 </div>
 <p>These are just a sample of the many reStructuredText Directives.  For
 others, please see
 <a class="reference" href="http://docutils.sourceforge.net/docs/ref/rst/directives.html">http://docutils.sourceforge.net/docs/ref/rst/directives.html</a>.</p>
 <div class="section">
-<h3><a class="toc-backref" href="#id70" id="document-parts" name="document-parts">2.14.1&nbsp;&nbsp;&nbsp;Document Parts</a></h3>
+<h3><a class="toc-backref" href="#id71" id="document-parts" name="document-parts">2.14.1&nbsp;&nbsp;&nbsp;Document Parts</a></h3>
 <p>An example of the &quot;contents&quot; directive can be seen above this section
 (a local, untitled table of <a class="reference" href="#contents">contents</a>) and at the beginning of the
 document (a document-wide <a class="reference" href="#table-of-contents">table of contents</a>).</p>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id71" id="images" name="images">2.14.2&nbsp;&nbsp;&nbsp;Images</a></h3>
+<h3><a class="toc-backref" href="#id72" id="images" name="images">2.14.2&nbsp;&nbsp;&nbsp;Images</a></h3>
 <p>An image directive (also clickable -- a hyperlink reference):</p>
 <a class="reference image-reference" href="#directives"><img alt="../../../docs/user/rst/images/title.png" class="class1 class2" src="../../../docs/user/rst/images/title.png" /></a>
 <p>Image with multiple IDs:</p>
@@ -610,7 +611,7 @@ document (a document-wide <a class="reference" href="#table-of-contents">table o
 <img alt="../../../docs/user/rst/images/biohazard.png" src="../../../docs/user/rst/images/biohazard.png" style="height: 3cm;" />
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id72" id="admonitions" name="admonitions">2.14.3&nbsp;&nbsp;&nbsp;Admonitions</a></h3>
+<h3><a class="toc-backref" href="#id73" id="admonitions" name="admonitions">2.14.3&nbsp;&nbsp;&nbsp;Admonitions</a></h3>
 <div class="attention">
 <p class="first admonition-title">Attention!</p>
 <p class="last">Directives at large.</p>
@@ -659,7 +660,7 @@ Reader discretion is strongly advised.</p>
 </div>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id73" id="topics-sidebars-and-rubrics" name="topics-sidebars-and-rubrics">2.14.4&nbsp;&nbsp;&nbsp;Topics, Sidebars, and Rubrics</a></h3>
+<h3><a class="toc-backref" href="#id74" id="topics-sidebars-and-rubrics" name="topics-sidebars-and-rubrics">2.14.4&nbsp;&nbsp;&nbsp;Topics, Sidebars, and Rubrics</a></h3>
 <div class="sidebar">
 <p class="first sidebar-title">Sidebar Title</p>
 <p class="sidebar-subtitle">Optional Subtitle</p>
@@ -676,7 +677,7 @@ background color.</p>
 <p class="rubric">This is a rubric</p>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id74" id="target-footnotes" name="target-footnotes">2.14.5&nbsp;&nbsp;&nbsp;Target Footnotes</a></h3>
+<h3><a class="toc-backref" href="#id75" id="target-footnotes" name="target-footnotes">2.14.5&nbsp;&nbsp;&nbsp;Target Footnotes</a></h3>
 <table class="docutils footnote" frame="void" id="id25" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
@@ -691,11 +692,11 @@ background color.</p>
 </table>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id75" id="replacement-text" name="replacement-text">2.14.6&nbsp;&nbsp;&nbsp;Replacement Text</a></h3>
+<h3><a class="toc-backref" href="#id76" id="replacement-text" name="replacement-text">2.14.6&nbsp;&nbsp;&nbsp;Replacement Text</a></h3>
 <p>I recommend you try <a class="reference" href="http://www.python.org/">Python, <em>the</em> best language around</a> <a class="footnote-reference" href="#id25" id="id28" name="id28">[5]</a>.</p>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id76" id="compound-paragraph" name="compound-paragraph">2.14.7&nbsp;&nbsp;&nbsp;Compound Paragraph</a></h3>
+<h3><a class="toc-backref" href="#id77" id="compound-paragraph" name="compound-paragraph">2.14.7&nbsp;&nbsp;&nbsp;Compound Paragraph</a></h3>
 <div class="some-class compound">
 <p class="compound-first">Compound 1, paragraph 1.</p>
 <p class="compound-middle">Compound 1, paragraph 2.</p>
@@ -763,7 +764,7 @@ paragraph.</td>
 </div>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id77" id="parsed-literal-blocks" name="parsed-literal-blocks">2.14.8&nbsp;&nbsp;&nbsp;Parsed Literal Blocks</a></h3>
+<h3><a class="toc-backref" href="#id78" id="parsed-literal-blocks" name="parsed-literal-blocks">2.14.8&nbsp;&nbsp;&nbsp;Parsed Literal Blocks</a></h3>
 <pre class="literal-block">
 This is a parsed literal block.
     This line is indented.  The next line is blank.
@@ -795,7 +796,14 @@ Double-dashes - - "- -" - - must be escaped somehow in HTML output. -->
 A test.Second test.<div class="myclass">Another test with myclass set.</div><p>This is the <span class="myrawroleclass">fourth test</span> with myrawroleclass set.</p>
 Fifth test in HTML.<br />Line two.</div>
 <div class="section">
-<h2><a class="toc-backref" href="#id65" id="colspanning-tables" name="colspanning-tables">2.18&nbsp;&nbsp;&nbsp;Colspanning tables</a></h2>
+<h2><a class="toc-backref" href="#id65" id="container" name="container">2.18&nbsp;&nbsp;&nbsp;Container</a></h2>
+<div class="custom container">
+<p>paragraph 1</p>
+<p>paragraph 2</p>
+</div>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id66" id="colspanning-tables" name="colspanning-tables">2.19&nbsp;&nbsp;&nbsp;Colspanning tables</a></h2>
 <p>This table has a cell spanning two columns:</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -833,7 +841,7 @@ Fifth test in HTML.<br />Line two.</div>
 </table>
 </div>
 <div class="section">
-<h2><a class="toc-backref" href="#id66" id="rowspanning-tables" name="rowspanning-tables">2.19&nbsp;&nbsp;&nbsp;Rowspanning tables</a></h2>
+<h2><a class="toc-backref" href="#id67" id="rowspanning-tables" name="rowspanning-tables">2.20&nbsp;&nbsp;&nbsp;Rowspanning tables</a></h2>
 <p>Here's a table with cells spanning several rows:</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -866,7 +874,7 @@ cell.</td>
 </table>
 </div>
 <div class="section">
-<h2><a class="toc-backref" href="#id67" id="complex-tables" name="complex-tables">2.20&nbsp;&nbsp;&nbsp;Complex tables</a></h2>
+<h2><a class="toc-backref" href="#id68" id="complex-tables" name="complex-tables">2.21&nbsp;&nbsp;&nbsp;Complex tables</a></h2>
 <p>Here's a complex table, which should test all features.</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -915,7 +923,7 @@ empty: <tt class="docutils literal"><span class="pre">--&gt;</span></tt></td>
 </table>
 </div>
 <div class="section">
-<h2><a class="toc-backref" href="#id68" id="list-tables" name="list-tables">2.21&nbsp;&nbsp;&nbsp;List Tables</a></h2>
+<h2><a class="toc-backref" href="#id69" id="list-tables" name="list-tables">2.22&nbsp;&nbsp;&nbsp;List Tables</a></h2>
 <p>Here's a list table exercising all features:</p>
 <table border="1" class="test docutils">
 <caption>list table with integral header</caption>
@@ -949,32 +957,28 @@ crunchy, now would it?</td>
 </div>
 </div>
 <div class="section">
-<h1><a class="toc-backref" href="#id69" id="error-handling" name="error-handling">3&nbsp;&nbsp;&nbsp;Error Handling</a></h1>
+<h1><a class="toc-backref" href="#id70" id="error-handling" name="error-handling">3&nbsp;&nbsp;&nbsp;Error Handling</a></h1>
 <p>Any errors caught during processing will generate system messages.</p>
 <p>There should be five messages in the following, auto-generated
 section, &quot;Docutils System Messages&quot;:</p>
 <!-- section should be added by Docutils automatically -->
-<div class="custom container">
-<p>paragraph 1</p>
-<p>paragraph 2</p>
-</div>
 </div>
 <div class="system-messages section">
 <h1><a>Docutils System Messages</a></h1>
 <div class="system-message" id="id23">
 <p class="system-message-title">System Message: <a name="id23">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 100); <em><a href="#id24">backlink</a></em></p>
 Undefined substitution referenced: &quot;problematic&quot;.</div>
-<div class="system-message" id="id78">
-<p class="system-message-title">System Message: <a name="id78">ERROR/3</a> (<tt class="docutils">functional/input/standalone_rst_html4css1.txt</tt>, line 358); <em><a href="#id79">backlink</a></em></p>
+<div class="system-message" id="id79">
+<p class="system-message-title">System Message: <a name="id79">ERROR/3</a> (<tt class="docutils">functional/input/standalone_rst_html4css1.txt</tt>, line 358); <em><a href="#id80">backlink</a></em></p>
 Unknown target name: &quot;5&quot;.</div>
-<div class="system-message" id="id80">
-<p class="system-message-title">System Message: <a name="id80">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 367); <em><a href="#id81">backlink</a></em></p>
+<div class="system-message" id="id81">
+<p class="system-message-title">System Message: <a name="id81">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 367); <em><a href="#id82">backlink</a></em></p>
 Unknown target name: &quot;nonexistent&quot;.</div>
-<div class="system-message" id="id82">
-<p class="system-message-title">System Message: <a name="id82">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 394); <em><a href="#id83">backlink</a></em></p>
+<div class="system-message" id="id83">
+<p class="system-message-title">System Message: <a name="id83">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 394); <em><a href="#id84">backlink</a></em></p>
 Unknown target name: &quot;hyperlink reference without a target&quot;.</div>
-<div class="system-message" id="id84">
-<p class="system-message-title">System Message: <a name="id84">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 407); <em><a href="#id85">backlink</a></em></p>
+<div class="system-message" id="id85">
+<p class="system-message-title">System Message: <a name="id85">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 407); <em><a href="#id86">backlink</a></em></p>
 Duplicate target name, cannot be used as a unique reference: &quot;duplicate target names&quot;.</div>
 </div>
 </div>
diff --git a/test/functional/expected/standalone_rst_latex.tex b/test/functional/expected/standalone_rst_latex.tex
index 4f318f90a..42cb057a9 100644
--- a/test/functional/expected/standalone_rst_latex.tex
+++ b/test/functional/expected/standalone_rst_latex.tex
@@ -208,9 +208,11 @@ reStructuredText construct.
 
 \item {} \href{\#raw-text}{2.17~~~Raw text}
 
-\item {} \href{\#colspanning-tables}{2.18~~~Colspanning tables}
+\item {} \href{\#container}{2.18~~~Container}
 
-\item {} \href{\#rowspanning-tables}{2.19~~~Rowspanning tables}
+\item {} \href{\#colspanning-tables}{2.19~~~Colspanning tables}
+
+\item {} \href{\#rowspanning-tables}{2.20~~~Rowspanning tables}
 
 \end{list}
 
@@ -885,9 +887,9 @@ A right-aligned image:
 {\hfill\includegraphics{../../../docs/user/rst/images/biohazard.png}}
 
 A figure directive:
-\begin{figure}[htbp]\begin{center}
+\begin{figure}[htbp]\begin{flushright}
 
-\includegraphics{../../../docs/user/rst/images/biohazard.png}
+\includegraphics[width=50]{../../../docs/user/rst/images/biohazard.png}
 \caption{A figure is an image with a caption and/or a legend:}{\small 
 \begin{longtable}[c]{|p{0.16\locallinewidth}|p{0.56\locallinewidth}|}
 \hline
@@ -912,31 +914,31 @@ Well it is, isn't it?
 \end{longtable}
 
 This paragraph is also part of the legend.
-}\end{center}\end{figure}
+}\end{flushright}\end{figure}
 
 This paragraph might flow around the figure...
 
 A centered figure:
-\begin{figure}[htbp]\begin{center}
+\begin{figure}[htbp]\begin{flushcenter}
 
-\includegraphics{../../../docs/user/rst/images/biohazard.png}
+\includegraphics[width=50]{../../../docs/user/rst/images/biohazard.png}
 \caption{This is the caption.}{\small 
 This is the legend.
 
 The legend may consist of several paragraphs.
-}\end{center}\end{figure}
+}\end{flushcenter}\end{figure}
 
 This paragraph might flow around the figure...
 
 A left-aligned figure:
-\begin{figure}[htbp]\begin{center}
+\begin{figure}[htbp]\begin{flushleft}
 
-\includegraphics{../../../docs/user/rst/images/biohazard.png}
+\includegraphics[width=50]{../../../docs/user/rst/images/biohazard.png}
 \caption{This is the caption.}{\small 
 This is the legend.
 
 The legend may consist of several paragraphs.
-}\end{center}\end{figure}
+}\end{flushleft}\end{figure}
 
 This paragraph might flow around the figure...
 
@@ -944,15 +946,15 @@ Now widths:
 
 An image 2 em wide:
 
-\includegraphics{../../../docs/user/rst/images/biohazard.png}
+\includegraphics[width=2em]{../../../docs/user/rst/images/biohazard.png}
 
 An image 2 em wide and 30 pixel high:
 
-\includegraphics{../../../docs/user/rst/images/biohazard.png}
+\includegraphics[width=2em]{../../../docs/user/rst/images/biohazard.png}
 
 An image occupying 70{\%} of the line width:
 
-\includegraphics{../../../docs/user/rst/images/biohazard.png}
+\includegraphics[width=70%]{../../../docs/user/rst/images/biohazard.png}
 
 An image 3 cm high:
 
@@ -1255,9 +1257,20 @@ Fifth test in LaTeX.\\Line two.
 
 %___________________________________________________________________________
 
+\hypertarget{container}{}
+\pdfbookmark[1]{2.18~~~Container}{container}
+\subsection*{2.18~~~Container}
+
+paragraph 1
+
+paragraph 2
+
+
+%___________________________________________________________________________
+
 \hypertarget{colspanning-tables}{}
-\pdfbookmark[1]{2.18~~~Colspanning tables}{colspanning-tables}
-\subsection*{2.18~~~Colspanning tables}
+\pdfbookmark[1]{2.19~~~Colspanning tables}{colspanning-tables}
+\subsection*{2.19~~~Colspanning tables}
 
 This table has a cell spanning two columns:
 
@@ -1316,8 +1329,8 @@ True
 %___________________________________________________________________________
 
 \hypertarget{rowspanning-tables}{}
-\pdfbookmark[1]{2.19~~~Rowspanning tables}{rowspanning-tables}
-\subsection*{2.19~~~Rowspanning tables}
+\pdfbookmark[1]{2.20~~~Rowspanning tables}{rowspanning-tables}
+\subsection*{2.20~~~Rowspanning tables}
 
 Here's a table with cells spanning several rows:
 
diff --git a/test/functional/expected/standalone_rst_pseudoxml.txt b/test/functional/expected/standalone_rst_pseudoxml.txt
index 22c8f4bde..edce5591d 100644
--- a/test/functional/expected/standalone_rst_pseudoxml.txt
+++ b/test/functional/expected/standalone_rst_pseudoxml.txt
@@ -294,31 +294,37 @@
                                 Raw text
                     <list_item>
                         <paragraph>
-                            <reference ids="id65" refid="colspanning-tables">
+                            <reference ids="id65" refid="container">
                                 <generated classes="sectnum">
                                     2.18   
-                                Colspanning tables
+                                Container
                     <list_item>
                         <paragraph>
-                            <reference ids="id66" refid="rowspanning-tables">
+                            <reference ids="id66" refid="colspanning-tables">
                                 <generated classes="sectnum">
                                     2.19   
-                                Rowspanning tables
+                                Colspanning tables
                     <list_item>
                         <paragraph>
-                            <reference ids="id67" refid="complex-tables">
+                            <reference ids="id67" refid="rowspanning-tables">
                                 <generated classes="sectnum">
                                     2.20   
-                                Complex tables
+                                Rowspanning tables
                     <list_item>
                         <paragraph>
-                            <reference ids="id68" refid="list-tables">
+                            <reference ids="id68" refid="complex-tables">
                                 <generated classes="sectnum">
                                     2.21   
+                                Complex tables
+                    <list_item>
+                        <paragraph>
+                            <reference ids="id69" refid="list-tables">
+                                <generated classes="sectnum">
+                                    2.22   
                                 List Tables
             <list_item>
                 <paragraph>
-                    <reference ids="id69" refid="error-handling">
+                    <reference ids="id70" refid="error-handling">
                         <generated classes="sectnum">
                             3   
                         Error Handling
@@ -968,7 +974,7 @@
                 <paragraph>
                     Here's an unreferenced footnote, with a reference to a
                     nonexistent footnote: 
-                    <problematic ids="id79 id16" refid="id78">
+                    <problematic ids="id80 id16" refid="id79">
                         [5]_
                     .
         <section ids="citations" names="citations">
@@ -987,7 +993,7 @@
                 <citation_reference ids="id17" refid="cit2002">
                     CIT2002
                 , and a 
-                <problematic ids="id81 id18" refid="id80">
+                <problematic ids="id82 id18" refid="id81">
                     [nonexistent]_
                 
                 citation.
@@ -1038,7 +1044,7 @@
             <target anonymous="1" ids="id19" refid="id22">
             <paragraph>
                 Here's a 
-                <problematic ids="id83" refid="id82">
+                <problematic ids="id84" refid="id83">
                     `hyperlink reference without a target`_
                 , which generates an
                 error.
@@ -1060,7 +1066,7 @@
                     Since there are two "Duplicate Target Names" section headers, we
                     cannot uniquely refer to either of them by name.  If we try to (like
                     this: 
-                    <problematic ids="id85" refid="id84">
+                    <problematic ids="id86" refid="id85">
                         `Duplicate Target Names`_
                     ), an error is generated.
         <section ids="directives" names="directives">
@@ -1072,49 +1078,49 @@
                 <bullet_list classes="auto-toc">
                     <list_item>
                         <paragraph>
-                            <reference ids="id70" refid="document-parts">
+                            <reference ids="id71" refid="document-parts">
                                 <generated classes="sectnum">
                                     2.14.1   
                                 Document Parts
                     <list_item>
                         <paragraph>
-                            <reference ids="id71" refid="images">
+                            <reference ids="id72" refid="images">
                                 <generated classes="sectnum">
                                     2.14.2   
                                 Images
                     <list_item>
                         <paragraph>
-                            <reference ids="id72" refid="admonitions">
+                            <reference ids="id73" refid="admonitions">
                                 <generated classes="sectnum">
                                     2.14.3   
                                 Admonitions
                     <list_item>
                         <paragraph>
-                            <reference ids="id73" refid="topics-sidebars-and-rubrics">
+                            <reference ids="id74" refid="topics-sidebars-and-rubrics">
                                 <generated classes="sectnum">
                                     2.14.4   
                                 Topics, Sidebars, and Rubrics
                     <list_item>
                         <paragraph>
-                            <reference ids="id74" refid="target-footnotes">
+                            <reference ids="id75" refid="target-footnotes">
                                 <generated classes="sectnum">
                                     2.14.5   
                                 Target Footnotes
                     <list_item>
                         <paragraph>
-                            <reference ids="id75" refid="replacement-text">
+                            <reference ids="id76" refid="replacement-text">
                                 <generated classes="sectnum">
                                     2.14.6   
                                 Replacement Text
                     <list_item>
                         <paragraph>
-                            <reference ids="id76" refid="compound-paragraph">
+                            <reference ids="id77" refid="compound-paragraph">
                                 <generated classes="sectnum">
                                     2.14.7   
                                 Compound Paragraph
                     <list_item>
                         <paragraph>
-                            <reference ids="id77" refid="parsed-literal-blocks">
+                            <reference ids="id78" refid="parsed-literal-blocks">
                                 <generated classes="sectnum">
                                     2.14.8   
                                 Parsed Literal Blocks
@@ -1125,7 +1131,7 @@
                     http://docutils.sourceforge.net/docs/ref/rst/directives.html
                 .
             <section ids="document-parts" names="document\ parts">
-                <title auto="1" refid="id70">
+                <title auto="1" refid="id71">
                     <generated classes="sectnum">
                         2.14.1   
                     Document Parts
@@ -1140,7 +1146,7 @@
                         table of contents
                     ).
             <section ids="images" names="images">
-                <title auto="1" refid="id71">
+                <title auto="1" refid="id72">
                     <generated classes="sectnum">
                         2.14.2   
                     Images
@@ -1241,7 +1247,7 @@
                     An image 3 cm high:
                 <image height="3cm" uri="../../../docs/user/rst/images/biohazard.png">
             <section ids="admonitions" names="admonitions">
-                <title auto="1" refid="id72">
+                <title auto="1" refid="id73">
                     <generated classes="sectnum">
                         2.14.3   
                     Admonitions
@@ -1291,7 +1297,7 @@
                         You can make up your own admonition too.
                     <target ids="docutils" names="docutils" refuri="http://docutils.sourceforge.net/">
             <section ids="topics-sidebars-and-rubrics" names="topics,\ sidebars,\ and\ rubrics">
-                <title auto="1" refid="id73">
+                <title auto="1" refid="id74">
                     <generated classes="sectnum">
                         2.14.4   
                     Topics, Sidebars, and Rubrics
@@ -1316,7 +1322,7 @@
                 <rubric>
                     This is a rubric
             <section ids="target-footnotes" names="target\ footnotes">
-                <title auto="1" refid="id74">
+                <title auto="1" refid="id75">
                     <generated classes="sectnum">
                         2.14.5   
                     Target Footnotes
@@ -1333,7 +1339,7 @@
                         <reference refuri="http://docutils.sourceforge.net/">
                             http://docutils.sourceforge.net/
             <section ids="replacement-text" names="replacement\ text">
-                <title auto="1" refid="id75">
+                <title auto="1" refid="id76">
                     <generated classes="sectnum">
                         2.14.6   
                     Replacement Text
@@ -1354,7 +1360,7 @@
                         the
                      best language around
             <section ids="compound-paragraph" names="compound\ paragraph">
-                <title auto="1" refid="id76">
+                <title auto="1" refid="id77">
                     <generated classes="sectnum">
                         2.14.7   
                     Compound Paragraph
@@ -1440,7 +1446,7 @@
                     <paragraph>
                         Compound 7, another paragraph.
             <section ids="parsed-literal-blocks" names="parsed\ literal\ blocks">
-                <title auto="1" refid="id77">
+                <title auto="1" refid="id78">
                     <generated classes="sectnum">
                         2.14.8   
                     Parsed Literal Blocks
@@ -1521,10 +1527,20 @@
                 Fifth test in HTML.<br />Line two.
             <raw format="latex" xml:space="preserve">
                 Fifth test in LaTeX.\\Line two.
-        <section ids="colspanning-tables" names="colspanning\ tables">
+        <section ids="container" names="container">
             <title auto="1" refid="id65">
                 <generated classes="sectnum">
                     2.18   
+                Container
+            <container classes="custom">
+                <paragraph>
+                    paragraph 1
+                <paragraph>
+                    paragraph 2
+        <section ids="colspanning-tables" names="colspanning\ tables">
+            <title auto="1" refid="id66">
+                <generated classes="sectnum">
+                    2.19   
                 Colspanning tables
             <paragraph>
                 This table has a cell spanning two columns:
@@ -1593,9 +1609,9 @@
                                 <paragraph>
                                     True
         <section ids="rowspanning-tables" names="rowspanning\ tables">
-            <title auto="1" refid="id66">
+            <title auto="1" refid="id67">
                 <generated classes="sectnum">
-                    2.19   
+                    2.20   
                 Rowspanning tables
             <paragraph>
                 Here's a table with cells spanning several rows:
@@ -1645,9 +1661,9 @@
                                 <paragraph>
                                     body row 3
         <section ids="complex-tables" names="complex\ tables">
-            <title auto="1" refid="id67">
+            <title auto="1" refid="id68">
                 <generated classes="sectnum">
-                    2.20   
+                    2.21   
                 Complex tables
             <paragraph>
                 Here's a complex table, which should test all features.
@@ -1730,9 +1746,9 @@
                                         -->
                             <entry>
         <section ids="list-tables" names="list\ tables">
-            <title auto="1" refid="id68">
+            <title auto="1" refid="id69">
                 <generated classes="sectnum">
-                    2.21   
+                    2.22   
                 List Tables
             <paragraph>
                 Here's a list table exercising all features:
@@ -1787,7 +1803,7 @@
                                 <paragraph>
                                     On a stick!
     <section ids="error-handling" names="error\ handling">
-        <title auto="1" refid="id69">
+        <title auto="1" refid="id70">
             <generated classes="sectnum">
                 3   
             Error Handling
@@ -1798,26 +1814,21 @@
             section, "Docutils System Messages":
         <comment xml:space="preserve">
             section should be added by Docutils automatically
-        <container classes="custom">
-            <paragraph>
-                paragraph 1
-            <paragraph>
-                paragraph 2
     <section classes="system-messages">
         <title>
             Docutils System Messages
         <system_message backrefs="id24" ids="id23" level="3" line="100" source="functional/input/data/standard.txt" type="ERROR">
             <paragraph>
                 Undefined substitution referenced: "problematic".
-        <system_message backrefs="id79" ids="id78" level="3" line="358" source="functional/input/standalone_rst_html4css1.txt" type="ERROR">
+        <system_message backrefs="id80" ids="id79" level="3" line="358" source="functional/input/standalone_rst_html4css1.txt" type="ERROR">
             <paragraph>
                 Unknown target name: "5".
-        <system_message backrefs="id81" ids="id80" level="3" line="367" source="functional/input/data/standard.txt" type="ERROR">
+        <system_message backrefs="id82" ids="id81" level="3" line="367" source="functional/input/data/standard.txt" type="ERROR">
             <paragraph>
                 Unknown target name: "nonexistent".
-        <system_message backrefs="id83" ids="id82" level="3" line="394" source="functional/input/data/standard.txt" type="ERROR">
+        <system_message backrefs="id84" ids="id83" level="3" line="394" source="functional/input/data/standard.txt" type="ERROR">
             <paragraph>
                 Unknown target name: "hyperlink reference without a target".
-        <system_message backrefs="id85" ids="id84" level="3" line="407" source="functional/input/data/standard.txt" type="ERROR">
+        <system_message backrefs="id86" ids="id85" level="3" line="407" source="functional/input/data/standard.txt" type="ERROR">
             <paragraph>
                 Duplicate target name, cannot be used as a unique reference: "duplicate target names".
diff --git a/test/functional/input/data/standard.txt b/test/functional/input/data/standard.txt
index ea904eaec..c3e12d199 100644
--- a/test/functional/input/data/standard.txt
+++ b/test/functional/input/data/standard.txt
@@ -731,3 +731,12 @@ This is the :raw-role:`fourth test` with myrawroleclass set.
 .. raw:: latex
 
    Fifth test in LaTeX.\\Line two.
+
+Container
+---------
+
+.. container:: custom
+
+   paragraph 1
+
+   paragraph 2
diff --git a/test/functional/input/standalone_rst_html4css1.txt b/test/functional/input/standalone_rst_html4css1.txt
index 4b1e2fdda..05f0287d0 100644
--- a/test/functional/input/standalone_rst_html4css1.txt
+++ b/test/functional/input/standalone_rst_html4css1.txt
@@ -5,9 +5,3 @@
 .. include:: data/table_complex.txt
 .. include:: data/list_table.txt
 .. include:: data/errors.txt
-
-.. container:: custom
-
-   paragraph 1
-
-   paragraph 2