3e52691 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed layout bug in ConTeXt and LaTeX writers.

This was a regression introduced by the recent internal links changes.

commit3e526918f810ba2e1baab39aa04cc140fc8716a1 authorJohn MacFarlane <fiddlosopher@gmail.com> dateFri 30 Dec 2011, 16:28 (15 years ago) parent3f98102

2 files changed+4−4

unifiedsplit

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

@@ -70,7 +70,7 @@ pandocToConTeXt options (Pandoc (Meta title authors date) blocks) = do

7070 then return ""

7171 else liftM (render colwidth) $ inlineListToConTeXt date

7272 body <- mapM (elementToConTeXt options) $ hierarchicalize blocks

73− let main = (render colwidth . cat) body

73+ let main = (render colwidth . vcat) body

7474 let context = writerVariables options ++

7575 [ ("toc", if writerTableOfContents options then "yes" else "")

7676 , ("body", main)

@@ -119,7 +119,7 @@ elementToConTeXt _ (Blk block) = blockToConTeXt block

119119elementToConTeXt opts (Sec level _ id' title' elements) = do

120120 header' <- sectionHeader id' level title'

121121 innerContents <- mapM (elementToConTeXt opts) elements

122− return $ cat (header' : innerContents)

122+ return $ vcat (header' : innerContents)

123123

124124-- | Convert Pandoc block element to ConTeXt.

125125blockToConTeXt :: Block

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

@@ -117,7 +117,7 @@ pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do

117117 else return blocks'

118118 body <- mapM (elementToLaTeX options) $ hierarchicalize blocks''

119119 biblioTitle <- liftM (render colwidth) $ inlineListToLaTeX lastHeader

120− let main = render colwidth $ cat body

120+ let main = render colwidth $ vcat body

121121 st <- get

122122 let biblioFiles = intercalate "," $ map dropExtension $ writerBiblioFiles options

123123 citecontext = case writerCiteMethod options of

@@ -166,7 +166,7 @@ elementToLaTeX _ (Blk block) = blockToLaTeX block

166166elementToLaTeX opts (Sec level _ id' title' elements) = do

167167 header' <- sectionHeader id' level title'

168168 innerContents <- mapM (elementToLaTeX opts) elements

169− return $ cat (header' : innerContents)

169+ return $ vcat (header' : innerContents)

170170

171171-- escape things as needed for LaTeX

172172stringToLaTeX :: Bool -> String -> String