b5b5ef9 · typeable/pandoc

git.iko.soy/typeable/pandoc

LaTeX writer: Improve table spacing.

+ Remove the `\strut` that was added at the end of minipage environments in cells. + Replace `\tabularnewline` with `\\ \addlinespace`. Closes #6842, closes #6860.

commitb5b5ef92cbb48a709e8de861d64db29516daf815 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 22 Nov 2020, 10:54 (6 years ago) parent5344dab

4 files changed+73−73

compare with master

unifiedsplit

src/Text/Pandoc/Writers/LaTeX.hs+2−2 test/command/2378.md+3−3 test/command/5367.md+6−6 test/tables.latex+62−62

src/Text/Pandoc/Writers/LaTeX.hs+2−2

@@ -862,7 +862,7 @@ tableRowToLaTeX header aligns widths cols = do

862862 else widths

863863 let numcols = length widths'

864864 cells <- mapM (tableCellToLaTeX header numcols) $ zip3 widths' aligns cols

865− return $ hsep (intersperse "&" cells) <> "\\tabularnewline"

865+ return $ hsep (intersperse "&" cells) <> " \\\\ \\addlinespace"

866866

867867-- For simple latex tables (without minipages or parboxes),

868868-- we need to go to some lengths to get line breaks working:

@@ -914,7 +914,7 @@ tableCellToLaTeX header numcols (width, align, blocks) = do

914914 braces (text (printf

915915 "(\\columnwidth - %d\\tabcolsep) * \\real{%.2f}"

916916 (numcols - 1) width)) <>

917− halign <> cr <> cellContents <> "\\strut" <> cr <>

917+ halign <> cr <> cellContents <> cr <>

918918 "\\end{minipage}"

919919-- (\columnwidth - 8\tabcolsep) * \real{0.15}

920920

test/command/2378.md+3−3

@@ -14,14 +14,14 @@ is used.

1414\begin{longtable}[]{@{}ll@{}}

1515\caption{a table}\tabularnewline

1616\toprule

17−x & y\footnote{a footnote}\tabularnewline

17+x & y\footnote{a footnote} \\ \addlinespace

1818\midrule

1919\endfirsthead

2020\toprule

21−x & y{}\tabularnewline

21+x & y{} \\ \addlinespace

2222\midrule

2323\endhead

24−1 & 2\tabularnewline

24+1 & 2 \\ \addlinespace

2525\bottomrule

2626\end{longtable}

2727```

test/command/5367.md+6−6

@@ -24,19 +24,19 @@ hello\footnote{doc footnote}

2424\caption[Sample table.]{Sample table.\footnote{caption footnote}}\tabularnewline

2525\toprule

2626\begin{minipage}[b]{(\columnwidth - 0\tabcolsep) * \real{0.17}}\centering

27−Fruit\footnote{header footnote}\strut

28−\end{minipage}\tabularnewline

27+Fruit\footnote{header footnote}

28+\end{minipage} \\ \addlinespace

2929\midrule

3030\endfirsthead

3131\toprule

3232\begin{minipage}[b]{(\columnwidth - 0\tabcolsep) * \real{0.17}}\centering

33−Fruit{}\strut

34−\end{minipage}\tabularnewline

33+Fruit{}

34+\end{minipage} \\ \addlinespace

3535\midrule

3636\endhead

3737\begin{minipage}[t]{(\columnwidth - 0\tabcolsep) * \real{0.17}}\centering

38−Bans\footnote{table cell footnote}\strut

39−\end{minipage}\tabularnewline

38+Bans\footnote{table cell footnote}

39+\end{minipage} \\ \addlinespace

4040\bottomrule

4141\end{longtable}

4242

test/tables.latex+62−62

@@ -3,16 +3,16 @@ Simple table with caption:

33\begin{longtable}[]{@{}rlcl@{}}

44\caption{Demonstration of simple table syntax.}\tabularnewline

55\toprule

6−Right & Left & Center & Default\tabularnewline

6+Right & Left & Center & Default \\ \addlinespace

77\midrule

88\endfirsthead

99\toprule

10−Right & Left & Center & Default\tabularnewline

10+Right & Left & Center & Default \\ \addlinespace

1111\midrule

1212\endhead

13−12 & 12 & 12 & 12\tabularnewline

14−123 & 123 & 123 & 123\tabularnewline

15−1 & 1 & 1 & 1\tabularnewline

13+12 & 12 & 12 & 12 \\ \addlinespace

14+123 & 123 & 123 & 123 \\ \addlinespace

15+1 & 1 & 1 & 1 \\ \addlinespace

1616\bottomrule

1717\end{longtable}

1818

@@ -20,12 +20,12 @@ Simple table without caption:

2020

2121\begin{longtable}[]{@{}rlcl@{}}

2222\toprule

23−Right & Left & Center & Default\tabularnewline

23+Right & Left & Center & Default \\ \addlinespace

2424\midrule

2525\endhead

26−12 & 12 & 12 & 12\tabularnewline

27−123 & 123 & 123 & 123\tabularnewline

28−1 & 1 & 1 & 1\tabularnewline

26+12 & 12 & 12 & 12 \\ \addlinespace

27+123 & 123 & 123 & 123 \\ \addlinespace

28+1 & 1 & 1 & 1 \\ \addlinespace

2929\bottomrule

3030\end{longtable}

3131

@@ -34,16 +34,16 @@ Simple table indented two spaces:

3434\begin{longtable}[]{@{}rlcl@{}}

3535\caption{Demonstration of simple table syntax.}\tabularnewline

3636\toprule

37−Right & Left & Center & Default\tabularnewline

37+Right & Left & Center & Default \\ \addlinespace

3838\midrule

3939\endfirsthead

4040\toprule

41−Right & Left & Center & Default\tabularnewline

41+Right & Left & Center & Default \\ \addlinespace

4242\midrule

4343\endhead

44−12 & 12 & 12 & 12\tabularnewline

45−123 & 123 & 123 & 123\tabularnewline

46−1 & 1 & 1 & 1\tabularnewline

44+12 & 12 & 12 & 12 \\ \addlinespace

45+123 & 123 & 123 & 123 \\ \addlinespace

46+1 & 1 & 1 & 1 \\ \addlinespace

4747\bottomrule

4848\end{longtable}

4949

@@ -53,58 +53,58 @@ Multiline table with caption:

5353\caption{Here's the caption. It may span multiple lines.}\tabularnewline

5454\toprule

5555\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

56−Centered Header\strut

56+Centered Header

5757\end{minipage} &

5858\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

59−Left Aligned\strut

59+Left Aligned

6060\end{minipage} &

6161\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

62−Right Aligned\strut

62+Right Aligned

6363\end{minipage} &

6464\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

65−Default aligned\strut

66−\end{minipage}\tabularnewline

65+Default aligned

66+\end{minipage} \\ \addlinespace

6767\midrule

6868\endfirsthead

6969\toprule

7070\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

71−Centered Header\strut

71+Centered Header

7272\end{minipage} &

7373\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

74−Left Aligned\strut

74+Left Aligned

7575\end{minipage} &

7676\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

77−Right Aligned\strut

77+Right Aligned

7878\end{minipage} &

7979\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

80−Default aligned\strut

81−\end{minipage}\tabularnewline

80+Default aligned

81+\end{minipage} \\ \addlinespace

8282\midrule

8383\endhead

8484\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

85−First\strut

85+First

8686\end{minipage} &

8787\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

88−row\strut

88+row

8989\end{minipage} &

9090\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

91−12.0\strut

91+12.0

9292\end{minipage} &

9393\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

94−Example of a row that spans multiple lines.\strut

95−\end{minipage}\tabularnewline

94+Example of a row that spans multiple lines.

95+\end{minipage} \\ \addlinespace

9696\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

97−Second\strut

97+Second

9898\end{minipage} &

9999\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

100−row\strut

100+row

101101\end{minipage} &

102102\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

103−5.0\strut

103+5.0

104104\end{minipage} &

105105\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

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

107−\end{minipage}\tabularnewline

106+Here's another one. Note the blank line between rows.

107+\end{minipage} \\ \addlinespace

108108\bottomrule

109109\end{longtable}

110110

@@ -113,43 +113,43 @@ Multiline table without caption:

113113\begin{longtable}[]{@{}clrl@{}}

114114\toprule

115115\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

116−Centered Header\strut

116+Centered Header

117117\end{minipage} &

118118\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

119−Left Aligned\strut

119+Left Aligned

120120\end{minipage} &

121121\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

122−Right Aligned\strut

122+Right Aligned

123123\end{minipage} &

124124\begin{minipage}[b]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

125−Default aligned\strut

126−\end{minipage}\tabularnewline

125+Default aligned

126+\end{minipage} \\ \addlinespace

127127\midrule

128128\endhead

129129\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

130−First\strut

130+First

131131\end{minipage} &

132132\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

133−row\strut

133+row

134134\end{minipage} &

135135\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

136−12.0\strut

136+12.0

137137\end{minipage} &

138138\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

139−Example of a row that spans multiple lines.\strut

140−\end{minipage}\tabularnewline

139+Example of a row that spans multiple lines.

140+\end{minipage} \\ \addlinespace

141141\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

142−Second\strut

142+Second

143143\end{minipage} &

144144\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

145−row\strut

145+row

146146\end{minipage} &

147147\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

148−5.0\strut

148+5.0

149149\end{minipage} &

150150\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

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

152−\end{minipage}\tabularnewline

151+Here's another one. Note the blank line between rows.

152+\end{minipage} \\ \addlinespace

153153\bottomrule

154154\end{longtable}

155155

@@ -158,9 +158,9 @@ Table without column headers:

158158\begin{longtable}[]{@{}rlcr@{}}

159159\toprule

160160\endhead

161−12 & 12 & 12 & 12\tabularnewline

162−123 & 123 & 123 & 123\tabularnewline

163−1 & 1 & 1 & 1\tabularnewline

161+12 & 12 & 12 & 12 \\ \addlinespace

162+123 & 123 & 123 & 123 \\ \addlinespace

163+1 & 1 & 1 & 1 \\ \addlinespace

164164\bottomrule

165165\end{longtable}

166166

@@ -170,28 +170,28 @@ Multiline table without column headers:

170170\toprule

171171\endhead

172172\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

173−First\strut

173+First

174174\end{minipage} &

175175\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

176−row\strut

176+row

177177\end{minipage} &

178178\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

179−12.0\strut

179+12.0

180180\end{minipage} &

181181\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

182−Example of a row that spans multiple lines.\strut

183−\end{minipage}\tabularnewline

182+Example of a row that spans multiple lines.

183+\end{minipage} \\ \addlinespace

184184\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.15}}\centering

185−Second\strut

185+Second

186186\end{minipage} &

187187\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.14}}\raggedright

188−row\strut

188+row

189189\end{minipage} &

190190\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.16}}\raggedleft

191−5.0\strut

191+5.0

192192\end{minipage} &

193193\begin{minipage}[t]{(\columnwidth - 3\tabcolsep) * \real{0.35}}\raggedright

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

195−\end{minipage}\tabularnewline

194+Here's another one. Note the blank line between rows.

195+\end{minipage} \\ \addlinespace

196196\bottomrule

197197\end{longtable}