From 3e526918f810ba2e1baab39aa04cc140fc8716a1 Mon Sep 17 00:00:00 2001 From: John MacFarlane <fiddlosopher@gmail.com> Date: Fri, 30 Dec 2011 16:28:44 -0800 Subject: [PATCH] Fixed layout bug in ConTeXt and LaTeX writers. This was a regression introduced by the recent internal links changes. --- src/Text/Pandoc/Writers/ConTeXt.hs | 4 ++-- src/Text/Pandoc/Writers/LaTeX.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs index 1427f78c8..dfdf7a140 100644 --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -70,7 +70,7 @@ pandocToConTeXt options (Pandoc (Meta title authors date) blocks) = do then return "" else liftM (render colwidth) $ inlineListToConTeXt date body <- mapM (elementToConTeXt options) $ hierarchicalize blocks - let main = (render colwidth . cat) body + let main = (render colwidth . vcat) body let context = writerVariables options ++ [ ("toc", if writerTableOfContents options then "yes" else "") , ("body", main) @@ -119,7 +119,7 @@ elementToConTeXt _ (Blk block) = blockToConTeXt block elementToConTeXt opts (Sec level _ id' title' elements) = do header' <- sectionHeader id' level title' innerContents <- mapM (elementToConTeXt opts) elements - return $ cat (header' : innerContents) + return $ vcat (header' : innerContents) -- | Convert Pandoc block element to ConTeXt. blockToConTeXt :: Block diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index cfa4a5dfd..da0389cf7 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -117,7 +117,7 @@ pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do else return blocks' body <- mapM (elementToLaTeX options) $ hierarchicalize blocks'' biblioTitle <- liftM (render colwidth) $ inlineListToLaTeX lastHeader - let main = render colwidth $ cat body + let main = render colwidth $ vcat body st <- get let biblioFiles = intercalate "," $ map dropExtension $ writerBiblioFiles options citecontext = case writerCiteMethod options of @@ -166,7 +166,7 @@ elementToLaTeX _ (Blk block) = blockToLaTeX block elementToLaTeX opts (Sec level _ id' title' elements) = do header' <- sectionHeader id' level title' innerContents <- mapM (elementToLaTeX opts) elements - return $ cat (header' : innerContents) + return $ vcat (header' : innerContents) -- escape things as needed for LaTeX stringToLaTeX :: Bool -> String -> String