diff options
| author | wiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2005-05-25 12:01:41 +0000 |
|---|---|---|
| committer | wiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2005-05-25 12:01:41 +0000 |
| commit | f276198adb09a3f6a557e2ccc7a6bcab394011fb (patch) | |
| tree | f588bc1f22ed511efbeb6888b01cff94c9f9381a /docutils/test/functional | |
| parent | adafd9867195974418058dc26de1f42fa5e8c526 (diff) | |
| download | docutils-f276198adb09a3f6a557e2ccc7a6bcab394011fb.tar.gz | |
added test for rowspanning tables with the LaTeX writer
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@3362 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/test/functional')
5 files changed, 59 insertions, 19 deletions
diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index dcbe16a80..b2c113964 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -822,12 +822,9 @@ Fifth test in HTML.<br />Line two.</div> <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> diff --git a/docutils/test/functional/expected/standalone_rst_latex.tex b/docutils/test/functional/expected/standalone_rst_latex.tex index 368146eb0..f618b05c5 100644 --- a/docutils/test/functional/expected/standalone_rst_latex.tex +++ b/docutils/test/functional/expected/standalone_rst_latex.tex @@ -208,6 +208,8 @@ reStructuredText construct. \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 @@ True %___________________________________________________________________________ +\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} diff --git a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt index 92c7eccfe..38167aa22 100644 --- a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt +++ b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt @@ -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> diff --git a/docutils/test/functional/input/data/table_rowspan.txt b/docutils/test/functional/input/data/table_rowspan.txt index 0ccb0f71d..5df3109c4 100644 --- a/docutils/test/functional/input/data/table_rowspan.txt +++ b/docutils/test/functional/input/data/table_rowspan.txt @@ -9,7 +9,7 @@ Here's a table with cells spanning several rows: +========================+============+==================+ | 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. | +------------------------+------------+------------------+ diff --git a/docutils/test/functional/input/standalone_rst_latex.txt b/docutils/test/functional/input/standalone_rst_latex.txt index a44810d9f..09a4f8890 100644 --- a/docutils/test/functional/input/standalone_rst_latex.txt +++ b/docutils/test/functional/input/standalone_rst_latex.txt @@ -1,5 +1,6 @@ .. include:: data/standard.txt .. include:: data/table_colspan.txt +.. include:: data/table_rowspan.txt Tests for the LaTeX writer |