From 90296d7e96de6c8a36192c6eb12b4cc42b673d1e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 28 Dec 2017 08:53:54 -0800 Subject: LaTeX writer: Use \endhead after \toprule in headerless tables. Closes #4207. --- src/Text/Pandoc/Writers/LaTeX.hs | 7 +++---- test/tables.latex | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index d6ccc1512..87ce65586 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -699,10 +699,9 @@ blockToLaTeX (Table caption aligns widths heads rows) = do then return empty else ($$ text "\\endfirsthead") <$> toHeaders heads head' <- if all null heads - then return empty + then return "\\toprule" -- avoid duplicate notes in head and firsthead: - else ($$ text "\\endhead") <$> - toHeaders (if isEmpty firsthead + else toHeaders (if isEmpty firsthead then heads else walk removeNote heads) let capt = if isEmpty captionText @@ -717,8 +716,8 @@ blockToLaTeX (Table caption aligns widths heads rows) = do -- the @{} removes extra space at beginning and end $$ capt $$ firsthead - $$ (if all null heads then "\\toprule" else empty) $$ head' + $$ "\\endhead" $$ vcat rows' $$ "\\bottomrule" $$ "\\end{longtable}" diff --git a/test/tables.latex b/test/tables.latex index 7e3d9613d..759b35dfa 100644 --- a/test/tables.latex +++ b/test/tables.latex @@ -136,6 +136,7 @@ Table without column headers: \begin{longtable}[]{@{}rlcr@{}} \toprule +\endhead 12 & 12 & 12 & 12\tabularnewline 123 & 123 & 123 & 123\tabularnewline 1 & 1 & 1 & 1\tabularnewline @@ -146,6 +147,7 @@ Multiline table without column headers: \begin{longtable}[]{@{}clrl@{}} \toprule +\endhead \begin{minipage}[t]{0.13\columnwidth}\centering First\strut \end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -- cgit v1.2.3