diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 5 | ||||
| -rw-r--r-- | tests/tables.latex | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index 100bf900d..5bbe30fc8 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -471,19 +471,18 @@ blockToLaTeX (Table caption aligns widths heads rows) = do captionText <- inlineListToLaTeX caption let capt = if isEmpty captionText then empty - else text "\\addlinespace" - $$ text "\\caption" <> braces captionText + else text "\\caption" <> braces captionText <> "\\\\" rows' <- mapM (tableRowToLaTeX False aligns widths) rows let colDescriptors = text $ concat $ map toColDescriptor aligns modify $ \s -> s{ stTable = True } return $ "\\begin{longtable}[c]" <> braces ("@{}" <> colDescriptors <> "@{}") -- the @{} removes extra space at beginning and end + $$ capt $$ "\\toprule\\addlinespace" $$ headers $$ vcat rows' $$ "\\bottomrule" - $$ capt $$ "\\end{longtable}" toColDescriptor :: Alignment -> String diff --git a/tests/tables.latex b/tests/tables.latex index 1a87c4f71..eb665204d 100644 --- a/tests/tables.latex +++ b/tests/tables.latex @@ -1,6 +1,7 @@ Simple table with caption: \begin{longtable}[c]{@{}rlcl@{}} +\caption{Demonstration of simple table syntax.}\\ \toprule\addlinespace Right & Left & Center & Default \\\addlinespace @@ -12,8 +13,6 @@ Right & Left & Center & Default 1 & 1 & 1 & 1 \\\addlinespace \bottomrule -\addlinespace -\caption{Demonstration of simple table syntax.} \end{longtable} Simple table without caption: @@ -35,6 +34,7 @@ Right & Left & Center & Default Simple table indented two spaces: \begin{longtable}[c]{@{}rlcl@{}} +\caption{Demonstration of simple table syntax.}\\ \toprule\addlinespace Right & Left & Center & Default \\\addlinespace @@ -46,13 +46,12 @@ Right & Left & Center & Default 1 & 1 & 1 & 1 \\\addlinespace \bottomrule -\addlinespace -\caption{Demonstration of simple table syntax.} \end{longtable} Multiline table with caption: \begin{longtable}[c]{@{}clrl@{}} +\caption{Here's the caption. It may span multiple lines.}\\ \toprule\addlinespace \begin{minipage}[b]{0.13\columnwidth}\centering Centered Header @@ -86,8 +85,6 @@ Here's another one. Note the blank line between rows. \end{minipage} \\\addlinespace \bottomrule -\addlinespace -\caption{Here's the caption. It may span multiple lines.} \end{longtable} Multiline table without caption: |