7fbe473 · typeable/pandoc

src/Text/Pandoc/Readers/Markdown.hs+8−3

compare with master

unifiedsplit

@@ -1341,11 +1341,16 @@ multilineTableHeader headless = try $ do

1341 newline

1342 let (lengths, lines') = unzip dashes

1343 let indices = scanl (+) (length initSp) lines'

1344+ -- compensate for the fact that intercolumn spaces are

1345+ -- not included in the last index:

1346+ let indices' = case reverse indices of

1347+ [] -> []

1348+ (x:xs) -> reverse (x+1:xs)

1344 rawHeadsList <- if headless

1349 rawHeadsList <- if headless

1345 then fmap (map (:[]) . tail .

1350 then fmap (map (:[]) . tail .

1346− splitStringByIndices (init indices)) $ lookAhead anyLine

1351+ splitStringByIndices (init indices')) $ lookAhead anyLine

1347 else return $ transpose $ map

1352 else return $ transpose $ map

1348− (tail . splitStringByIndices (init indices))

1353+ (tail . splitStringByIndices (init indices'))

1349 rawContent

1354 rawContent

1350 let aligns = zipWith alignType rawHeadsList lengths

1355 let aligns = zipWith alignType rawHeadsList lengths

1351 let rawHeads = if headless

1356 let rawHeads = if headless

@@ -1353,7 +1358,7 @@ multilineTableHeader headless = try $ do

1353 else map (unlines . map trim) rawHeadsList

1358 else map (unlines . map trim) rawHeadsList

1354 heads <- fmap sequence $

1359 heads <- fmap sequence $

1355 mapM ((parseFromString' (mconcat <$> many plain)).trim) rawHeads

1360 mapM ((parseFromString' (mconcat <$> many plain)).trim) rawHeads

1356− return (heads, aligns, indices)

1361+ return (heads, aligns, indices')

1357

1362

1358-- Parse a grid table: starts with row of '-' on top, then header

1363-- Parse a grid table: starts with row of '-' on top, then header

1359-- (which may be grid), then the rows,

1364-- (which may be grid), then the rows,

src/Text/Pandoc/Writers/Markdown.hs+4−1

@@ -732,7 +732,10 @@ pandocTable opts multiline headless aligns widths rawHeaders rawRows = do

732 then empty

733 else border <> cr <> head'

734 let body = if multiline

735− then vsep rows'

735+ then vsep rows' $$

736+ if length rows' < 2

737+ then blankline -- #4578

738+ else empty

736 else vcat rows'

739 else vcat rows'

737 let bottom = if headless

740 let bottom = if headless

738 then underline

741 then underline

test/command/3348.md+1−1

@@ -7,7 +7,7 @@

7 line of text

8 ----- ------------------------------------------------

9^D

10−[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6666666666666666]

10+[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6805555555555556]

11 [[]

12 ,[]]

13 [[[Plain [Str "foo"]]

test/command/4578.mdnew file+14

@@ -0,0 +1,14 @@

1+```

2+% pandoc -t markdown

3+ ------ ------- --------------- ---------------------

4+ One row 12.0 Example of a row that

5+ spans multiple lines.

6+

7+ ------ ------- --------------- ---------------------

8+^D

9+ ------ ------- --------------- ---------------------

10+ One row 12.0 Example of a row that

11+ spans multiple lines.

12+

13+ ------ ------- --------------- ---------------------

14+```

test/tables-rstsubset.native+6−6

@@ -53,7 +53,7 @@

53 ,[Plain [Str "1"]]

54 ,[Plain [Str "1"]]]]

55,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]

56−,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]

56+,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]

57 [[Plain [Str "Centered",SoftBreak,Str "Header"]]

58 ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

59 ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

@@ -65,9 +65,9 @@

65 ,[[Plain [Str "Second"]]

66 ,[Plain [Str "row"]]

67 ,[Plain [Str "5.0"]]

68− ,[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."]]]]

68+ ,[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."]]]]

69,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]

70−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325]

70+,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]

71 [[Plain [Str "Centered",SoftBreak,Str "Header"]]

72 ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

73 ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

@@ -79,7 +79,7 @@

79 ,[[Plain [Str "Second"]]

80 ,[Plain [Str "row"]]

81 ,[Plain [Str "5.0"]]

82− ,[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."]]]]

82+ ,[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."]]]]

83,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

84,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [7.5e-2,7.5e-2,7.5e-2,7.5e-2]

85 [[]

@@ -99,7 +99,7 @@

99 ,[Plain [Str "1"]]

100 ,[Plain [Str "1"]]]]

101,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

102−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325]

102+,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]

103 [[]

104 ,[]

105 ,[]

@@ -111,4 +111,4 @@

111 ,[[Plain [Str "Second"]]

112 ,[Plain [Str "row"]]

113 ,[Plain [Str "5.0"]]

114− ,[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."]]]]]

114+ ,[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."]]]]]

test/tables.asciidoc+3−3

@@ -33,7 +33,7 @@ Simple table indented two spaces:

33Multiline table with caption:

34

35.Here’s the caption. It may span multiple lines.

36−[width="78%",cols="^21%,<17%,>20%,<42%",options="header",]

36+[width="80%",cols="^20%,<17%,>20%,<43%",options="header",]

37|=======================================================================

38|Centered Header |Left Aligned |Right Aligned |Default aligned

39|First |row |12.0 |Example of a row that spans multiple lines.

@@ -42,7 +42,7 @@ Multiline table with caption:

42

43Multiline table without caption:

44

45−[width="78%",cols="^21%,<17%,>20%,<42%",options="header",]

45+[width="80%",cols="^20%,<17%,>20%,<43%",options="header",]

46|=======================================================================

47|Centered Header |Left Aligned |Right Aligned |Default aligned

48|First |row |12.0 |Example of a row that spans multiple lines.

@@ -60,7 +60,7 @@ Table without column headers:

60

61Multiline table without column headers:

62

63−[width="78%",cols="^21%,<17%,>20%,42%",]

63+[width="80%",cols="^20%,<17%,>20%,43%",]

64|=======================================================================

65|First |row |12.0 |Example of a row that spans multiple lines.

66|Second |row |5.0 |Here’s another one. Note the blank line between rows.

test/tables.context+8−8

@@ -118,7 +118,7 @@ Multiline table with caption:

118\startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell

119\startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell

120\startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell

121−\startxcell[align=right,width={0.34\textwidth}] Default aligned \stopxcell

121+\startxcell[align=right,width={0.35\textwidth}] Default aligned \stopxcell

122\stopxrow

123\stopxtablehead

124\startxtablebody[body]

@@ -126,7 +126,7 @@ Multiline table with caption:

126\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell

127\startxcell[align=right,width={0.14\textwidth}] row \stopxcell

128\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell

129−\startxcell[align=right,width={0.34\textwidth}] Example of a row that spans

129+\startxcell[align=right,width={0.35\textwidth}] Example of a row that spans

130multiple lines. \stopxcell

131\stopxrow

132\stopxtablebody

@@ -135,7 +135,7 @@ multiple lines. \stopxcell

135\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell

136\startxcell[align=right,width={0.14\textwidth}] row \stopxcell

137\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell

138−\startxcell[align=right,width={0.34\textwidth}] Here's another one. Note the

138+\startxcell[align=right,width={0.35\textwidth}] Here's another one. Note the

139blank line between rows. \stopxcell

140\stopxrow

141\stopxtablefoot

@@ -151,7 +151,7 @@ Multiline table without caption:

151\startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell

152\startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell

153\startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell

154−\startxcell[align=right,width={0.34\textwidth}] Default aligned \stopxcell

154+\startxcell[align=right,width={0.35\textwidth}] Default aligned \stopxcell

155\stopxrow

156\stopxtablehead

157\startxtablebody[body]

@@ -159,7 +159,7 @@ Multiline table without caption:

159\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell

160\startxcell[align=right,width={0.14\textwidth}] row \stopxcell

161\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell

162−\startxcell[align=right,width={0.34\textwidth}] Example of a row that spans

162+\startxcell[align=right,width={0.35\textwidth}] Example of a row that spans

163multiple lines. \stopxcell

164\stopxrow

165\stopxtablebody

@@ -168,7 +168,7 @@ multiple lines. \stopxcell

168\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell

169\startxcell[align=right,width={0.14\textwidth}] row \stopxcell

170\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell

171−\startxcell[align=right,width={0.34\textwidth}] Here's another one. Note the

171+\startxcell[align=right,width={0.35\textwidth}] Here's another one. Note the

172blank line between rows. \stopxcell

173\stopxrow

174\stopxtablefoot

@@ -213,7 +213,7 @@ Multiline table without column headers:

213\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell

214\startxcell[align=right,width={0.14\textwidth}] row \stopxcell

215\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell

216−\startxcell[width={0.34\textwidth}] Example of a row that spans multiple

216+\startxcell[width={0.35\textwidth}] Example of a row that spans multiple

217lines. \stopxcell

218\stopxrow

219\stopxtablebody

@@ -222,7 +222,7 @@ lines. \stopxcell

222\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell

223\startxcell[align=right,width={0.14\textwidth}] row \stopxcell

224\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell

225−\startxcell[width={0.34\textwidth}] Here's another one. Note the blank line

225+\startxcell[width={0.35\textwidth}] Here's another one. Note the blank line

226between rows. \stopxcell

227\stopxrow

228\stopxtablefoot

test/tables.custom+3−3

@@ -95,7 +95,7 @@ It may span multiple lines.</caption>

95<col width="15%" />

96<col width="14%" />

97<col width="16%" />

98−<col width="34%" />

98+<col width="35%" />

99<tr class="header">

100<th align="center">Centered

101Header</th>

@@ -127,7 +127,7 @@ the blank line between rows.</td>

127<col width="15%" />

128<col width="14%" />

129<col width="16%" />

130−<col width="34%" />

130+<col width="35%" />

131<tr class="header">

132<th align="center">Centered

133Header</th>

@@ -182,7 +182,7 @@ the blank line between rows.</td>

182<col width="15%" />

183<col width="14%" />

184<col width="16%" />

185−<col width="34%" />

185+<col width="35%" />

186<tr class="odd">

187<td align="center">First</td>

188<td align="left">row</td>

test/tables.docbook4+3−3

@@ -228,7 +228,7 @@

228 <colspec colwidth="15*" align="center" />

229 <colspec colwidth="13*" align="left" />

230 <colspec colwidth="16*" align="right" />

231− <colspec colwidth="33*" align="left" />

231+ <colspec colwidth="35*" align="left" />

232 <thead>

233 <row>

234 <entry>

@@ -285,7 +285,7 @@

285 <colspec colwidth="15*" align="center" />

286 <colspec colwidth="13*" align="left" />

287 <colspec colwidth="16*" align="right" />

288− <colspec colwidth="33*" align="left" />

288+ <colspec colwidth="35*" align="left" />

289 <thead>

290 <row>

291 <entry>

@@ -397,7 +397,7 @@

397 <colspec colwidth="15*" align="center" />

398 <colspec colwidth="13*" align="left" />

399 <colspec colwidth="16*" align="right" />

400− <colspec colwidth="33*" align="left" />

400+ <colspec colwidth="35*" align="left" />

401 <tbody>

402 <row>

403 <entry>

test/tables.docbook5+3−3

@@ -228,7 +228,7 @@

228 <colspec colwidth="15*" align="center" />

229 <colspec colwidth="13*" align="left" />

230 <colspec colwidth="16*" align="right" />

231− <colspec colwidth="33*" align="left" />

231+ <colspec colwidth="35*" align="left" />

232 <thead>

233 <row>

234 <entry>

@@ -285,7 +285,7 @@

285 <colspec colwidth="15*" align="center" />

286 <colspec colwidth="13*" align="left" />

287 <colspec colwidth="16*" align="right" />

288− <colspec colwidth="33*" align="left" />

288+ <colspec colwidth="35*" align="left" />

289 <thead>

290 <row>

291 <entry>

@@ -397,7 +397,7 @@

397 <colspec colwidth="15*" align="center" />

398 <colspec colwidth="13*" align="left" />

399 <colspec colwidth="16*" align="right" />

400− <colspec colwidth="33*" align="left" />

400+ <colspec colwidth="35*" align="left" />

401 <tbody>

402 <row>

403 <entry>

test/tables.haddock+30−30

@@ -40,33 +40,33 @@ Simple table indented two spaces:

40

41Multiline table with caption:

42

43−> +----------+---------+-----------+-------------------------+

43+> +----------+---------+-----------+--------------------------+

46−> +==========+=========+===========+=========================+

46+> +==========+=========+===========+==========================+

47−> | First | row | 12.0 | Example of a row that |

47+> | First | row | 12.0 | Example of a row that |

48−> | | | | spans multiple lines. |

48+> | | | | spans multiple lines. |

49−> +----------+---------+-----------+-------------------------+

49+> +----------+---------+-----------+--------------------------+

50−> | Second | row | 5.0 | Here’s another one. |

50+> | Second | row | 5.0 | Here’s another one. Note |

51−> | | | | Note the blank line |

51+> | | | | the blank line between |

52−> | | | | between rows. |

52+> | | | | rows. |

53−> +----------+---------+-----------+-------------------------+

53+> +----------+---------+-----------+--------------------------+

54>

55> Here’s the caption. It may span multiple lines.

56

57Multiline table without caption:

58

59−> +----------+---------+-----------+-------------------------+

59+> +----------+---------+-----------+--------------------------+

62−> +==========+=========+===========+=========================+

62+> +==========+=========+===========+==========================+

63−> | First | row | 12.0 | Example of a row that |

63+> | First | row | 12.0 | Example of a row that |

64−> | | | | spans multiple lines. |

64+> | | | | spans multiple lines. |

65−> +----------+---------+-----------+-------------------------+

65+> +----------+---------+-----------+--------------------------+

66−> | Second | row | 5.0 | Here’s another one. |

66+> | Second | row | 5.0 | Here’s another one. Note |

67−> | | | | Note the blank line |

67+> | | | | the blank line between |

68−> | | | | between rows. |

68+> | | | | rows. |

69−> +----------+---------+-----------+-------------------------+

69+> +----------+---------+-----------+--------------------------+

70

71Table without column headers:

72

@@ -80,11 +80,11 @@ Table without column headers:

80

81Multiline table without column headers:

82

83−> +----------+---------+-----------+-------------------------+

83+> +----------+---------+-----------+--------------------------+

84−> | First | row | 12.0 | Example of a row that |

84+> | First | row | 12.0 | Example of a row that |

85−> | | | | spans multiple lines. |

85+> | | | | spans multiple lines. |

86−> +----------+---------+-----------+-------------------------+

86+> +----------+---------+-----------+--------------------------+

87−> | Second | row | 5.0 | Here’s another one. |

87+> | Second | row | 5.0 | Here’s another one. Note |

88−> | | | | Note the blank line |

88+> | | | | the blank line between |

89−> | | | | between rows. |

89+> | | | | rows. |

90−> +----------+---------+-----------+-------------------------+

90+> +----------+---------+-----------+--------------------------+

test/tables.html4+6−6

@@ -94,13 +94,13 @@

94</tbody>

95</table>

96<p>Multiline table with caption:</p>

97−<table style="width:79%;">

97+<table style="width:80%;">

98<caption>Here’s the caption. It may span multiple lines.</caption>

99<colgroup>

100<col width="15%" />

101<col width="13%" />

102<col width="16%" />

103−<col width="33%" />

103+<col width="35%" />

104</colgroup>

105<thead>

106<tr class="header">

@@ -126,12 +126,12 @@

126</tbody>

127</table>

128<p>Multiline table without caption:</p>

129−<table style="width:79%;">

129+<table style="width:80%;">

130<colgroup>

131<col width="15%" />

132<col width="13%" />

133<col width="16%" />

134−<col width="33%" />

134+<col width="35%" />

135</colgroup>

136<thead>

137<tr class="header">

@@ -180,12 +180,12 @@

180</tbody>

181</table>

182<p>Multiline table without column headers:</p>

183−<table style="width:79%;">

183+<table style="width:80%;">

184<colgroup>

185<col width="15%" />

186<col width="13%" />

187<col width="16%" />

188−<col width="33%" />

188+<col width="35%" />

189</colgroup>

190<tbody>

191<tr class="odd">

test/tables.html5+6−6

@@ -94,13 +94,13 @@

94</tbody>

95</table>

96<p>Multiline table with caption:</p>

97−<table style="width:79%;">

97+<table style="width:80%;">

98<caption>Here’s the caption. It may span multiple lines.</caption>

99<colgroup>

100<col style="width: 15%" />

101<col style="width: 13%" />

102<col style="width: 16%" />

103−<col style="width: 33%" />

103+<col style="width: 35%" />

104</colgroup>

105<thead>

106<tr class="header">

@@ -126,12 +126,12 @@

126</tbody>

127</table>

128<p>Multiline table without caption:</p>

129−<table style="width:79%;">

129+<table style="width:80%;">

130<colgroup>

131<col style="width: 15%" />

132<col style="width: 13%" />

133<col style="width: 16%" />

134−<col style="width: 33%" />

134+<col style="width: 35%" />

135</colgroup>

136<thead>

137<tr class="header">

@@ -180,12 +180,12 @@

180</tbody>

181</table>

182<p>Multiline table without column headers:</p>

183−<table style="width:79%;">

183+<table style="width:80%;">

184<colgroup>

185<col style="width: 15%" />

186<col style="width: 13%" />

187<col style="width: 16%" />

188−<col style="width: 33%" />

188+<col style="width: 35%" />

189</colgroup>

190<tbody>

191<tr class="odd">

test/tables.icml+3−3

@@ -395,7 +395,7 @@

395 <Column Name="0" SingleColumnWidth="75.0" />

396 <Column Name="1" SingleColumnWidth="68.75" />

397 <Column Name="2" SingleColumnWidth="81.25" />

398− <Column Name="3" SingleColumnWidth="168.75" />

398+ <Column Name="3" SingleColumnWidth="175.0" />

399 <Cell Name="0:0" AppliedCellStyle="CellStyle/Cell">

400 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar > TableHeader > CenterAlign">

401 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

@@ -497,7 +497,7 @@

497 <Column Name="0" SingleColumnWidth="75.0" />

498 <Column Name="1" SingleColumnWidth="68.75" />

499 <Column Name="2" SingleColumnWidth="81.25" />

500− <Column Name="3" SingleColumnWidth="168.75" />

500+ <Column Name="3" SingleColumnWidth="175.0" />

501 <Cell Name="0:0" AppliedCellStyle="CellStyle/Cell">

502 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar > TableHeader > CenterAlign">

503 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

@@ -695,7 +695,7 @@

695 <Column Name="0" SingleColumnWidth="75.0" />

696 <Column Name="1" SingleColumnWidth="68.75" />

697 <Column Name="2" SingleColumnWidth="81.25" />

698− <Column Name="3" SingleColumnWidth="168.75" />

698+ <Column Name="3" SingleColumnWidth="175.0" />

699 <Cell Name="0:0" AppliedCellStyle="CellStyle/Cell">

700 <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/TablePar > CenterAlign">

701 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

test/tables.jats+3−3

@@ -122,7 +122,7 @@

122 <col width="15*" align="center" />

123 <col width="13*" align="left" />

124 <col width="16*" align="right" />

125− <col width="33*" align="left" />

125+ <col width="35*" align="left" />

126 <thead>

127 <tr>

128 <th>Centered Header</th>

@@ -152,7 +152,7 @@

152 <col width="15*" align="center" />

153 <col width="13*" align="left" />

154 <col width="16*" align="right" />

155− <col width="33*" align="left" />

155+ <col width="35*" align="left" />

156 <thead>

157 <tr>

158 <th>Centered Header</th>

@@ -208,7 +208,7 @@

208 <col width="15*" align="center" />

209 <col width="13*" align="left" />

210 <col width="16*" align="right" />

211− <col width="33*" align="left" />

211+ <col width="35*" align="left" />

212 <tbody>

213 <tr>

214 <td>First</td>

test/tables.latex+9−9

@@ -58,7 +58,7 @@ Centered Header\strut

58Left Aligned\strut

59\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft

60Right Aligned\strut

61−\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright

61+\end{minipage} & \begin{minipage}[b]{0.31\columnwidth}\raggedright

62Default aligned\strut

63\end{minipage}\tabularnewline

64\midrule

@@ -70,7 +70,7 @@ Centered Header\strut

70Left Aligned\strut

71\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft

72Right Aligned\strut

73−\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright

73+\end{minipage} & \begin{minipage}[b]{0.31\columnwidth}\raggedright

74Default aligned\strut

75\end{minipage}\tabularnewline

76\midrule

@@ -81,7 +81,7 @@ First\strut

81row\strut

82\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft

8312.0\strut

84−\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright

84+\end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright

85Example of a row that spans multiple lines.\strut

86\end{minipage}\tabularnewline

87\begin{minipage}[t]{0.13\columnwidth}\centering

@@ -90,7 +90,7 @@ Second\strut

90row\strut

91\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft

925.0\strut

93−\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright

93+\end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright

94Here's another one. Note the blank line between rows.\strut

95\end{minipage}\tabularnewline

96\bottomrule

@@ -106,7 +106,7 @@ Centered Header\strut

106Left Aligned\strut

107\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft

108Right Aligned\strut

109−\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright

109+\end{minipage} & \begin{minipage}[b]{0.31\columnwidth}\raggedright

110Default aligned\strut

111\end{minipage}\tabularnewline

112\midrule

@@ -117,7 +117,7 @@ First\strut

117row\strut

118\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft

11912.0\strut

120−\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright

120+\end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright

121Example of a row that spans multiple lines.\strut

122\end{minipage}\tabularnewline

123\begin{minipage}[t]{0.13\columnwidth}\centering

@@ -126,7 +126,7 @@ Second\strut

126row\strut

127\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft

1285.0\strut

129−\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright

129+\end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright

130Here's another one. Note the blank line between rows.\strut

131\end{minipage}\tabularnewline

132\bottomrule

@@ -154,7 +154,7 @@ First\strut

154row\strut

155\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft

15612.0\strut

157−\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright

157+\end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright

158Example of a row that spans multiple lines.\strut

159\end{minipage}\tabularnewline

160\begin{minipage}[t]{0.13\columnwidth}\centering

@@ -163,7 +163,7 @@ Second\strut

163row\strut

164\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft

1655.0\strut

166−\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright

166+\end{minipage} & \begin{minipage}[t]{0.31\columnwidth}\raggedright

167Here's another one. Note the blank line between rows.\strut

168\end{minipage}\tabularnewline

169\bottomrule

test/tables.man+3−3

@@ -138,7 +138,7 @@ Multiline table with caption:

138Here's the caption. It may span multiple lines.

139.TS

140tab(@);

141−cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).

141+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).

142T{

143Centered Header

144T}@T{

@@ -174,7 +174,7 @@ Multiline table without caption:

174.PP

175.TS

176tab(@);

177−cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).

177+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).

178T{

179Centered Header

180T}@T{

@@ -244,7 +244,7 @@ Multiline table without column headers:

244.PP

245.TS

246tab(@);

247−cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).

247+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).

248T{

249First

250T}@T{

test/tables.mediawiki+3−3

@@ -79,7 +79,7 @@ Multiline table with caption:

79!align="center" width="15%"| Centered Header

80!width="13%"| Left Aligned

81!align="right" width="16%"| Right Aligned

82−!width="33%"| Default aligned

82+!width="35%"| Default aligned

83|-

84|align="center"| First

85| row

@@ -98,7 +98,7 @@ Multiline table without caption:

98!align="center" width="15%"| Centered Header

99!width="13%"| Left Aligned

100!align="right" width="16%"| Right Aligned

101−!width="33%"| Default aligned

101+!width="35%"| Default aligned

102|-

103|align="center"| First

104| row

@@ -136,7 +136,7 @@ Multiline table without column headers:

136|align="center" width="15%"| First

137|width="13%"| row

138|align="right" width="16%"| 12.0

139−|width="33%"| Example of a row that spans multiple lines.

139+|width="35%"| Example of a row that spans multiple lines.

140|-

141|align="center"| Second

142| row

test/tables.ms+3−3

@@ -138,7 +138,7 @@ Multiline table with caption:

138Here’s the caption. It may span multiple lines.

139.TS

140delim(@@) tab( );

141−cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).

141+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).

142T{

143Centered Header

144T} T{

@@ -174,7 +174,7 @@ Multiline table without caption:

174.PP

175.TS

176delim(@@) tab( );

177−cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).

177+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).

178T{

179Centered Header

180T} T{

@@ -244,7 +244,7 @@ Multiline table without column headers:

244.PP

245.TS

246delim(@@) tab( );

247−cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n).

247+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).

248T{

249First

250T} T{

test/tables.native+3−3

@@ -53,7 +53,7 @@

53 ,[Plain [Str "1"]]

54 ,[Plain [Str "1"]]]]

55,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]

56−,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]

56+,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]

57 [[Plain [Str "Centered",SoftBreak,Str "Header"]]

58 ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

59 ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

@@ -67,7 +67,7 @@

67 ,[Plain [Str "5.0"]]

68 ,[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."]]]]

69,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]

70−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.3375]

70+,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.35]

71 [[Plain [Str "Centered",SoftBreak,Str "Header"]]

72 ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

73 ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

@@ -99,7 +99,7 @@

99 ,[Plain [Str "1"]]

100 ,[Plain [Str "1"]]]]

101,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

102−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignDefault] [0.15,0.1375,0.1625,0.3375]

102+,Table [] [AlignCenter,AlignLeft,AlignRight,AlignDefault] [0.15,0.1375,0.1625,0.35]

103 [[]

104 ,[]

105 ,[]

test/tables.plain+8−8

@@ -28,33 +28,33 @@ Simple table indented two spaces:

28

29Multiline table with caption:

30

31− -------------------------------------------------------------

31+ --------------------------------------------------------------

32 Centered Left Right Default aligned

33 Header Aligned Aligned

34− ----------- ---------- ------------ -------------------------

34+ ----------- ---------- ------------ --------------------------

35 First row 12.0 Example of a row that

36 spans multiple lines.

37

38 Second row 5.0 Here’s another one. Note

39 the blank line between

40 rows.

41− -------------------------------------------------------------

41+ --------------------------------------------------------------

42

43 : Here’s the caption. It may span multiple lines.

44

45Multiline table without caption:

46

47− -------------------------------------------------------------

47+ --------------------------------------------------------------

48 Centered Left Right Default aligned

49 Header Aligned Aligned

50− ----------- ---------- ------------ -------------------------

50+ ----------- ---------- ------------ --------------------------

51 First row 12.0 Example of a row that

52 spans multiple lines.

53

54 Second row 5.0 Here’s another one. Note

55 the blank line between

56 rows.

57− -------------------------------------------------------------

57+ --------------------------------------------------------------

58

59Table without column headers:

60

@@ -66,11 +66,11 @@ Table without column headers:

66

67Multiline table without column headers:

68

69− ----------- ---------- ------------ -------------------------

69+ ----------- ---------- ------------ --------------------------

70 First row 12.0 Example of a row that

71 spans multiple lines.

72

73 Second row 5.0 Here’s another one. Note

74 the blank line between

75 rows.

76− ----------- ---------- ------------ -------------------------

76+ ----------- ---------- ------------ --------------------------

test/tables.rst+30−30

@@ -42,31 +42,31 @@ Multiline table with caption:

42

43.. table:: Here’s the caption. It may span multiple lines.

44

45− +----------+---------+-----------+-------------------------+

45+ +----------+---------+-----------+--------------------------+

48− +==========+=========+===========+=========================+

48+ +==========+=========+===========+==========================+

49− | First | row | 12.0 | Example of a row that |

49+ | First | row | 12.0 | Example of a row that |

50− | | | | spans multiple lines. |

50+ | | | | spans multiple lines. |

51− +----------+---------+-----------+-------------------------+

51+ +----------+---------+-----------+--------------------------+

52− | Second | row | 5.0 | Here’s another one. |

52+ | Second | row | 5.0 | Here’s another one. Note |

53− | | | | Note the blank line |

53+ | | | | the blank line between |

54− | | | | between rows. |

54+ | | | | rows. |

55− +----------+---------+-----------+-------------------------+

55+ +----------+---------+-----------+--------------------------+

56

57Multiline table without caption:

58

59−+----------+---------+-----------+-------------------------+

59++----------+---------+-----------+--------------------------+

62−+==========+=========+===========+=========================+

62++==========+=========+===========+==========================+

63−| First | row | 12.0 | Example of a row that |

63+| First | row | 12.0 | Example of a row that |

64−| | | | spans multiple lines. |

64+| | | | spans multiple lines. |

65−+----------+---------+-----------+-------------------------+

65++----------+---------+-----------+--------------------------+

66−| Second | row | 5.0 | Here’s another one. |

66+| Second | row | 5.0 | Here’s another one. Note |

67−| | | | Note the blank line |

67+| | | | the blank line between |

68−| | | | between rows. |

68+| | | | rows. |

69−+----------+---------+-----------+-------------------------+

69++----------+---------+-----------+--------------------------+

70

71Table without column headers:

72

@@ -80,11 +80,11 @@ Table without column headers:

80

81Multiline table without column headers:

82

83−+----------+---------+-----------+-------------------------+

83++----------+---------+-----------+--------------------------+

84−| First | row | 12.0 | Example of a row that |

84+| First | row | 12.0 | Example of a row that |

85−| | | | spans multiple lines. |

85+| | | | spans multiple lines. |

86−+----------+---------+-----------+-------------------------+

86++----------+---------+-----------+--------------------------+

87−| Second | row | 5.0 | Here’s another one. |

87+| Second | row | 5.0 | Here’s another one. Note |

88−| | | | Note the blank line |

88+| | | | the blank line between |

89−| | | | between rows. |

89+| | | | rows. |

90−+----------+---------+-----------+-------------------------+

90++----------+---------+-----------+--------------------------+

test/tables.rtf+8−8

@@ -187,7 +187,7 @@

187{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table with caption:\par}

188{

189\trowd \trgaph120

190−\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804

190+\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6912

191\trkeep\intbl

192{

193{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par}

@@ -202,7 +202,7 @@

202\intbl\row}

203{

204\trowd \trgaph120

205−\cellx1296\cellx2484\cellx3888\cellx6804

205+\cellx1296\cellx2484\cellx3888\cellx6912

206\trkeep\intbl

207{

208{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}

@@ -217,7 +217,7 @@

217\intbl\row}

218{

219\trowd \trgaph120

220−\cellx1296\cellx2484\cellx3888\cellx6804

220+\cellx1296\cellx2484\cellx3888\cellx6912

221\trkeep\intbl

222{

223{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

@@ -234,7 +234,7 @@

234{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without caption:\par}

235{

236\trowd \trgaph120

237−\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804

237+\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6912

238\trkeep\intbl

239{

240{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par}

@@ -249,7 +249,7 @@

249\intbl\row}

250{

251\trowd \trgaph120

252−\cellx1296\cellx2484\cellx3888\cellx6804

252+\cellx1296\cellx2484\cellx3888\cellx6912

253\trkeep\intbl

254{

255{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}

@@ -264,7 +264,7 @@

264\intbl\row}

265{

266\trowd \trgaph120

267−\cellx1296\cellx2484\cellx3888\cellx6804

267+\cellx1296\cellx2484\cellx3888\cellx6912

268\trkeep\intbl

269{

270{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

@@ -328,7 +328,7 @@

328{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without column headers:\par}

329{

330\trowd \trgaph120

331−\cellx1296\cellx2484\cellx3888\cellx6804

331+\cellx1296\cellx2484\cellx3888\cellx6912

332\trkeep\intbl

333{

334{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}

@@ -343,7 +343,7 @@

343\intbl\row}

344{

345\trowd \trgaph120

346−\cellx1296\cellx2484\cellx3888\cellx6804

346+\cellx1296\cellx2484\cellx3888\cellx6912

347\trkeep\intbl

348{

349{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

test/tables.texinfo+3−3

@@ -83,7 +83,7 @@ Right

83Multiline table with caption:

84

85@float

86−@multitable @columnfractions 0.15 0.14 0.16 0.34

86+@multitable @columnfractions 0.15 0.14 0.16 0.35

87@headitem

88Centered Header

89 @tab Left Aligned

@@ -104,7 +104,7 @@ Second

104@end float

105Multiline table without caption:

106

107−@multitable @columnfractions 0.15 0.14 0.16 0.34

107+@multitable @columnfractions 0.15 0.14 0.16 0.35

108@headitem

109Centered Header

110 @tab Left Aligned

@@ -144,7 +144,7 @@ Table without column headers:

144

145Multiline table without column headers:

146

147−@multitable @columnfractions 0.15 0.14 0.16 0.34

147+@multitable @columnfractions 0.15 0.14 0.16 0.35

148@item

149First

150 @tab row

test/tables.textile+3−3

@@ -80,7 +80,7 @@ Multiline table with caption:

80<col width="15%" />

81<col width="13%" />

82<col width="16%" />

83−<col width="33%" />

83+<col width="35%" />

84<thead>

85<tr class="header">

86<th align="center">Centered Header</th>

@@ -111,7 +111,7 @@ Multiline table without caption:

111<col width="15%" />

112<col width="13%" />

113<col width="16%" />

114−<col width="33%" />

114+<col width="35%" />

115<thead>

116<tr class="header">

117<th align="center">Centered Header</th>

@@ -148,7 +148,7 @@ Multiline table without column headers:

148<col width="15%" />

149<col width="13%" />

150<col width="16%" />

151−<col width="33%" />

151+<col width="35%" />

152<tbody>

153<tr class="odd">

154<td align="center">First</td>