opensource/pandoc
3
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-30 17:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

LaTeX writer: make alignment work within multirow in tables.

Browse Source 
Closes #10772.
This commit is contained in:
John MacFarlane
2025-04-09 22:38:43 -07:00
parent c589a89d8f
commit c2482b9107
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Text/Pandoc/Writers/LaTeX/Table.hs
+5 -1
View File
@@ -367,6 +367,10 @@ cellToLaTeX blockListToLaTeX isSimpleTable colCount celltype annotatedCell = do
<> braces ("%\n" <> x)
-- linebreak for readability
let hasColWidths = not (all (== ColWidthDefault) colWidths)
let aligncmd = case specAlign of
AlignCenter -> "\\centering\\arraybackslash "
AlignRight -> "\\raggedright\\arraybackslash "
_ -> mempty
let inMultiRow x = case rowspan of
(RowSpan 1) -> x
(RowSpan n) -> let nrows = literal (tshow n)
@@ -375,7 +379,7 @@ cellToLaTeX blockListToLaTeX isSimpleTable colCount celltype annotatedCell = do
(if hasColWidths
then "=" -- max width
else "*") -- natural width
<> braces x
<> braces (aligncmd <> x)
return . inMultiColumn . inMultiRow $ result
-- | Returns the width of a cell spanning @n@ columns.
test/tables/planets.latex
+7 -6
View File
@@ -17,17 +17,18 @@ temperature (C) & Number of moons & Notes \\
\bottomrule\noalign{}
\endlastfoot
\multicolumn{2}{@{}c}{%
\multirow{4}{*}{Terrestrial planets}} & Mercury & 0.330 & 4,879 & 5427 & 3.7 &
4222.6 & 57.9 & 167 & 0 & Closest to the Sun \\
\multirow{4}{*}{\centering\arraybackslash Terrestrial planets}} & Mercury &
0.330 & 4,879 & 5427 & 3.7 & 4222.6 & 57.9 & 167 & 0 & Closest to the Sun \\
& & Venus & 4.87 & 12,104 & 5243 & 8.9 & 2802.0 & 108.2 & 464 & 0 & \\
& & Earth & 5.97 & 12,756 & 5514 & 9.8 & 24.0 & 149.6 & 15 & 1 & Our world \\
& & Mars & 0.642 & 6,792 & 3933 & 3.7 & 24.7 & 227.9 & -65 & 2 & The red
planet \\
\multirow{4}{*}{Jovian planets} & \multirow{2}{*}{Gas giants} & Jupiter & 1898 &
142,984 & 1326 & 23.1 & 9.9 & 778.6 & -110 & 67 & The largest planet \\
\multirow{4}{*}{\centering\arraybackslash Jovian planets} &
\multirow{2}{*}{\centering\arraybackslash Gas giants} & Jupiter & 1898 & 142,984
& 1326 & 23.1 & 9.9 & 778.6 & -110 & 67 & The largest planet \\
& & Saturn & 568 & 120,536 & 687 & 9.0 & 10.7 & 1433.5 & -140 & 62 & \\
& \multirow{2}{*}{Ice giants} & Uranus & 86.8 & 51,118 & 1271 & 8.7 & 17.2 &
2872.5 & -195 & 27 & \\
& \multirow{2}{*}{\centering\arraybackslash Ice giants} & Uranus & 86.8 & 51,118
& 1271 & 8.7 & 17.2 & 2872.5 & -195 & 27 & \\
& & Neptune & 102 & 49,528 & 1638 & 11.0 & 16.1 & 4495.1 & -200 & 14 & \\
\multicolumn{2}{@{}c}{%
Dwarf planets} & Pluto & 0.0146 & 2,370 & 2095 & 0.7 & 153.3 & 5906.4 & -225 & 5