From: <mi...@us...> - 2009-05-18 09:40:54
|
Author: milde Date: 2009-05-18 11:40:42 +0200 (Mon, 18 May 2009) New Revision: 5949 Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt trunk/docutils/test/functional/input/data/standard.txt Log: Better explain optional wrapping around images and figures in the test document. Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2009-05-14 10:27:43 UTC (rev 5948) +++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2009-05-18 09:40:42 UTC (rev 5949) @@ -554,11 +554,13 @@ <p>A left-aligned image:</p> <img align="left" alt="../../../docs/user/rst/images/biohazard.png" class="align-left" src="../../../docs/user/rst/images/biohazard.png" /> <p>This paragraph might flow around the image. -If it does or not, depends on the output format and the viewer.</p> +The specific behavior depends upon the style sheet and +the browser or rendering software used.</p> <p>A right-aligned image:</p> <img align="right" alt="../../../docs/user/rst/images/biohazard.png" class="align-right" src="../../../docs/user/rst/images/biohazard.png" /> <p>This paragraph might flow around the image. -If it does or not, depends on the output format and the viewer.</p> +The specific behavior depends upon the style sheet and +the browser or rendering software used.</p> <p>For inline images see <a class="reference internal" href="#substitution-definitions">Substitution Definitions</a>.</p> <p>Image size:</p> <p>An image 2 em wide:</p> @@ -605,8 +607,8 @@ <p>The legend may consist of several paragraphs.</p> </div> </div> -<p>This paragraph might flow around the figure if the <tt class="docutils literal"><span class="pre">figwidth</span></tt> -argument is set and smaller than the text width.</p> +<p>This paragraph might flow around the figure. The specific behavior depends +upon the style sheet and the browser or rendering software used.</p> <p>A centered figure:</p> <div align="center" class="figure"> <img alt="../../../docs/user/rst/images/biohazard.png" src="../../../docs/user/rst/images/biohazard.png" style="width: 50px;" /> @@ -616,8 +618,8 @@ <p>The legend may consist of several paragraphs.</p> </div> </div> -<p>This paragraph might flow around the figure if the <tt class="docutils literal"><span class="pre">figwidth</span></tt> -argument is set and smaller than the text width.</p> +<p>This paragraph might flow around the figure. The specific behavior depends +upon the style sheet and the browser or rendering software used.</p> <p>A right-aligned figure:</p> <div align="right" class="figure"> <img alt="../../../docs/user/rst/images/biohazard.png" src="../../../docs/user/rst/images/biohazard.png" style="width: 50px;" /> @@ -627,8 +629,8 @@ <p>The legend may consist of several paragraphs.</p> </div> </div> -<p>This paragraph might flow around the figure if the <tt class="docutils literal"><span class="pre">figwidth</span></tt> -argument is set and smaller than the text width.</p> +<p>This paragraph might flow around the figure. The specific behavior depends +upon the style sheet and the browser or rendering software used.</p> </div> <div class="section" id="admonitions"> <h3><a class="toc-backref" href="#id75">2.14.3 Admonitions</a></h3> Modified: trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2009-05-14 10:27:43 UTC (rev 5948) +++ trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2009-05-18 09:40:42 UTC (rev 5949) @@ -1168,13 +1168,15 @@ <image align="left" uri="../../../docs/user/rst/images/biohazard.png"> <paragraph> This paragraph might flow around the image. - If it does or not, depends on the output format and the viewer. + The specific behavior depends upon the style sheet and + the browser or rendering software used. <paragraph> A right-aligned image: <image align="right" uri="../../../docs/user/rst/images/biohazard.png"> <paragraph> This paragraph might flow around the image. - If it does or not, depends on the output format and the viewer. + The specific behavior depends upon the style sheet and + the browser or rendering software used. <paragraph> For inline images see <reference name="Substitution Definitions" refid="substitution-definitions"> @@ -1246,11 +1248,8 @@ <paragraph> The legend may consist of several paragraphs. <paragraph> - This paragraph might flow around the figure if the - <literal> - figwidth - - argument is set and smaller than the text width. + This paragraph might flow around the figure. The specific behavior depends + upon the style sheet and the browser or rendering software used. <paragraph> A centered figure: <figure align="center"> @@ -1263,11 +1262,8 @@ <paragraph> The legend may consist of several paragraphs. <paragraph> - This paragraph might flow around the figure if the - <literal> - figwidth - - argument is set and smaller than the text width. + This paragraph might flow around the figure. The specific behavior depends + upon the style sheet and the browser or rendering software used. <paragraph> A right-aligned figure: <figure align="right"> @@ -1280,11 +1276,8 @@ <paragraph> The legend may consist of several paragraphs. <paragraph> - This paragraph might flow around the figure if the - <literal> - figwidth - - argument is set and smaller than the text width. + This paragraph might flow around the figure. The specific behavior depends + upon the style sheet and the browser or rendering software used. <section ids="admonitions" names="admonitions"> <title auto="1" refid="id74"> <generated classes="sectnum"> Modified: trunk/docutils/test/functional/input/data/standard.txt =================================================================== --- trunk/docutils/test/functional/input/data/standard.txt 2009-05-14 10:27:43 UTC (rev 5948) +++ trunk/docutils/test/functional/input/data/standard.txt 2009-05-18 09:40:42 UTC (rev 5949) @@ -450,7 +450,8 @@ :align: left This paragraph might flow around the image. -If it does or not, depends on the output format and the viewer. +The specific behavior depends upon the style sheet and +the browser or rendering software used. A right-aligned image: @@ -458,7 +459,8 @@ :align: right This paragraph might flow around the image. -If it does or not, depends on the output format and the viewer. +The specific behavior depends upon the style sheet and +the browser or rendering software used. For inline images see `Substitution Definitions`_. @@ -522,8 +524,8 @@ The legend may consist of several paragraphs. -This paragraph might flow around the figure if the ``figwidth`` -argument is set and smaller than the text width. +This paragraph might flow around the figure. The specific behavior depends +upon the style sheet and the browser or rendering software used. A centered figure: @@ -537,8 +539,8 @@ The legend may consist of several paragraphs. -This paragraph might flow around the figure if the ``figwidth`` -argument is set and smaller than the text width. +This paragraph might flow around the figure. The specific behavior depends +upon the style sheet and the browser or rendering software used. A right-aligned figure: @@ -552,8 +554,8 @@ The legend may consist of several paragraphs. -This paragraph might flow around the figure if the ``figwidth`` -argument is set and smaller than the text width. +This paragraph might flow around the figure. The specific behavior depends +upon the style sheet and the browser or rendering software used. Admonitions |