Author: goodger Date: 2005-12-05 15:38:10 +0100 (Mon, 05 Dec 2005) New Revision: 4140 Modified: branches/s5/test/functional/expected/standalone_rst_s5_html_1.html branches/s5/test/functional/expected/standalone_rst_s5_html_2.html branches/s5/test/functional/input/standalone_rst_s5_html.txt Log: changed "expanded" class to "open"; test for both "open" & "compact" Modified: branches/s5/test/functional/expected/standalone_rst_s5_html_1.html =================================================================== --- branches/s5/test/functional/expected/standalone_rst_s5_html_1.html 2005-12-05 14:37:58 UTC (rev 4139) +++ branches/s5/test/functional/expected/standalone_rst_s5_html_1.html 2005-12-05 14:38:10 UTC (rev 4140) @@ -86,23 +86,18 @@ </div> <div class="slide" id="introduction"> <h1>Introduction</h1> -<ul> -<li><p class="first">reStructuredText</p> -<p class="handout">Uses normal reStructuredText as input.</p> +<ul class="compact simple"> +<li>reStructuredText<p class="handout">Uses normal reStructuredText as input.</p> </li> -<li><p class="first">One section per slide</p> -<p class="handout">Each first-level section is converted into a single slide.</p> +<li>One section per slide<p class="handout">Each first-level section is converted into a single slide.</p> </li> -<li><p class="first">(X)HTML output</p> -<p class="handout">Presentations can be viewed using any modern graphical web browser. +<li>(X)HTML output<p class="handout">Presentations can be viewed using any modern graphical web browser. The browser must support CSS, JavaScript, and XHTML. S5 even works with IE!</p> </li> -<li><p class="first">Themes</p> -<p class="handout">A variety of themes are available.</p> +<li>Themes<p class="handout">A variety of themes are available.</p> </li> -<li><p class="first"><tt class="docutils literal"><span class="pre">rst2s5.py</span></tt></p> -<p class="handout">The front-end tool to generate S5 slide shows.</p> +<li><tt class="docutils literal"><span class="pre">rst2s5.py</span></tt><p class="handout">The front-end tool to generate S5 slide shows.</p> </li> </ul> </div> @@ -121,12 +116,17 @@ <div class="slide" id="features-2"> <h1>Features (2)</h1> <p><span class="incremental">Some</span> <span class="incremental">incremental</span> <span class="incremental">text.</span></p> -<ul class="incremental simple"> -<li><span class="tiny">tiny</span> (class & role name: "tiny", e.g. "<tt class="docutils literal"><span class="pre">:tiny:`text`</span></tt>")</li> -<li><span class="small">small</span> ("small")</li> -<li>normal (unstyled)</li> -<li><span class="big">big</span> ("big")</li> -<li><span class="huge">huge</span> ("huge")</li> +<ul class="incremental open"> +<li><p class="first"><span class="tiny">tiny</span> (class & role name: "tiny", e.g. "<tt class="docutils literal"><span class="pre">:tiny:`text`</span></tt>")</p> +</li> +<li><p class="first"><span class="small">small</span> ("small")</p> +</li> +<li><p class="first">normal (unstyled)</p> +</li> +<li><p class="first"><span class="big">big</span> ("big")</p> +</li> +<li><p class="first"><span class="huge">huge</span> ("huge")</p> +</li> </ul> </div> <div class="slide" id="checklist"> Modified: branches/s5/test/functional/expected/standalone_rst_s5_html_2.html =================================================================== --- branches/s5/test/functional/expected/standalone_rst_s5_html_2.html 2005-12-05 14:37:58 UTC (rev 4139) +++ branches/s5/test/functional/expected/standalone_rst_s5_html_2.html 2005-12-05 14:38:10 UTC (rev 4140) @@ -82,23 +82,18 @@ </div> <div class="slide" id="introduction"> <h1>Introduction</h1> -<ul> -<li><p class="first">reStructuredText</p> -<p class="handout">Uses normal reStructuredText as input.</p> +<ul class="compact simple"> +<li>reStructuredText<p class="handout">Uses normal reStructuredText as input.</p> </li> -<li><p class="first">One section per slide</p> -<p class="handout">Each first-level section is converted into a single slide.</p> +<li>One section per slide<p class="handout">Each first-level section is converted into a single slide.</p> </li> -<li><p class="first">(X)HTML output</p> -<p class="handout">Presentations can be viewed using any modern graphical web browser. +<li>(X)HTML output<p class="handout">Presentations can be viewed using any modern graphical web browser. The browser must support CSS, JavaScript, and XHTML. S5 even works with IE!</p> </li> -<li><p class="first">Themes</p> -<p class="handout">A variety of themes are available.</p> +<li>Themes<p class="handout">A variety of themes are available.</p> </li> -<li><p class="first"><tt class="docutils literal"><span class="pre">rst2s5.py</span></tt></p> -<p class="handout">The front-end tool to generate S5 slide shows.</p> +<li><tt class="docutils literal"><span class="pre">rst2s5.py</span></tt><p class="handout">The front-end tool to generate S5 slide shows.</p> </li> </ul> </div> @@ -117,12 +112,17 @@ <div class="slide" id="features-2"> <h1>Features (2)</h1> <p><span class="incremental">Some</span> <span class="incremental">incremental</span> <span class="incremental">text.</span></p> -<ul class="incremental simple"> -<li><span class="tiny">tiny</span> (class & role name: "tiny", e.g. "<tt class="docutils literal"><span class="pre">:tiny:`text`</span></tt>")</li> -<li><span class="small">small</span> ("small")</li> -<li>normal (unstyled)</li> -<li><span class="big">big</span> ("big")</li> -<li><span class="huge">huge</span> ("huge")</li> +<ul class="incremental open"> +<li><p class="first"><span class="tiny">tiny</span> (class & role name: "tiny", e.g. "<tt class="docutils literal"><span class="pre">:tiny:`text`</span></tt>")</p> +</li> +<li><p class="first"><span class="small">small</span> ("small")</p> +</li> +<li><p class="first">normal (unstyled)</p> +</li> +<li><p class="first"><span class="big">big</span> ("big")</p> +</li> +<li><p class="first"><span class="huge">huge</span> ("huge")</p> +</li> </ul> </div> <div class="slide" id="checklist"> Modified: branches/s5/test/functional/input/standalone_rst_s5_html.txt =================================================================== --- branches/s5/test/functional/input/standalone_rst_s5_html.txt 2005-12-05 14:37:58 UTC (rev 4139) +++ branches/s5/test/functional/input/standalone_rst_s5_html.txt 2005-12-05 14:38:10 UTC (rev 4140) @@ -37,6 +37,8 @@ Introduction ============ +.. class:: compact + * reStructuredText .. class:: handout @@ -97,7 +99,7 @@ `Some` `incremental` `text.` -.. class:: incremental +.. class:: incremental open * :tiny:`tiny` (class & role name: "tiny", e.g. "``:tiny:`text```") * :small:`small` ("small") |