Improve and test "compound" handling in LaTeX.

Test samples added to standard.txt allow inspection of the outcome of
compound handling for all output formats.

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

1 files changed, 69 insertions, 17 deletions

diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html
index aa5c71277..53e7a9de5 100644
--- a/docutils/test/functional/expected/standalone_rst_html4css1.html
+++ b/docutils/test/functional/expected/standalone_rst_html4css1.html
@@ -854,21 +854,27 @@ allowed (e.g. inside a directive).</p>
 </div>
 <div class="section" id="compound-paragraph">
 <h3><a class="toc-backref" href="#id83">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>
-<ul class="compound-last simple">
-<li>Compound 1, list item one.</li>
-<li>Compound 1, list item two.</li>
-</ul>
-</div>
-<p>Another compound statement:</p>
+<p>The <em>compound</em> directive is used to create a &quot;compound paragraph&quot;, which
+is a single logical paragraph containing multiple physical body
+elements. For example:</p>
 <div class="compound">
-<p class="compound-first">Compound 2, a literal block:</p>
+<p class="compound-first">The 'rm' command is very dangerous.  If you are logged
+in as root and enter</p>
 <pre class="compound-middle literal-block">
-Compound 2, literal.
+cd /
+rm -rf *
 </pre>
-<p class="compound-last">Compound 2, this is a test.</p>
+<p class="compound-last">you will erase the entire contents of your file system.</p>
+</div>
+<p>Test the handling and display of compound paragraphs:</p>
+<div class="some-class compound">
+<p class="compound-first">Compound 2, paragraph 1,</p>
+<p class="compound-middle">compound 2, paragraph 2,</p>
+<ul class="compound-middle simple">
+<li>list item 1,</li>
+<li>list item 2,</li>
+</ul>
+<p class="compound-last">compound 2, paragraph 3.</p>
 </div>
 <div class="compound">
 <p>Compound 3, only consisting of one paragraph.</p>
@@ -878,7 +884,7 @@ Compound 2, literal.
 Compound 4.
 This one starts with a literal block.
 </pre>
-<p class="compound-last">Compound 4, a paragraph.</p>
+<p class="compound-last">Compound 4, paragraph following the literal block.</p>
 </div>
 <p>Now something <em>really</em> perverted -- a nested compound block.  This is
 just to test that it works at all; the results don't have to be
@@ -886,13 +892,14 @@ meaningful.</p>
 <div class="compound">
 <p class="compound-first">Compound 5, block 1 (a paragraph).</p>
 <div class="compound-middle compound">
-<p class="compound-first">Compound 6, block 2 in compound 5.</p>
+<p class="compound-first">Compound 6 is block 2 in compound 5.</p>
 <p class="compound-last">Compound 6, another paragraph.</p>
 </div>
 <p class="compound-last">Compound 5, block 3 (a paragraph).</p>
 </div>
 <div class="compound">
-<p class="compound-first">Compound 7, with a table inside:</p>
+<p class="compound-first">Compound 7, tests the inclusion of various block-level
+elements in one logical paragraph. First a table,</p>
 <table border="1" class="compound-middle docutils">
 <colgroup>
 <col width="33%" />
@@ -916,8 +923,53 @@ paragraph.</td>
 </tr>
 </tbody>
 </table>
-<p class="compound-middle">Compound 7, a paragraph after the table.</p>
-<p class="compound-last">Compound 7, another paragraph.</p>
+<p class="compound-middle">followed by a paragraph. This physical paragraph is
+actually a continuation of the paragraph before the table. It is followed
+by</p>
+<blockquote class="compound-middle">
+a quote and</blockquote>
+<ol class="compound-middle arabic simple">
+<li>an enumerated list,</li>
+</ol>
+<p class="compound-middle">a paragraph,</p>
+<table class="compound-middle docutils option-list" frame="void" rules="none">
+<col class="option" />
+<col class="description" />
+<tbody valign="top">
+<tr><td class="option-group">
+<kbd><span class="option">--an</span></kbd></td>
+<td>option list,</td></tr>
+</tbody>
+</table>
+<p class="compound-middle">a paragraph,</p>
+<table class="compound-middle docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field"><th class="field-name">a field:</th><td class="field-body">list,</td>
+</tr>
+</tbody>
+</table>
+<p class="compound-middle">a paragraph,</p>
+<dl class="compound-middle docutils">
+<dt>a definition</dt>
+<dd>list,</dd>
+</dl>
+<p class="compound-middle">a paragraph, an image:</p>
+<img alt="../../../docs/user/rst/images/biohazard.png" class="compound-middle" src="../../../docs/user/rst/images/biohazard.png" />
+<p class="compound-middle">a paragraph,</p>
+<div class="compound-middle line-block">
+<div class="line">a line</div>
+<div class="line">block,</div>
+</div>
+<p class="compound-middle">a paragraph followed by a comment,</p>
+<!-- this is a comment -->
+<p class="compound-middle">a paragraph, a</p>
+<div class="admonition note compound-middle">
+<p class="first admonition-title">Note</p>
+<p class="last">with content</p>
+</div>
+<p class="compound-last">and the final paragraph of the compound 7.</p>
 </div>
 </div>
 <div class="section" id="parsed-literal-blocks">