diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2017-03-03 14:28:20 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2017-03-03 14:28:20 +0000 |
| commit | 752af2ba0090c5f3830eff2386f9e2ed0f430643 (patch) | |
| tree | e0541829e8664ebea03257da4b241122372d8190 /docutils | |
| parent | 3d1f31978ef77cecbcf7a9825492ca662ddc6b0b (diff) | |
| download | docutils-752af2ba0090c5f3830eff2386f9e2ed0f430643.tar.gz | |
Fix [ 312 ] HTML writer generates invalid HTML if the table has two tags.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8042 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils')
5 files changed, 10 insertions, 4 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index a5877b93a..356b12a9e 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -38,7 +38,7 @@ Changes Since 0.13.1 - Added functionality: escaped whitespace in URI contexts. - Consistent handling of all whitespace characters in inline markup - recognition. Last part of fix for [ 3402314 ]. + recognition. Fixes [ 307 ] and [ 3402314 ] (now [ 173 ]). * docutils/parsers/rst/directives/images.py: @@ -62,6 +62,7 @@ Changes Since 0.13.1 * docutils/writers/_html_base.py - Provide default title in metadata (required by HTML5). + - Fix [ 312 ] HTML writer generates invalid HTML if the table has two tags. * docutils/writers/html4css1/__init__.py diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml index 0652a71c3..376490a92 100644 --- a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml +++ b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml @@ -1006,7 +1006,9 @@ Python-specific usage examples; begun with ">>>" <paragraph>With the "widths" argument "auto" (or "class" value "colwidths-auto"), column widths are determined by the backend (if supported by the writer/backend).</paragraph> - <table classes="colwidths-auto"> + <target refid="target1"></target> + <target refid="target2"></target> + <table classes="colwidths-auto" ids="target2 target1" names="target2 target1"> <tgroup cols="3"> <colspec colwidth="7"></colspec> <colspec colwidth="7"></colspec> diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 3c64233f5..aa5c71277 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -727,7 +727,7 @@ directive:</p> <p>With the "widths" argument "auto" (or "class" value "colwidths-auto"), column widths are determined by the backend (if supported by the writer/backend).</p> -<table border="1" class="colwidths-auto docutils"> +<span id="target1"></span><table border="1" class="colwidths-auto docutils" id="target2"> <thead valign="bottom"> <tr><th class="head">A</th> <th class="head">B</th> diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html index bb5e5a229..fc15a8c31 100644 --- a/docutils/test/functional/expected/standalone_rst_html5.html +++ b/docutils/test/functional/expected/standalone_rst_html5.html @@ -709,7 +709,7 @@ directive:</p> <p>With the "widths" argument "auto" (or "class" value "colwidths-auto"), column widths are determined by the backend (if supported by the writer/backend).</p> -<table class="colwidths-auto"> +<span id="target1"></span><table class="colwidths-auto" id="target2"> <thead> <tr><th class="head"><p>A</p></th> <th class="head"><p>B</p></th> diff --git a/docutils/test/functional/input/data/standard.txt b/docutils/test/functional/input/data/standard.txt index fb3ad9491..7e60f0dbc 100644 --- a/docutils/test/functional/input/data/standard.txt +++ b/docutils/test/functional/input/data/standard.txt @@ -634,6 +634,9 @@ With the "widths" argument "auto" (or "class" value "colwidths-auto"), column widths are determined by the backend (if supported by the writer/backend). +.. _target1: +.. _target2: + .. table:: :widths: auto |