summaryrefslogtreecommitdiff
path: root/test/functional
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2016-07-28 21:52:14 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2016-07-28 21:52:14 +0000
commit0d07ef208dcaf532bf3fec582bb74a77f7bd1a69 (patch)
tree616c5a5bfe1a093ba6a75cbbd9917f86b995c650 /test/functional
parentb6d6f5c9f93b420a40336d49507aab4115633cfa (diff)
downloaddocutils-0d07ef208dcaf532bf3fec582bb74a77f7bd1a69.tar.gz
Clear up and document patch [ 120 ].
The colwidths argument for <tgroup> violates the docutils.dtd. As the "auto"/"given" tags may be ignored by the writers, they may be stored as classes instead. The default case (grid for tables, equal widths for ListTable and CSVTable does not need/get a tag. This way, writers can decide whether to leave column width determination to the backend when the class "colwidths-auto" is set (opt-in) or by default (opt-out with "colwidths-given"). git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7958 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/expected/math_output_mathml.xhtml4
-rw-r--r--test/functional/expected/standalone_rst_html_plain.html29
-rw-r--r--test/functional/input/data/math.txt1
-rw-r--r--test/functional/input/standalone_rst_html_plain.txt13
4 files changed, 4 insertions, 43 deletions
diff --git a/test/functional/expected/math_output_mathml.xhtml b/test/functional/expected/math_output_mathml.xhtml
index a7fbeb58d..aa48367fd 100644
--- a/test/functional/expected/math_output_mathml.xhtml
+++ b/test/functional/expected/math_output_mathml.xhtml
@@ -95,7 +95,7 @@ directives:</p>
physical system changes in time.</p>
<dl>
<dt>Math-Accents:</dt>
-<dd><table class="borderless">
+<dd><table class="colwidths-given borderless">
<colgroup>
<col style="width: 33%" />
<col style="width: 33%" />
@@ -205,7 +205,7 @@ physical system changes in time.</p>
<p>Cases with the <a class="reference external" href="ftp://ftp.ams.org/ams/doc/amsmath/short-math-guide.pdf">AMSmath</a> <span class="docutils literal">cases</span> environment (not (yet) supported by
HTML writers with <span class="docutils literal"><span class="pre">--math-output=MathML</span></span>):</p>
<div class="system-message">
-<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/math.txt</span>, line 107)</p>
+<p class="system-message-title">System Message: ERROR/3 (<span class="docutils literal">functional/input/data/math.txt</span>, line 108)</p>
<p>
Environment not supported! Supported environment: "matrix".</p>
<pre class="literal-block">
diff --git a/test/functional/expected/standalone_rst_html_plain.html b/test/functional/expected/standalone_rst_html_plain.html
index 2f2f1caac..2365b6a62 100644
--- a/test/functional/expected/standalone_rst_html_plain.html
+++ b/test/functional/expected/standalone_rst_html_plain.html
@@ -1057,7 +1057,7 @@ empty: <span class="docutils literal"><span class="pre">--&gt;</span></span></p>
<div class="section" id="list-tables">
<h2><a class="toc-backref" href="#id76"><span class="sectnum">2.22</span> List Tables</a></h2>
<p>Here's a list table exercising all features:</p>
-<table class="test">
+<table class="colwidths-given test">
<caption>list table with integral header</caption>
<colgroup>
<col style="width: 17%" />
@@ -1416,33 +1416,6 @@ common request and already on the <cite>TODO list</cite>.</p>
from the <a class="reference external" href="http://tug.ctan.org/tex-archive/macros/latex/contrib/booktabs/booktabs.pdf">booktabs</a> <a class="footnote-reference brackets" href="#id33" id="id34">8</a> LaTeX package.</p>
<table class="booktabs">
<colgroup>
-<col style="width: 31%" />
-<col style="width: 31%" />
-<col style="width: 38%" />
-</colgroup>
-<tbody>
-<tr><td><p>False</p></td>
-<td><p>False</p></td>
-<td><p>False</p></td>
-</tr>
-<tr><td><p>True</p></td>
-<td><p>False</p></td>
-<td><p>True</p></td>
-</tr>
-<tr><td><p>False</p></td>
-<td><p>True</p></td>
-<td><p>True</p></td>
-</tr>
-<tr><td><p>True</p></td>
-<td><p>True</p></td>
-<td><p>True</p></td>
-</tr>
-</tbody>
-</table>
-<p>This table also uses the &quot;align-right&quot; class argument, to right-align
-the table:</p>
-<table class="booktabs align-right">
-<colgroup>
<col style="width: 29%" />
<col style="width: 29%" />
<col style="width: 41%" />
diff --git a/test/functional/input/data/math.txt b/test/functional/input/data/math.txt
index c296fddec..6966dab5e 100644
--- a/test/functional/input/data/math.txt
+++ b/test/functional/input/data/math.txt
@@ -49,6 +49,7 @@ physical system changes in time.
Math-Accents:
.. list-table::
:class: borderless
+ :widths: 26 26 26
* - :math:`\acute{a}` ``\acute{a}``
- :math:`\dot{t}` ``\dot{t}``
diff --git a/test/functional/input/standalone_rst_html_plain.txt b/test/functional/input/standalone_rst_html_plain.txt
index 067406f95..a12a5bb14 100644
--- a/test/functional/input/standalone_rst_html_plain.txt
+++ b/test/functional/input/standalone_rst_html_plain.txt
@@ -167,18 +167,6 @@ from the booktabs_ LaTeX package.
.. class:: booktabs
-===== ===== ======
-False False False
-True False True
-False True True
-True True True
-===== ===== ======
-
-This table also uses the "align-right" class argument, to right-align
-the table:
-
-.. class:: booktabs align-right
-
===== ===== =======
A B A or B
===== ===== =======
@@ -188,7 +176,6 @@ False True True
True True True
===== ===== =======
-
"Booktabs" style table, numbered and centre-aligned:
.. table:: I/O values