Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[7785] trunk/docutils
|
From: <gr...@us...> - 2015-02-08 23:51:54
|
Revision: 7785
http://sourceforge.net/p/docutils/code/7785
Author: grubert
Date: 2015-02-08 23:51:45 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
patch [120] 0002 tables accept option widths: list of relative widths, 'auto'
or 'grid'
Modified Paths:
--------------
trunk/docutils/HISTORY.txt
trunk/docutils/docutils/parsers/rst/directives/__init__.py
trunk/docutils/docutils/parsers/rst/directives/tables.py
trunk/docutils/docutils/parsers/rst/states.py
trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py
trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py
trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py
trunk/docutils/test/test_parsers/test_rst/test_tables.py
Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/HISTORY.txt 2015-02-08 23:51:45 UTC (rev 7785)
@@ -23,7 +23,8 @@
* docutils/parsers/rst/directives/tables.py
- - non-csv tables accept widths, patch [120] .1
+ - patch [120] tables accept option widths: list of relative widths, 'auto'
+ or 'grid'.
Release 0.12 (2014-07-06)
=========================
Modified: trunk/docutils/docutils/parsers/rst/directives/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/__init__.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/docutils/parsers/rst/directives/__init__.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -402,3 +402,15 @@
def format_values(values):
return '%s, or "%s"' % (', '.join(['"%s"' % s for s in values[:-1]]),
values[-1])
+
+def value_or(values, other):
+ """
+ The argument can be any of `values` or `argument_type`.
+ """
+ def auto_or_other(argument):
+ if argument in values:
+ return argument
+ else:
+ return other(argument)
+ return auto_or_other
+
Modified: trunk/docutils/docutils/parsers/rst/directives/tables.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/tables.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/docutils/parsers/rst/directives/tables.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -30,7 +30,8 @@
final_argument_whitespace = True
option_spec = {'class': directives.class_option,
'name': directives.unchanged,
- 'widths': directives.positive_int_list}
+ 'widths': directives.value_or(('auto', 'grid'),
+ directives.positive_int_list)}
has_content = True
def make_title(self):
@@ -86,21 +87,19 @@
self.block_text, self.block_text), line=self.lineno)
raise SystemMessagePropagation(error)
- def get_column_widths_from_option(self, max_cols):
- if 'widths' in self.options:
- col_widths = self.options['widths']
- if len(col_widths) != max_cols:
+ @property
+ def widths(self):
+ return self.options.get('widths', 'auto')
+
+ def get_column_widths(self, max_cols):
+ if type(self.widths) == list:
+ if len(self.widths) != max_cols:
error = self.state_machine.reporter.error(
'"%s" widths do not match the number of columns in table '
'(%s).' % (self.name, max_cols), nodes.literal_block(
self.block_text, self.block_text), line=self.lineno)
raise SystemMessagePropagation(error)
- return col_widths
-
- def get_column_widths(self, max_cols):
- col_widths_from_option = self.get_column_widths_from_option(max_cols)
- if col_widths_from_option:
- col_widths = col_widths_from_option
+ col_widths = self.widths
elif max_cols:
col_widths = [100 // max_cols] * max_cols
else:
@@ -108,7 +107,8 @@
'No table data detected in CSV file.', nodes.literal_block(
self.block_text, self.block_text), line=self.lineno)
raise SystemMessagePropagation(error)
- return col_widths
+ widths = 'auto' if self.widths == 'auto' else 'given'
+ return widths, col_widths
def extend_short_rows_with_empty_cells(self, columns, parts):
for part in parts:
@@ -138,12 +138,12 @@
table_node = node[0]
table_node['classes'] += self.options.get('class', [])
tgroup = table_node[0]
- colspecs = [child for child in tgroup.children
- if child.tagname == 'colspec']
- col_widths = self.get_column_widths_from_option(len(colspecs))
- if col_widths:
- for colspec, col_width in zip(colspecs, col_widths):
+ if type(self.widths) == list:
+ colspecs = [child for child in tgroup.children
+ if child.tagname == 'colspec']
+ for colspec, col_width in zip(colspecs, self.widths):
colspec['colwidth'] = col_width
+ tgroup['colwidths'] = 'auto' if self.widths == 'auto' else 'given'
self.add_name(table_node)
if title:
table_node.insert(0, title)
@@ -155,7 +155,8 @@
option_spec = {'header-rows': directives.nonnegative_int,
'stub-columns': directives.nonnegative_int,
'header': directives.unchanged,
- 'widths': directives.positive_int_list,
+ 'widths': directives.value_or(('auto', ),
+ directives.positive_int_list),
'file': directives.path,
'url': directives.uri,
'encoding': directives.encoding,
@@ -233,7 +234,7 @@
self.check_table_dimensions(rows, header_rows, stub_columns)
table_head.extend(rows[:header_rows])
table_body = rows[header_rows:]
- col_widths = self.get_column_widths(max_cols)
+ widths, col_widths = self.get_column_widths(max_cols)
self.extend_short_rows_with_empty_cells(max_cols,
(table_head, table_body))
except SystemMessagePropagation, detail:
@@ -249,7 +250,7 @@
return [error]
table = (col_widths, table_head, table_body)
table_node = self.state.build_table(table, self.content_offset,
- stub_columns)
+ stub_columns, widths=widths)
table_node['classes'] += self.options.get('class', [])
self.add_name(table_node)
if title:
@@ -374,7 +375,8 @@
option_spec = {'header-rows': directives.nonnegative_int,
'stub-columns': directives.nonnegative_int,
- 'widths': directives.positive_int_list,
+ 'widths': directives.value_or(('auto', ),
+ directives.positive_int_list),
'class': directives.class_option,
'name': directives.unchanged}
@@ -389,7 +391,7 @@
node = nodes.Element() # anonymous container for parsing
self.state.nested_parse(self.content, self.content_offset, node)
try:
- num_cols, col_widths = self.check_list_content(node)
+ num_cols, widths, col_widths = self.check_list_content(node)
table_data = [[item.children for item in row_list[0]]
for row_list in node[0]]
header_rows = self.options.get('header-rows', 0)
@@ -397,7 +399,7 @@
self.check_table_dimensions(table_data, header_rows, stub_columns)
except SystemMessagePropagation, detail:
return [detail.args[0]]
- table_node = self.build_table_from_list(table_data, col_widths,
+ table_node = self.build_table_from_list(table_data, widths, col_widths,
header_rows, stub_columns)
table_node['classes'] += self.options.get('class', [])
self.add_name(table_node)
@@ -441,15 +443,18 @@
raise SystemMessagePropagation(error)
else:
num_cols = len(item[0])
- col_widths = self.get_column_widths(num_cols)
- return num_cols, col_widths
+ widths, col_widths = self.get_column_widths(num_cols)
+ return num_cols, widths, col_widths
- def build_table_from_list(self, table_data, col_widths, header_rows, stub_columns):
+ def build_table_from_list(self, table_data, widths, col_widths, header_rows,
+ stub_columns):
table = nodes.table()
- tgroup = nodes.tgroup(cols=len(col_widths))
+ tgroup = nodes.tgroup(cols=len(col_widths), colwidths=widths)
table += tgroup
for col_width in col_widths:
- colspec = nodes.colspec(colwidth=col_width)
+ colspec = nodes.colspec()
+ if col_width is not None:
+ colspec.attributes['colwidth'] = col_width
if stub_columns:
colspec.attributes['stub'] = 1
stub_columns -= 1
Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/docutils/parsers/rst/states.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -1747,10 +1747,10 @@
line=startline+offset)
return [error]
- def build_table(self, tabledata, tableline, stub_columns=0):
+ def build_table(self, tabledata, tableline, stub_columns=0, widths='auto'):
colwidths, headrows, bodyrows = tabledata
table = nodes.table()
- tgroup = nodes.tgroup(cols=len(colwidths))
+ tgroup = nodes.tgroup(cols=len(colwidths), colwidths=widths)
table += tgroup
for colwidth in colwidths:
colspec = nodes.colspec(colwidth=colwidth)
Modified: trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2015-02-08 23:51:45 UTC (rev 7785)
@@ -1288,7 +1288,7 @@
Plaintext markup syntax and parser system.
<legend>
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="47">
<tbody>
@@ -1558,7 +1558,7 @@
<paragraph>
Compound 7, with a table inside:
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="20">
<colspec colwidth="20">
<colspec colwidth="20">
@@ -1768,7 +1768,7 @@
<paragraph>
This table has a cell spanning two columns:
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="5">
<colspec colwidth="5">
<colspec colwidth="6">
@@ -1839,7 +1839,7 @@
<paragraph>
Here's a table with cells spanning several rows:
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="24">
<colspec colwidth="12">
<colspec colwidth="18">
@@ -1891,7 +1891,7 @@
<paragraph>
Here's a complex table, which should test all features.
<table>
- <tgroup cols="4">
+ <tgroup cols="4" colwidths="auto">
<colspec colwidth="24">
<colspec colwidth="12">
<colspec colwidth="10">
@@ -1978,7 +1978,7 @@
<table classes="test">
<title>
list table with integral header
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="given">
<colspec colwidth="10" stub="1">
<colspec colwidth="20">
<colspec colwidth="30">
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_figures.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -173,7 +173,7 @@
A picture with a caption and a legend.
<legend>
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="23">
<colspec colwidth="23">
<thead>
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_include.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -531,7 +531,7 @@
section underline too short
-----
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="6">
<thead>
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_tables.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -71,7 +71,7 @@
<table classes="custom" ids="tab-truth-not" names="tab:truth.not">
<title>
Truth table for "not"
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="5">
<colspec colwidth="5">
<thead>
@@ -109,7 +109,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="10">
<colspec colwidth="10">
<tbody>
@@ -143,7 +143,7 @@
<problematic ids="id2" refid="id1">
*
error
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="6">
<colspec colwidth="5">
<tbody>
@@ -195,7 +195,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="given">
<colspec colwidth="15">
<colspec colwidth="25">
<tbody>
@@ -218,7 +218,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="given">
<colspec colwidth="10">
<colspec colwidth="20">
<tbody>
@@ -230,6 +230,52 @@
<paragraph>
custom widths.
"""],
+["""\
+.. table::
+ :widths: auto
+
+ +--------------+-------------------+
+ | Columns with | automatic widths. |
+ +--------------+-------------------+
+""",
+"""\
+<document source="test data">
+ <table>
+ <tgroup cols="2" colwidths="auto">
+ <colspec colwidth="14">
+ <colspec colwidth="19">
+ <tbody>
+ <row>
+ <entry>
+ <paragraph>
+ Columns with
+ <entry>
+ <paragraph>
+ automatic widths.
+"""],
+["""\
+.. table::
+ :widths: grid
+
+ +--------------+-------------------+
+ | Columns with | automatic widths. |
+ +--------------+-------------------+
+""",
+"""\
+<document source="test data">
+ <table>
+ <tgroup cols="2" colwidths="given">
+ <colspec colwidth="14">
+ <colspec colwidth="19">
+ <tbody>
+ <row>
+ <entry>
+ <paragraph>
+ Columns with
+ <entry>
+ <paragraph>
+ automatic widths.
+"""],
]
totest['csv-table'] = [
@@ -250,7 +296,7 @@
<table>
<title>
inline with integral header
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="given">
<colspec colwidth="10" stub="1">
<colspec colwidth="20">
<colspec colwidth="30">
@@ -310,7 +356,7 @@
<table>
<title>
inline with separate header
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="given">
<colspec colwidth="10">
<colspec colwidth="20">
<colspec colwidth="30">
@@ -354,7 +400,7 @@
<table>
<title>
complex internal structure
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -408,7 +454,7 @@
<table>
<title>
short rows
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -445,7 +491,7 @@
<table>
<title>
short rows
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -486,7 +532,7 @@
<table>
<title>
non-ASCII characters
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="100">
<tbody>
<row>
@@ -584,7 +630,7 @@
<problematic ids="id2" refid="id1">
*
title
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -709,7 +755,7 @@
<table>
<title>
good delimiter
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -727,7 +773,7 @@
<table>
<title>
good delimiter
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -745,7 +791,7 @@
<table>
<title>
good delimiter
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -763,7 +809,7 @@
<table>
<title>
good delimiter
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -870,7 +916,7 @@
<table>
<title>
good encoding
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="33">
<colspec colwidth="33">
<colspec colwidth="33">
@@ -959,7 +1005,7 @@
<table>
<title>
list table with integral header
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="given">
<colspec colwidth="10" stub="1">
<colspec colwidth="20">
<colspec colwidth="30">
@@ -1008,6 +1054,123 @@
On a stick!
"""],
["""\
+.. list-table:: list table with integral header
+ :widths: auto
+ :header-rows: 1
+ :stub-columns: 1
+
+ * - Treat
+ - Quantity
+ - Description
+ * - Albatross
+ - 2.99
+ - On a stick!
+""",
+"""\
+<document source="test data">
+ <table>
+ <title>
+ list table with integral header
+ <tgroup cols="3" colwidths="auto">
+ <colspec colwidth="33" stub="1">
+ <colspec colwidth="33">
+ <colspec colwidth="33">
+ <thead>
+ <row>
+ <entry>
+ <paragraph>
+ Treat
+ <entry>
+ <paragraph>
+ Quantity
+ <entry>
+ <paragraph>
+ Description
+ <tbody>
+ <row>
+ <entry>
+ <paragraph>
+ Albatross
+ <entry>
+ <paragraph>
+ 2.99
+ <entry>
+ <paragraph>
+ On a stick!
+"""],
+["""\
+.. list-table:: list table with integral header
+ :header-rows: 1
+ :stub-columns: 1
+
+ * - Treat
+ - Quantity
+ - Description
+ * - Albatross
+ - 2.99
+ - On a stick!
+ * - Crunchy Frog
+ - 1.49
+ - If we took the bones out, it wouldn\'t be
+ crunchy, now would it?
+ * - Gannet Ripple
+ - 1.99
+ - On a stick!
+""",
+"""\
+<document source="test data">
+ <table>
+ <title>
+ list table with integral header
+ <tgroup cols="3" colwidths="auto">
+ <colspec colwidth="33" stub="1">
+ <colspec colwidth="33">
+ <colspec colwidth="33">
+ <thead>
+ <row>
+ <entry>
+ <paragraph>
+ Treat
+ <entry>
+ <paragraph>
+ Quantity
+ <entry>
+ <paragraph>
+ Description
+ <tbody>
+ <row>
+ <entry>
+ <paragraph>
+ Albatross
+ <entry>
+ <paragraph>
+ 2.99
+ <entry>
+ <paragraph>
+ On a stick!
+ <row>
+ <entry>
+ <paragraph>
+ Crunchy Frog
+ <entry>
+ <paragraph>
+ 1.49
+ <entry>
+ <paragraph>
+ If we took the bones out, it wouldn\'t be
+ crunchy, now would it?
+ <row>
+ <entry>
+ <paragraph>
+ Gannet Ripple
+ <entry>
+ <paragraph>
+ 1.99
+ <entry>
+ <paragraph>
+ On a stick!
+"""],
+["""\
.. list-table::
not a bullet list
Modified: trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_east_asian_text.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -65,7 +65,7 @@
u"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="23">
<tbody>
<row>
@@ -99,7 +99,7 @@
<paragraph>
Complex spanning pattern (no edge knows all rows/cols):
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="8">
<colspec colwidth="14">
<colspec colwidth="6">
@@ -138,7 +138,7 @@
u"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="9">
<colspec colwidth="9">
<tbody>
@@ -186,7 +186,7 @@
<paragraph>
Some ambiguous-width characters:
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="1">
<colspec colwidth="35">
<tbody>
Modified: trunk/docutils/test/test_parsers/test_rst/test_tables.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_tables.py 2015-02-08 23:21:18 UTC (rev 7784)
+++ trunk/docutils/test/test_parsers/test_rst/test_tables.py 2015-02-08 23:51:45 UTC (rev 7785)
@@ -30,7 +30,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="37">
<tbody>
<row>
@@ -47,7 +47,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="23">
<tbody>
<row>
@@ -83,7 +83,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="24">
<tbody>
<row>
@@ -91,7 +91,7 @@
<paragraph>
A well-formed | table.
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="24">
<tbody>
<row>
@@ -107,7 +107,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="14">
<tbody>
@@ -129,7 +129,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="14">
<tbody>
<row>
@@ -151,7 +151,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="13">
<tbody>
@@ -180,7 +180,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="15">
<tbody>
@@ -209,7 +209,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="13">
<tbody>
@@ -240,7 +240,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="14">
<tbody>
@@ -268,7 +268,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="13">
<colspec colwidth="15">
@@ -308,7 +308,7 @@
<paragraph>
Complex spanning pattern (no edge knows all rows/cols):
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="11">
<colspec colwidth="13">
<colspec colwidth="11">
@@ -348,7 +348,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="4">
+ <tgroup cols="4" colwidths="auto">
<colspec colwidth="24">
<colspec colwidth="12">
<colspec colwidth="10">
@@ -423,7 +423,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="17">
<colspec colwidth="8">
<tbody>
@@ -458,7 +458,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="17">
<colspec colwidth="8">
<tbody>
@@ -518,7 +518,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="30">
<tbody>
<row>
@@ -526,7 +526,7 @@
<paragraph>
This table contains another.
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="25">
<tbody>
<row>
@@ -544,7 +544,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="18">
<colspec colwidth="8">
<tbody>
@@ -572,7 +572,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="78">
<tbody>
<row>
@@ -609,7 +609,7 @@
<paragraph>
Something before.
<table>
- <tgroup cols="1">
+ <tgroup cols="1" colwidths="auto">
<colspec colwidth="78">
<tbody>
<row>
@@ -640,7 +640,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="12">
<tbody>
@@ -663,7 +663,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="12">
<tbody>
@@ -691,7 +691,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="14">
<tbody>
@@ -723,7 +723,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="2">
<colspec colwidth="11">
<colspec colwidth="44">
@@ -774,7 +774,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="7">
<colspec colwidth="9">
<colspec colwidth="8">
@@ -838,7 +838,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="6">
<thead>
@@ -939,7 +939,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="2">
<colspec colwidth="28">
<tbody>
@@ -956,7 +956,7 @@
2
<entry>
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="7">
<colspec colwidth="6">
<colspec colwidth="8">
@@ -985,7 +985,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="16">
<colspec colwidth="6">
<tbody>
@@ -1011,7 +1011,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="14">
<colspec colwidth="8">
<thead>
@@ -1067,7 +1067,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="17">
<tbody>
@@ -1112,7 +1112,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="12">
<colspec colwidth="20">
<tbody>
@@ -1183,7 +1183,7 @@
3 no spans here
== =========== ===========
<table>
- <tgroup cols="3">
+ <tgroup cols="3" colwidths="auto">
<colspec colwidth="2">
<colspec colwidth="11">
<colspec colwidth="11">
@@ -1225,7 +1225,7 @@
"""\
<document source="test data">
<table>
- <tgroup cols="2">
+ <tgroup cols="2" colwidths="auto">
<colspec colwidth="9">
<colspec colwidth="69">
<tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|