diff options
Diffstat (limited to 'src/Text/Pandoc/Writers')
-rw-r--r-- | src/Text/Pandoc/Writers/ConTeXt.hs | 6 | ||||
-rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs index 612f7360b..40cd721c6 100644 --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -116,9 +116,9 @@ blockToConTeXt :: WriterOptions -> State WriterState Doc blockToConTeXt opts Null = return empty blockToConTeXt opts (Plain lst) = - wrapTeXIfNeeded opts (inlineListToConTeXt opts) lst >>= return + wrapTeXIfNeeded opts False (inlineListToConTeXt opts) lst >>= return blockToConTeXt opts (Para lst) = - wrapTeXIfNeeded opts (inlineListToConTeXt opts) lst >>= return . (<> char '\n') + wrapTeXIfNeeded opts False (inlineListToConTeXt opts) lst >>= return . (<> char '\n') blockToConTeXt opts (BlockQuote lst) = do contents <- blockListToConTeXt opts lst return $ text "\\startblockquote\n" $$ contents $$ text "\\stopblockquote" @@ -270,7 +270,7 @@ inlineToConTeXt opts (Image alternate (src, tit)) = do text tit <> text "}\n{\\externalfigure[" <> text src <> text "]}" inlineToConTeXt opts (Note contents) = do contents' <- blockListToConTeXt opts contents - return $ text "\\footnote{" <> + return $ text " \\footnote{" <> text (stripTrailingNewlines $ render contents') <> char '}' diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index dd290569f..88050cc65 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -137,11 +137,11 @@ blockToLaTeX Null = return empty blockToLaTeX (Plain lst) = do st <- get let opts = stOptions st - wrapTeXIfNeeded opts inlineListToLaTeX lst + wrapTeXIfNeeded opts True inlineListToLaTeX lst blockToLaTeX (Para lst) = do st <- get let opts = stOptions st - result <- wrapTeXIfNeeded opts inlineListToLaTeX lst + result <- wrapTeXIfNeeded opts True inlineListToLaTeX lst return $ result <> char '\n' blockToLaTeX (BlockQuote lst) = do contents <- blockListToLaTeX lst @@ -314,5 +314,5 @@ inlineToLaTeX (Note contents) = do let rawnote = stripTrailingNewlines $ render contents' -- note: a \n before } is needed when note ends with a Verbatim environment let optNewline = "\\end{Verbatim}" `isSuffixOf` rawnote - return $ text "\\footnote{" <> + return $ text " \\footnote{" <> text rawnote <> (if optNewline then char '\n' else empty) <> char '}' |