[Docutils-checkins] r3362 - in trunk/docutils/test/functional: expected/standalone_rst_html4css1.html expected/standalone_rst_latex.tex expected/standalone_rst_pseudoxml.txt input/data/table_rowspan.txt input/standalone_rst_latex.txt

[<fel...@us...>]

Author: felixwiemann
Date: 2005-05-25 14:01:41 +0200 (Wed, 25 May 2005)
New Revision: 3362

Modified:
   trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
   trunk/docutils/test/functional/expected/standalone_rst_latex.tex
   trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
   trunk/docutils/test/functional/input/data/table_rowspan.txt
   trunk/docutils/test/functional/input/standalone_rst_latex.txt
Log:
added test for rowspanning tables with the LaTeX writer

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2005-05-25 09:15:24 UTC (rev 3361)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2005-05-25 12:01:41 UTC (rev 3362)
@@ -822,12 +822,9 @@
 <tr><td>body row 2</td>
 <td rowspan="2">Cells may
 span rows.</td>
-<td rowspan="2"><ul class="first last simple">
-<li>Table cells</li>
-<li>contain</li>
-<li>body elements.</li>
-</ul>
-</td>
+<td rowspan="2">Another
+rowspanning
+cell.</td>
 </tr>
 <tr><td>body row 3</td>
 </tr>

Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2005-05-25 09:15:24 UTC (rev 3361)
+++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex	2005-05-25 12:01:41 UTC (rev 3362)
@@ -208,6 +208,8 @@
 
 \item {} \href{\#colspanning-tables}{2.18~~~Colspanning tables}
 
+\item {} \href{\#rowspanning-tables}{2.19~~~Rowspanning tables}
+
 \end{list}
 
 \item {} \href{\#tests-for-the-latex-writer}{3~~~Tests for the LaTeX writer}
@@ -1256,6 +1258,52 @@
 
 %___________________________________________________________________________
 
+\hypertarget{rowspanning-tables}{}
+\pdfbookmark[1]{2.19~~~Rowspanning tables}{rowspanning-tables}
+\subsection*{2.19~~~Rowspanning tables}
+
+Here's a table with cells spanning several rows:
+
+\begin{longtable}[c]{|p{0.30\locallinewidth}|p{0.16\locallinewidth}|p{0.23\locallinewidth}|}
+\hline
+\textbf{
+Header row, column 1
+(header rows optional)
+} & \textbf{
+Header 2
+} & \textbf{
+Header 3
+} \\
+\hline
+\endhead
+
+body row 1, column 1
+ & 
+column 2
+ & 
+column 3
+ \\
+\hline
+
+body row 2
+ & \multirow{2}{0.16\locallinewidth}{
+Cells may
+span rows.
+} & \multirow{2}{0.23\locallinewidth}{
+Another
+rowspanning
+cell.
+} \\
+\cline{1-1}
+
+body row 3
+ &  \\
+\hline
+\end{longtable}
+
+
+%___________________________________________________________________________
+
 \hypertarget{tests-for-the-latex-writer}{}
 \pdfbookmark[0]{3~~~Tests for the LaTeX writer}{tests-for-the-latex-writer}
 \section*{3~~~Tests for the LaTeX writer}

Modified: trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt	2005-05-25 09:15:24 UTC (rev 3361)
+++ trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt	2005-05-25 12:01:41 UTC (rev 3362)
@@ -1542,16 +1542,10 @@
                                     Cells may
                                     span rows.
                             <entry morerows="1">
-                                <bullet_list bullet="-">
-                                    <list_item>
-                                        <paragraph>
-                                            Table cells
-                                    <list_item>
-                                        <paragraph>
-                                            contain
-                                    <list_item>
-                                        <paragraph>
-                                            body elements.
+                                <paragraph>
+                                    Another
+                                    rowspanning
+                                    cell.
                         <row>
                             <entry>
                                 <paragraph>

Modified: trunk/docutils/test/functional/input/data/table_rowspan.txt
===================================================================
--- trunk/docutils/test/functional/input/data/table_rowspan.txt	2005-05-25 09:15:24 UTC (rev 3361)
+++ trunk/docutils/test/functional/input/data/table_rowspan.txt	2005-05-25 12:01:41 UTC (rev 3362)
@@ -9,7 +9,7 @@
 +========================+============+==================+
 | body row 1, column 1   | column 2   | column 3         |
 +------------------------+------------+------------------+
-| body row 2             | Cells may  | - Table cells    |
-+------------------------+ span rows. | - contain        |
-| body row 3             |            | - body elements. |
+| body row 2             | Cells may  | Another          |
++------------------------+ span rows. | rowspanning      |
+| body row 3             |            | cell.            |
 +------------------------+------------+------------------+

Modified: trunk/docutils/test/functional/input/standalone_rst_latex.txt
===================================================================
--- trunk/docutils/test/functional/input/standalone_rst_latex.txt	2005-05-25 09:15:24 UTC (rev 3361)
+++ trunk/docutils/test/functional/input/standalone_rst_latex.txt	2005-05-25 12:01:41 UTC (rev 3362)
@@ -1,5 +1,6 @@
 .. include:: data/standard.txt
 .. include:: data/table_colspan.txt
+.. include:: data/table_rowspan.txt
 
 
 Tests for the LaTeX writer