Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Markdown writer: Made sensitive to Ext_hard_line_breaks.

Browse source
This commit is contained in:
John MacFarlane 2012-09-15 19:19:47 -04:00
parent 62225599c9
commit 0851f8d592
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -54,9 +54,12 @@ data WriterState = WriterState { stNotes :: Notes
-- | Convert Pandoc to Markdown. -- | Convert Pandoc to Markdown.
writeMarkdown :: WriterOptions -> Pandoc -> String writeMarkdown :: WriterOptions -> Pandoc -> String
writeMarkdown opts document = writeMarkdown opts document =
evalState (pandocToMarkdown opts document) WriterState{ stNotes = [] evalState (pandocToMarkdown opts{
, stRefs = [] writerWrapText = writerWrapText opts &&
, stPlain = False } not (isEnabled Ext_hard_line_breaks opts) }
document) WriterState{ stNotes = []
, stRefs = []
, stPlain = False }
-- | Convert Pandoc to plain text (like markdown, but without links, -- | Convert Pandoc to plain text (like markdown, but without links,
-- pictures, or inline formatting). -- pictures, or inline formatting).
@ -588,8 +591,9 @@ inlineToMarkdown opts (RawInline f str)
return $ text str return $ text str
inlineToMarkdown _ (RawInline _ _) = return empty inlineToMarkdown _ (RawInline _ _) = return empty
inlineToMarkdown opts (LineBreak) inlineToMarkdown opts (LineBreak)
| isEnabled Ext_hard_line_breaks opts = return cr
| isEnabled Ext_escaped_line_breaks opts = return $ "\\" <> cr | isEnabled Ext_escaped_line_breaks opts = return $ "\\" <> cr
| otherwise = return $ " " <> cr | otherwise = return $ " " <> cr
inlineToMarkdown _ Space = return space inlineToMarkdown _ Space = return space
inlineToMarkdown opts (Cite (c:cs) lst) inlineToMarkdown opts (Cite (c:cs) lst)
| writerCiteMethod opts == Citeproc = inlineListToMarkdown opts lst | writerCiteMethod opts == Citeproc = inlineListToMarkdown opts lst