Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Markdown reader/writer: spacing adjustments in tables.

Browse source 
* Markdown writer now includes a blank line at the end
  of the row in a single-row multiline table, to prevent it from being
  interpreted as a simple table.  Closes #4578.
* Markdown reader does a better job computing the relative width of
  the last column in a multiline table, so we can round-trip tables
  without constantly shrinking the last column.
This commit is contained in:
John MacFarlane 2018-04-21 13:06:57 -07:00
parent 229db80ac2
commit 7fbe473b2e
25 changed files with 174 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Text/Pandoc/Readers/Markdown.hs
View file

@ -1341,11 +1341,16 @@ multilineTableHeader headless = try $ do
newline newline
let (lengths, lines') = unzip dashes let (lengths, lines') = unzip dashes
let indices = scanl (+) (length initSp) lines' let indices = scanl (+) (length initSp) lines'
-- compensate for the fact that intercolumn spaces are
-- not included in the last index:
let indices' = case reverse indices of
[] -> []
(x:xs) -> reverse (x+1:xs)
rawHeadsList <- if headless rawHeadsList <- if headless
then fmap (map (:[]) . tail . then fmap (map (:[]) . tail .
splitStringByIndices (init indices)) $ lookAhead anyLine splitStringByIndices (init indices')) $ lookAhead anyLine
else return $ transpose $ map else return $ transpose $ map
(tail . splitStringByIndices (init indices)) (tail . splitStringByIndices (init indices'))
rawContent rawContent
let aligns = zipWith alignType rawHeadsList lengths let aligns = zipWith alignType rawHeadsList lengths
let rawHeads = if headless let rawHeads = if headless
@ -1353,7 +1358,7 @@ multilineTableHeader headless = try $ do
else map (unlines . map trim) rawHeadsList else map (unlines . map trim) rawHeadsList
heads <- fmap sequence $ heads <- fmap sequence $
mapM ((parseFromString' (mconcat <$> many plain)).trim) rawHeads mapM ((parseFromString' (mconcat <$> many plain)).trim) rawHeads
return (heads, aligns, indices) return (heads, aligns, indices')
-- Parse a grid table: starts with row of '-' on top, then header -- Parse a grid table: starts with row of '-' on top, then header
-- (which may be grid), then the rows, -- (which may be grid), then the rows,

5
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -732,7 +732,10 @@ pandocTable opts multiline headless aligns widths rawHeaders rawRows = do
then empty then empty
else border <> cr <> head' else border <> cr <> head'
let body = if multiline let body = if multiline
then vsep rows' then vsep rows' $$
if length rows' < 2
then blankline -- #4578
else empty
else vcat rows' else vcat rows'
let bottom = if headless let bottom = if headless
then underline then underline

2
test/command/3348.md
View file

@ -7,7 +7,7 @@
line of text line of text
----- ------------------------------------------------ ----- ------------------------------------------------
^D ^D
[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6666666666666666] [Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6805555555555556]
[[] [[]
,[]] ,[]]
[[[Plain [Str "foo"]] [[[Plain [Str "foo"]]

14
test/command/4578.md Normal file
View file

@ -0,0 +1,14 @@
```
% pandoc -t markdown
------ ------- --------------- ---------------------
One row 12.0 Example of a row that
spans multiple lines.
------ ------- --------------- ---------------------
^D
------ ------- --------------- ---------------------
One row 12.0 Example of a row that
spans multiple lines.
------ ------- --------------- ---------------------
```

12
test/tables-rstsubset.native
View file

@ -53,7 +53,7 @@
,[Plain [Str "1"]] ,[Plain [Str "1"]]
,[Plain [Str "1"]]]] ,[Plain [Str "1"]]]]
,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]
,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325] ,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]
[[Plain [Str "Centered",SoftBreak,Str "Header"]] [[Plain [Str "Centered",SoftBreak,Str "Header"]]
,[Plain [Str "Left",SoftBreak,Str "Aligned"]] ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]
,[Plain [Str "Right",SoftBreak,Str "Aligned"]] ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]
@ -65,9 +65,9 @@
,[[Plain [Str "Second"]] ,[[Plain [Str "Second"]]
,[Plain [Str "row"]] ,[Plain [Str "row"]]
,[Plain [Str "5.0"]] ,[Plain [Str "5.0"]]
,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]] ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]
,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]
,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325] ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]
[[Plain [Str "Centered",SoftBreak,Str "Header"]] [[Plain [Str "Centered",SoftBreak,Str "Header"]]
,[Plain [Str "Left",SoftBreak,Str "Aligned"]] ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]
,[Plain [Str "Right",SoftBreak,Str "Aligned"]] ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]
@ -79,7 +79,7 @@
,[[Plain [Str "Second"]] ,[[Plain [Str "Second"]]
,[Plain [Str "row"]] ,[Plain [Str "row"]]
,[Plain [Str "5.0"]] ,[Plain [Str "5.0"]]
,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]] ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]
,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [7.5e-2,7.5e-2,7.5e-2,7.5e-2] ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [7.5e-2,7.5e-2,7.5e-2,7.5e-2]
[[] [[]
@ -99,7 +99,7 @@
,[Plain [Str "1"]] ,[Plain [Str "1"]]
,[Plain [Str "1"]]]] ,[Plain [Str "1"]]]]
,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325] ,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]
[[] [[]
,[] ,[]
,[] ,[]
@ -111,4 +111,4 @@
,[[Plain [Str "Second"]] ,[[Plain [Str "Second"]]
,[Plain [Str "row"]] ,[Plain [Str "row"]]
,[Plain [Str "5.0"]] ,[Plain [Str "5.0"]]
,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]]] ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]]

6
test/tables.asciidoc
View file

@ -33,7 +33,7 @@ Simple table indented two spaces:
Multiline table with caption: Multiline table with caption:
.Here’s the caption. It may span multiple lines. .Here’s the caption. It may span multiple lines.
[width="78%",cols="^21%,<17%,>20%,<42%",options="header",] [width="80%",cols="^20%,<17%,>20%,<43%",options="header",]
|======================================================================= |=======================================================================
|Centered Header |Left Aligned |Right Aligned |Default aligned |Centered Header |Left Aligned |Right Aligned |Default aligned
|First |row |12.0 |Example of a row that spans multiple lines. |First |row |12.0 |Example of a row that spans multiple lines.
@ -42,7 +42,7 @@ Multiline table with caption:
Multiline table without caption: Multiline table without caption:
[width="78%",cols="^21%,<17%,>20%,<42%",options="header",] [width="80%",cols="^20%,<17%,>20%,<43%",options="header",]
|======================================================================= |=======================================================================
|Centered Header |Left Aligned |Right Aligned |Default aligned |Centered Header |Left Aligned |Right Aligned |Default aligned
|First |row |12.0 |Example of a row that spans multiple lines. |First |row |12.0 |Example of a row that spans multiple lines.
@ -60,7 +60,7 @@ Table without column headers:
Multiline table without column headers: Multiline table without column headers:
[width="78%",cols="^21%,<17%,>20%,42%",] [width="80%",cols="^20%,<17%,>20%,43%",]
|======================================================================= |=======================================================================
|First |row |12.0 |Example of a row that spans multiple lines. |First |row |12.0 |Example of a row that spans multiple lines.
|Second |row |5.0 |Here’s another one. Note the blank line between rows. |Second |row |5.0 |Here’s another one. Note the blank line between rows.

16
test/tables.context
View file

@ -118,7 +118,7 @@ Multiline table with caption:
\startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell \startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell
\startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell \startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell
\startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell \startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell
\startxcell[align=right,width={0.34\textwidth}] Default aligned \stopxcell \startxcell[align=right,width={0.35\textwidth}] Default aligned \stopxcell
\stopxrow \stopxrow
\stopxtablehead \stopxtablehead
\startxtablebody[body] \startxtablebody[body]
@ -126,7 +126,7 @@ Multiline table with caption:
\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell \startxcell[align=middle,width={0.15\textwidth}] First \stopxcell
\startxcell[align=right,width={0.14\textwidth}] row \stopxcell \startxcell[align=right,width={0.14\textwidth}] row \stopxcell
\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell \startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell
\startxcell[align=right,width={0.34\textwidth}] Example of a row that spans \startxcell[align=right,width={0.35\textwidth}] Example of a row that spans
multiple lines. \stopxcell multiple lines. \stopxcell
\stopxrow \stopxrow
\stopxtablebody \stopxtablebody
@ -135,7 +135,7 @@ multiple lines. \stopxcell
\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell \startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell
\startxcell[align=right,width={0.14\textwidth}] row \stopxcell \startxcell[align=right,width={0.14\textwidth}] row \stopxcell
\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell \startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell
\startxcell[align=right,width={0.34\textwidth}] Here's another one. Note the \startxcell[align=right,width={0.35\textwidth}] Here's another one. Note the
blank line between rows. \stopxcell blank line between rows. \stopxcell
\stopxrow \stopxrow
\stopxtablefoot \stopxtablefoot
@ -151,7 +151,7 @@ Multiline table without caption:
\startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell \startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell
\startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell \startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell
\startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell \startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell
\startxcell[align=right,width={0.34\textwidth}] Default aligned \stopxcell \startxcell[align=right,width={0.35\textwidth}] Default aligned \stopxcell
\stopxrow \stopxrow
\stopxtablehead \stopxtablehead
\startxtablebody[body] \startxtablebody[body]
@ -159,7 +159,7 @@ Multiline table without caption:
\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell \startxcell[align=middle,width={0.15\textwidth}] First \stopxcell
\startxcell[align=right,width={0.14\textwidth}] row \stopxcell \startxcell[align=right,width={0.14\textwidth}] row \stopxcell
\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell \startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell
\startxcell[align=right,width={0.34\textwidth}] Example of a row that spans \startxcell[align=right,width={0.35\textwidth}] Example of a row that spans
multiple lines. \stopxcell multiple lines. \stopxcell
\stopxrow \stopxrow
\stopxtablebody \stopxtablebody
@ -168,7 +168,7 @@ multiple lines. \stopxcell
\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell \startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell
\startxcell[align=right,width={0.14\textwidth}] row \stopxcell \startxcell[align=right,width={0.14\textwidth}] row \stopxcell
\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell \startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell
\startxcell[align=right,width={0.34\textwidth}] Here's another one. Note the \startxcell[align=right,width={0.35\textwidth}] Here's another one. Note the
blank line between rows. \stopxcell blank line between rows. \stopxcell
\stopxrow \stopxrow
\stopxtablefoot \stopxtablefoot
@ -213,7 +213,7 @@ Multiline table without column headers:
\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell \startxcell[align=middle,width={0.15\textwidth}] First \stopxcell
\startxcell[align=right,width={0.14\textwidth}] row \stopxcell \startxcell[align=right,width={0.14\textwidth}] row \stopxcell
\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell \startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell
\startxcell[width={0.34\textwidth}] Example of a row that spans multiple \startxcell[width={0.35\textwidth}] Example of a row that spans multiple
lines. \stopxcell lines. \stopxcell
\stopxrow \stopxrow
\stopxtablebody \stopxtablebody
@ -222,7 +222,7 @@ lines. \stopxcell
\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell \startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell
\startxcell[align=right,width={0.14\textwidth}] row \stopxcell \startxcell[align=right,width={0.14\textwidth}] row \stopxcell
\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell \startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell
\startxcell[width={0.34\textwidth}] Here's another one. Note the blank line \startxcell[width={0.35\textwidth}] Here's another one. Note the blank line
between rows. \stopxcell between rows. \stopxcell
\stopxrow \stopxrow
\stopxtablefoot \stopxtablefoot

6
test/tables.custom
View file

@ -95,7 +95,7 @@ It may span multiple lines.</caption>
<col width="15%" /> <col width="15%" />
<col width="14%" /> <col width="14%" />
<col width="16%" /> <col width="16%" />
<col width="34%" /> <col width="35%" />
<tr class="header"> <tr class="header">
<th align="center">Centered <th align="center">Centered
Header</th> Header</th>
@ -127,7 +127,7 @@ the blank line between rows.</td>
<col width="15%" /> <col width="15%" />
<col width="14%" /> <col width="14%" />
<col width="16%" /> <col width="16%" />
<col width="34%" /> <col width="35%" />
<tr class="header"> <tr class="header">
<th align="center">Centered <th align="center">Centered
Header</th> Header</th>
@ -182,7 +182,7 @@ the blank line between rows.</td>
<col width="15%" /> <col width="15%" />
<col width="14%" /> <col width="14%" />
<col width="16%" /> <col width="16%" />
<col width="34%" /> <col width="35%" />
<tr class="odd"> <tr class="odd">
<td align="center">First</td> <td align="center">First</td>
<td align="left">row</td> <td align="left">row</td>

6
test/tables.docbook4
View file

@ -228,7 +228,7 @@
<colspec colwidth="15*" align="center" /> <colspec colwidth="15*" align="center" />
<colspec colwidth="13*" align="left" /> <colspec colwidth="13*" align="left" />
<colspec colwidth="16*" align="right" /> <colspec colwidth="16*" align="right" />
<colspec colwidth="33*" align="left" /> <colspec colwidth="35*" align="left" />
<thead> <thead>
<row> <row>
<entry> <entry>
@ -285,7 +285,7 @@
<colspec colwidth="15*" align="center" /> <colspec colwidth="15*" align="center" />
<colspec colwidth="13*" align="left" /> <colspec colwidth="13*" align="left" />
<colspec colwidth="16*" align="right" /> <colspec colwidth="16*" align="right" />
<colspec colwidth="33*" align="left" /> <colspec colwidth="35*" align="left" />
<thead> <thead>
<row> <row>
<entry> <entry>
@ -397,7 +397,7 @@
<colspec colwidth="15*" align="center" /> <colspec colwidth="15*" align="center" />
<colspec colwidth="13*" align="left" /> <colspec colwidth="13*" align="left" />
<colspec colwidth="16*" align="right" /> <colspec colwidth="16*" align="right" />
<colspec colwidth="33*" align="left" /> <colspec colwidth="35*" align="left" />
<tbody> <tbody>
<row> <row>
<entry> <entry>

6
test/tables.docbook5
View file

@ -228,7 +228,7 @@
<colspec colwidth="15*" align="center" /> <colspec colwidth="15*" align="center" />
<colspec colwidth="13*" align="left" /> <colspec colwidth="13*" align="left" />
<colspec colwidth="16*" align="right" /> <colspec colwidth="16*" align="right" />
<colspec colwidth="33*" align="left" /> <colspec colwidth="35*" align="left" />
<thead> <thead>
<row> <row>
<entry> <entry>
@ -285,7 +285,7 @@
<colspec colwidth="15*" align="center" /> <colspec colwidth="15*" align="center" />
<colspec colwidth="13*" align="left" /> <colspec colwidth="13*" align="left" />
<colspec colwidth="16*" align="right" /> <colspec colwidth="16*" align="right" />
<colspec colwidth="33*" align="left" /> <colspec colwidth="35*" align="left" />
<thead> <thead>
<row> <row>
<entry> <entry>
@ -397,7 +397,7 @@
<colspec colwidth="15*" align="center" /> <colspec colwidth="15*" align="center" />
<colspec colwidth="13*" align="left" /> <colspec colwidth="13*" align="left" />
<colspec colwidth="16*" align="right" /> <colspec colwidth="16*" align="right" />
<colspec colwidth="33*" align="left" /> <colspec colwidth="35*" align="left" />
<tbody> <tbody>
<row> <row>
<entry> <entry>

60
test/tables.haddock
View file

@ -40,33 +40,33 @@ Simple table indented two spaces:
Multiline table with caption: Multiline table with caption:
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> | Centered | Left | Right | Default aligned | > | Centered | Left | Right | Default aligned |
> | Header | Aligned | Aligned | | > | Header | Aligned | Aligned | |
> +==========+=========+===========+=========================+ > +==========+=========+===========+==========================+
> | First | row | 12.0 | Example of a row that | > | First | row | 12.0 | Example of a row that |
> | | | | spans multiple lines. | > | | | | spans multiple lines. |
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> | Second | row | 5.0 | Here’s another one. | > | Second | row | 5.0 | Here’s another one. Note |
> | | | | Note the blank line | > | | | | the blank line between |
> | | | | between rows. | > | | | | rows. |
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> >
> Here’s the caption. It may span multiple lines. > Here’s the caption. It may span multiple lines.
Multiline table without caption: Multiline table without caption:
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> | Centered | Left | Right | Default aligned | > | Centered | Left | Right | Default aligned |
> | Header | Aligned | Aligned | | > | Header | Aligned | Aligned | |
> +==========+=========+===========+=========================+ > +==========+=========+===========+==========================+
> | First | row | 12.0 | Example of a row that | > | First | row | 12.0 | Example of a row that |
> | | | | spans multiple lines. | > | | | | spans multiple lines. |
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> | Second | row | 5.0 | Here’s another one. | > | Second | row | 5.0 | Here’s another one. Note |
> | | | | Note the blank line | > | | | | the blank line between |
> | | | | between rows. | > | | | | rows. |
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
Table without column headers: Table without column headers:
@ -80,11 +80,11 @@ Table without column headers:
Multiline table without column headers: Multiline table without column headers:
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> | First | row | 12.0 | Example of a row that | > | First | row | 12.0 | Example of a row that |
> | | | | spans multiple lines. | > | | | | spans multiple lines. |
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+
> | Second | row | 5.0 | Here’s another one. | > | Second | row | 5.0 | Here’s another one. Note |
> | | | | Note the blank line | > | | | | the blank line between |
> | | | | between rows. | > | | | | rows. |
> +----------+---------+-----------+-------------------------+ > +----------+---------+-----------+--------------------------+

12
test/tables.html4
View file

@ -94,13 +94,13 @@
</tbody> </tbody>
</table> </table>
<p>Multiline table with caption:</p> <p>Multiline table with caption:</p>
<table style="width:79%;"> <table style="width:80%;">
<caption>Here’s the caption. It may span multiple lines.</caption> <caption>Here’s the caption. It may span multiple lines.</caption>
<colgroup> <colgroup>
<col width="15%" /> <col width="15%" />
<col width="13%" /> <col width="13%" />
<col width="16%" /> <col width="16%" />
<col width="33%" /> <col width="35%" />
</colgroup> </colgroup>
<thead> <thead>
<tr class="header"> <tr class="header">
@ -126,12 +126,12 @@
</tbody> </tbody>
</table> </table>
<p>Multiline table without caption:</p> <p>Multiline table without caption:</p>
<table style="width:79%;"> <table style="width:80%;">
<colgroup> <colgroup>
<col width="15%" /> <col width="15%" />
<col width="13%" /> <col width="13%" />
<col width="16%" /> <col width="16%" />
<col width="33%" /> <col width="35%" />
</colgroup> </colgroup>
<thead> <thead>
<tr class="header"> <tr class="header">
@ -180,12 +180,12 @@
</tbody> </tbody>
</table> </table>
<p>Multiline table without column headers:</p> <p>Multiline table without column headers:</p>
<table style="width:79%;"> <table style="width:80%;">
<colgroup> <colgroup>
<col width="15%" /> <col width="15%" />
<col width="13%" /> <col width="13%" />
<col width="16%" /> <col width="16%" />
<col width="33%" /> <col width="35%" />
</colgroup> </colgroup>
<tbody> <tbody>
<tr class="odd"> <tr class="odd">

12
test/tables.html5
View file

@ -94,13 +94,13 @@
</tbody> </tbody>
</table> </table>
<p>Multiline table with caption:</p> <p>Multiline table with caption:</p>
<table style="width:79%;"> <table style="width:80%;">
<caption>Here’s the caption. It may span multiple lines.</caption> <caption>Here’s the caption. It may span multiple lines.</caption>
<colgroup> <colgroup>
<col style="width: 15%" /> <col style="width: 15%" />
<col style="width: 13%" /> <col style="width: 13%" />
<col style="width: 16%" /> <col style="width: 16%" />
<col style="width: 33%" /> <col style="width: 35%" />
</colgroup> </colgroup>
<thead> <thead>
<tr class="header"> <tr class="header">
@ -126,12 +126,12 @@
</tbody> </tbody>
</table> </table>
<p>Multiline table without caption:</p> <p>Multiline table without caption:</p>
<table style="width:79%;"> <table style="width:80%;">
<colgroup> <colgroup>
<col style="width: 15%" /> <col style="width: 15%" />
<col style="width: 13%" /> <col style="width: 13%" />
<col style="width: 16%" /> <col style="width: 16%" />
<col style="width: 33%" /> <col style="width: 35%" />
</colgroup> </colgroup>
<thead> <thead>
<tr class="header"> <tr class="header">
@ -180,12 +180,12 @@
</tbody> </tbody>
</table> </table>
<p>Multiline table without column headers:</p> <p>Multiline table without column headers:</p>
<table style="width:79%;"> <table style="width:80%;">
<colgroup> <colgroup>
<col style="width: 15%" /> <col style="width: 15%" />
<col style="width: 13%" /> <col style="width: 13%" />
<col style="width: 16%" /> <col style="width: 16%" />
<col style="width: 33%" /> <col style="width: 35%" />
</colgroup> </colgroup>
<tbody> <tbody>
<tr class="odd"> <tr class="odd">

6
test/tables.icml
View file

@ -395,7 +395,7 @@
<Column Name="0" SingleColumnWidth="75.0" /> <Column Name="0" SingleColumnWidth="75.0" />
<Column Name="1" SingleColumnWidth="68.75" /> <Column Name="1" SingleColumnWidth="68.75" />
<Column Name="2" SingleColumnWidth="81.25" /> <Column Name="2" SingleColumnWidth="81.25" />
<Column Name="3" SingleColumnWidth="168.75" /> <Column Name="3" SingleColumnWidth="175.0" />
<Cell Name="0:0" AppliedCellStyle="CellStyle/Cell"> <Cell Name="0:0" AppliedCellStyle="CellStyle/Cell">
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar &gt; TableHeader &gt; CenterAlign"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar &gt; TableHeader &gt; CenterAlign">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
@ -497,7 +497,7 @@
<Column Name="0" SingleColumnWidth="75.0" /> <Column Name="0" SingleColumnWidth="75.0" />
<Column Name="1" SingleColumnWidth="68.75" /> <Column Name="1" SingleColumnWidth="68.75" />
<Column Name="2" SingleColumnWidth="81.25" /> <Column Name="2" SingleColumnWidth="81.25" />
<Column Name="3" SingleColumnWidth="168.75" /> <Column Name="3" SingleColumnWidth="175.0" />
<Cell Name="0:0" AppliedCellStyle="CellStyle/Cell"> <Cell Name="0:0" AppliedCellStyle="CellStyle/Cell">
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar &gt; TableHeader &gt; CenterAlign"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar &gt; TableHeader &gt; CenterAlign">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
@ -695,7 +695,7 @@
<Column Name="0" SingleColumnWidth="75.0" /> <Column Name="0" SingleColumnWidth="75.0" />
<Column Name="1" SingleColumnWidth="68.75" /> <Column Name="1" SingleColumnWidth="68.75" />
<Column Name="2" SingleColumnWidth="81.25" /> <Column Name="2" SingleColumnWidth="81.25" />
<Column Name="3" SingleColumnWidth="168.75" /> <Column Name="3" SingleColumnWidth="175.0" />
<Cell Name="0:0" AppliedCellStyle="CellStyle/Cell"> <Cell Name="0:0" AppliedCellStyle="CellStyle/Cell">
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar &gt; CenterAlign"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar &gt; CenterAlign">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

6
test/tables.jats
View file

@ -122,7 +122,7 @@
<col width="15*" align="center" /> <col width="15*" align="center" />
<col width="13*" align="left" /> <col width="13*" align="left" />
<col width="16*" align="right" /> <col width="16*" align="right" />
<col width="33*" align="left" /> <col width="35*" align="left" />
<thead> <thead>
<tr> <tr>
<th>Centered Header</th> <th>Centered Header</th>
@ -152,7 +152,7 @@
<col width="15*" align="center" /> <col width="15*" align="center" />
<col width="13*" align="left" /> <col width="13*" align="left" />
<col width="16*" align="right" /> <col width="16*" align="right" />
<col width="33*" align="left" /> <col width="35*" align="left" />
<thead> <thead>
<tr> <tr>
<th>Centered Header</th> <th>Centered Header</th>
@ -208,7 +208,7 @@
<col width="15*" align="center" /> <col width="15*" align="center" />
<col width="13*" align="left" /> <col width="13*" align="left" />
<col width="16*" align="right" /> <col width="16*" align="right" />
<col width="33*" align="left" /> <col width="35*" align="left" />
<tbody> <tbody>
<tr> <tr>
<td>First</td> <td>First</td>

18
test/tables.latex
View file

@ -58,7 +58,7 @@ Centered Header\strut
Left Aligned\strut Left Aligned\strut
\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft
Right Aligned\strut Right Aligned\strut
\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[b]{0.31\columnwidth}\raggedright
Default aligned\strut Default aligned\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\midrule \midrule
@ -70,7 +70,7 @@ Centered Header\strut
Left Aligned\strut Left Aligned\strut
\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft
Right Aligned\strut Right Aligned\strut
\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[b]{0.31\columnwidth}\raggedright
Default aligned\strut Default aligned\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\midrule \midrule
@ -81,7 +81,7 @@ First\strut
row\strut row\strut
\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft
12.0\strut 12.0\strut
\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright
Example of a row that spans multiple lines.\strut Example of a row that spans multiple lines.\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\begin{minipage}[t]{0.13\columnwidth}\centering \begin{minipage}[t]{0.13\columnwidth}\centering
@ -90,7 +90,7 @@ Second\strut
row\strut row\strut
\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft
5.0\strut 5.0\strut
\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright
Here's another one. Note the blank line between rows.\strut Here's another one. Note the blank line between rows.\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\bottomrule \bottomrule
@ -106,7 +106,7 @@ Centered Header\strut
Left Aligned\strut Left Aligned\strut
\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft
Right Aligned\strut Right Aligned\strut
\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[b]{0.31\columnwidth}\raggedright
Default aligned\strut Default aligned\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\midrule \midrule
@ -117,7 +117,7 @@ First\strut
row\strut row\strut
\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft
12.0\strut 12.0\strut
\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright
Example of a row that spans multiple lines.\strut Example of a row that spans multiple lines.\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\begin{minipage}[t]{0.13\columnwidth}\centering \begin{minipage}[t]{0.13\columnwidth}\centering
@ -126,7 +126,7 @@ Second\strut
row\strut row\strut
\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft
5.0\strut 5.0\strut
\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright
Here's another one. Note the blank line between rows.\strut Here's another one. Note the blank line between rows.\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\bottomrule \bottomrule
@ -154,7 +154,7 @@ First\strut
row\strut row\strut
\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft
12.0\strut 12.0\strut
\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright
Example of a row that spans multiple lines.\strut Example of a row that spans multiple lines.\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\begin{minipage}[t]{0.13\columnwidth}\centering \begin{minipage}[t]{0.13\columnwidth}\centering
@ -163,7 +163,7 @@ Second\strut
row\strut row\strut
\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft \end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft
5.0\strut 5.0\strut
\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright \end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright
Here's another one. Note the blank line between rows.\strut Here's another one. Note the blank line between rows.\strut
\end{minipage}\tabularnewline \end{minipage}\tabularnewline
\bottomrule \bottomrule

6
test/tables.man
View file

@ -138,7 +138,7 @@ Multiline table with caption:
Here's the caption. It may span multiple lines. Here's the caption. It may span multiple lines.
.TS .TS
tab(@); tab(@);
cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
T{ T{
Centered Header Centered Header
T}@T{ T}@T{
@ -174,7 +174,7 @@ Multiline table without caption:
.PP .PP
.TS .TS
tab(@); tab(@);
cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
T{ T{
Centered Header Centered Header
T}@T{ T}@T{
@ -244,7 +244,7 @@ Multiline table without column headers:
.PP .PP
.TS .TS
tab(@); tab(@);
cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
T{ T{
First First
T}@T{ T}@T{

6
test/tables.mediawiki
View file

@ -79,7 +79,7 @@ Multiline table with caption:
!align="center" width="15%"| Centered Header !align="center" width="15%"| Centered Header
!width="13%"| Left Aligned !width="13%"| Left Aligned
!align="right" width="16%"| Right Aligned !align="right" width="16%"| Right Aligned
!width="33%"| Default aligned !width="35%"| Default aligned
|- |-
|align="center"| First |align="center"| First
| row | row
@ -98,7 +98,7 @@ Multiline table without caption:
!align="center" width="15%"| Centered Header !align="center" width="15%"| Centered Header
!width="13%"| Left Aligned !width="13%"| Left Aligned
!align="right" width="16%"| Right Aligned !align="right" width="16%"| Right Aligned
!width="33%"| Default aligned !width="35%"| Default aligned
|- |-
|align="center"| First |align="center"| First
| row | row
@ -136,7 +136,7 @@ Multiline table without column headers:
|align="center" width="15%"| First |align="center" width="15%"| First
|width="13%"| row |width="13%"| row
|align="right" width="16%"| 12.0 |align="right" width="16%"| 12.0
|width="33%"| Example of a row that spans multiple lines. |width="35%"| Example of a row that spans multiple lines.
|- |-
|align="center"| Second |align="center"| Second
| row | row

6
test/tables.ms
View file

@ -138,7 +138,7 @@ Multiline table with caption:
Here’s the caption. It may span multiple lines. Here’s the caption. It may span multiple lines.
.TS .TS
delim(@@) tab( ); delim(@@) tab( );
cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
T{ T{
Centered Header Centered Header
T} T{ T} T{
@ -174,7 +174,7 @@ Multiline table without caption:
.PP .PP
.TS .TS
delim(@@) tab( ); delim(@@) tab( );
cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
T{ T{
Centered Header Centered Header
T} T{ T} T{
@ -244,7 +244,7 @@ Multiline table without column headers:
.PP .PP
.TS .TS
delim(@@) tab( ); delim(@@) tab( );
cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
T{ T{
First First
T} T{ T} T{

6
test/tables.native
View file

@ -53,7 +53,7 @@
,[Plain [Str "1"]] ,[Plain [Str "1"]]
,[Plain [Str "1"]]]] ,[Plain [Str "1"]]]]
,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]
,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",SoftBreak,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.3375] ,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",SoftBreak,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.35]
[[Plain [Str "Centered",SoftBreak,Str "Header"]] [[Plain [Str "Centered",SoftBreak,Str "Header"]]
,[Plain [Str "Left",SoftBreak,Str "Aligned"]] ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]
,[Plain [Str "Right",SoftBreak,Str "Aligned"]] ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]
@ -67,7 +67,7 @@
,[Plain [Str "5.0"]] ,[Plain [Str "5.0"]]
,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]] ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]
,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]
,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.3375] ,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.35]
[[Plain [Str "Centered",SoftBreak,Str "Header"]] [[Plain [Str "Centered",SoftBreak,Str "Header"]]
,[Plain [Str "Left",SoftBreak,Str "Aligned"]] ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]
,[Plain [Str "Right",SoftBreak,Str "Aligned"]] ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]
@ -99,7 +99,7 @@
,[Plain [Str "1"]] ,[Plain [Str "1"]]
,[Plain [Str "1"]]]] ,[Plain [Str "1"]]]]
,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
,Table [] [AlignCenter,AlignLeft,AlignRight,AlignDefault] [0.15,0.1375,0.1625,0.3375] ,Table [] [AlignCenter,AlignLeft,AlignRight,AlignDefault] [0.15,0.1375,0.1625,0.35]
[[] [[]
,[] ,[]
,[] ,[]

16
test/tables.plain
View file

@ -28,33 +28,33 @@ Simple table indented two spaces:
Multiline table with caption: Multiline table with caption:
------------------------------------------------------------- --------------------------------------------------------------
Centered Left Right Default aligned Centered Left Right Default aligned
Header Aligned Aligned Header Aligned Aligned
----------- ---------- ------------ ------------------------- ----------- ---------- ------------ --------------------------
First row 12.0 Example of a row that First row 12.0 Example of a row that
spans multiple lines. spans multiple lines.
Second row 5.0 Here’s another one. Note Second row 5.0 Here’s another one. Note
the blank line between the blank line between
rows. rows.
------------------------------------------------------------- --------------------------------------------------------------
: Here’s the caption. It may span multiple lines. : Here’s the caption. It may span multiple lines.
Multiline table without caption: Multiline table without caption:
------------------------------------------------------------- --------------------------------------------------------------
Centered Left Right Default aligned Centered Left Right Default aligned
Header Aligned Aligned Header Aligned Aligned
----------- ---------- ------------ ------------------------- ----------- ---------- ------------ --------------------------
First row 12.0 Example of a row that First row 12.0 Example of a row that
spans multiple lines. spans multiple lines.
Second row 5.0 Here’s another one. Note Second row 5.0 Here’s another one. Note
the blank line between the blank line between
rows. rows.
------------------------------------------------------------- --------------------------------------------------------------
Table without column headers: Table without column headers:
@ -66,11 +66,11 @@ Table without column headers:
Multiline table without column headers: Multiline table without column headers:
----------- ---------- ------------ ------------------------- ----------- ---------- ------------ --------------------------
First row 12.0 Example of a row that First row 12.0 Example of a row that
spans multiple lines. spans multiple lines.
Second row 5.0 Here’s another one. Note Second row 5.0 Here’s another one. Note
the blank line between the blank line between
rows. rows.
----------- ---------- ------------ ------------------------- ----------- ---------- ------------ --------------------------

60
test/tables.rst
View file

@ -42,31 +42,31 @@ Multiline table with caption:
.. table:: Here’s the caption. It may span multiple lines. .. table:: Here’s the caption. It may span multiple lines.
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
| Centered | Left | Right | Default aligned | | Centered | Left | Right | Default aligned |
| Header | Aligned | Aligned | | | Header | Aligned | Aligned | |
+==========+=========+===========+=========================+ +==========+=========+===========+==========================+
| First | row | 12.0 | Example of a row that | | First | row | 12.0 | Example of a row that |
| | | | spans multiple lines. | | | | | spans multiple lines. |
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
| Second | row | 5.0 | Here’s another one. | | Second | row | 5.0 | Here’s another one. Note |
| | | | Note the blank line | | | | | the blank line between |
| | | | between rows. | | | | | rows. |
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
Multiline table without caption: Multiline table without caption:
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
| Centered | Left | Right | Default aligned | | Centered | Left | Right | Default aligned |
| Header | Aligned | Aligned | | | Header | Aligned | Aligned | |
+==========+=========+===========+=========================+ +==========+=========+===========+==========================+
| First | row | 12.0 | Example of a row that | | First | row | 12.0 | Example of a row that |
| | | | spans multiple lines. | | | | | spans multiple lines. |
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
| Second | row | 5.0 | Here’s another one. | | Second | row | 5.0 | Here’s another one. Note |
| | | | Note the blank line | | | | | the blank line between |
| | | | between rows. | | | | | rows. |
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
Table without column headers: Table without column headers:
@ -80,11 +80,11 @@ Table without column headers:
Multiline table without column headers: Multiline table without column headers:
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
| First | row | 12.0 | Example of a row that | | First | row | 12.0 | Example of a row that |
| | | | spans multiple lines. | | | | | spans multiple lines. |
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+
| Second | row | 5.0 | Here’s another one. | | Second | row | 5.0 | Here’s another one. Note |
| | | | Note the blank line | | | | | the blank line between |
| | | | between rows. | | | | | rows. |
+----------+---------+-----------+-------------------------+ +----------+---------+-----------+--------------------------+

16
test/tables.rtf
View file

@ -187,7 +187,7 @@
{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table with caption:\par} {\pard \ql \f0 \sa180 \li0 \fi0 Multiline table with caption:\par}
{ {
\trowd \trgaph120 \trowd \trgaph120
\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804 \clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par}
@ -202,7 +202,7 @@
\intbl\row} \intbl\row}
{ {
\trowd \trgaph120 \trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804 \cellx1296\cellx2484\cellx3888\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}
@ -217,7 +217,7 @@
\intbl\row} \intbl\row}
{ {
\trowd \trgaph120 \trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804 \cellx1296\cellx2484\cellx3888\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}
@ -234,7 +234,7 @@
{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without caption:\par} {\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without caption:\par}
{ {
\trowd \trgaph120 \trowd \trgaph120
\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804 \clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par}
@ -249,7 +249,7 @@
\intbl\row} \intbl\row}
{ {
\trowd \trgaph120 \trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804 \cellx1296\cellx2484\cellx3888\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}
@ -264,7 +264,7 @@
\intbl\row} \intbl\row}
{ {
\trowd \trgaph120 \trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804 \cellx1296\cellx2484\cellx3888\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}
@ -328,7 +328,7 @@
{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without column headers:\par} {\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without column headers:\par}
{ {
\trowd \trgaph120 \trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804 \cellx1296\cellx2484\cellx3888\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}
@ -343,7 +343,7 @@
\intbl\row} \intbl\row}
{ {
\trowd \trgaph120 \trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804 \cellx1296\cellx2484\cellx3888\cellx6912
\trkeep\intbl \trkeep\intbl
{ {
{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par} {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

6
test/tables.texinfo
View file

@ -83,7 +83,7 @@ Right
Multiline table with caption: Multiline table with caption:
@float @float
@multitable @columnfractions 0.15 0.14 0.16 0.34 @multitable @columnfractions 0.15 0.14 0.16 0.35
@headitem @headitem
Centered Header Centered Header
@tab Left Aligned @tab Left Aligned
@ -104,7 +104,7 @@ Second
@end float @end float
Multiline table without caption: Multiline table without caption:
@multitable @columnfractions 0.15 0.14 0.16 0.34 @multitable @columnfractions 0.15 0.14 0.16 0.35
@headitem @headitem
Centered Header Centered Header
@tab Left Aligned @tab Left Aligned
@ -144,7 +144,7 @@ Table without column headers:
Multiline table without column headers: Multiline table without column headers:
@multitable @columnfractions 0.15 0.14 0.16 0.34 @multitable @columnfractions 0.15 0.14 0.16 0.35
@item @item
First First
@tab row @tab row

6
test/tables.textile
View file

@ -80,7 +80,7 @@ Multiline table with caption:
<col width="15%" /> <col width="15%" />
<col width="13%" /> <col width="13%" />
<col width="16%" /> <col width="16%" />
<col width="33%" /> <col width="35%" />
<thead> <thead>
<tr class="header"> <tr class="header">
<th align="center">Centered Header</th> <th align="center">Centered Header</th>
@ -111,7 +111,7 @@ Multiline table without caption:
<col width="15%" /> <col width="15%" />
<col width="13%" /> <col width="13%" />
<col width="16%" /> <col width="16%" />
<col width="33%" /> <col width="35%" />
<thead> <thead>
<tr class="header"> <tr class="header">
<th align="center">Centered Header</th> <th align="center">Centered Header</th>
@ -148,7 +148,7 @@ Multiline table without column headers:
<col width="15%" /> <col width="15%" />
<col width="13%" /> <col width="13%" />
<col width="16%" /> <col width="16%" />
<col width="33%" /> <col width="35%" />
<tbody> <tbody>
<tr class="odd"> <tr class="odd">
<td align="center">First</td> <td align="center">First</td>