git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: produce SoftBreaks on newlines

Now wrapping can be preserved with --wrap=preserve

commit163af3fdee3c09234436ea7aab84a8b29ec1cece authorAlexander Krotov <ilabdsf@gmail.com> dateSun 19 Nov 2017, 01:23 (9 years ago) parentb9cdef0
2 files changed+41−31
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Muse.hs+28−18 test/Tests/Readers/Muse.hs+13−13
src/Text/Pandoc/Readers/Muse.hs+28−18
@@ -556,25 +556,35 @@ tableParseCaption = try $ do
556556-- inline parsers
557557--
558558
559+inlineList :: PandocMonad m => [MuseParser m (F Inlines)]
560+inlineList = [ endline
561+ , br
562+ , anchor
563+ , footnote
564+ , strong
565+ , strongTag
566+ , emph
567+ , emphTag
568+ , superscriptTag
569+ , subscriptTag
570+ , strikeoutTag
571+ , verbatimTag
572+ , link
573+ , code
574+ , codeTag
575+ , whitespace
576+ , str
577+ , symbol
578+ ]
579+
559580inline :: PandocMonad m => MuseParser m (F Inlines)
560−inline = choice [ br
561− , anchor
562− , footnote
563− , strong
564− , strongTag
565− , emph
566− , emphTag
567− , superscriptTag
568− , subscriptTag
569− , strikeoutTag
570− , verbatimTag
571− , link
572− , code
573− , codeTag
574− , whitespace
575− , str
576− , symbol
577− ] <?> "inline"
581+inline = (choice inlineList) <?> "inline"
582+
583+endline :: PandocMonad m => MuseParser m (F Inlines)
584+endline = try $ do
585+ newline
586+ notFollowedBy blankline
587+ returnF B.softbreak
578588
579589anchor :: PandocMonad m => MuseParser m (F Inlines)
580590anchor = try $ do
test/Tests/Readers/Muse.hs+13−13
@@ -76,7 +76,7 @@ tests =
7676 , ""
7777 , "Fourth line</em>"
7878 ] =?>
79− para "First line <em>Second line" <>
79+ para "First line\n<em>Second line" <>
8080 para "Fourth line</em>"
8181
8282 , "Linebreak" =: "Line <br> break" =?> para ("Line" <> linebreak <> "break")
@@ -168,12 +168,12 @@ tests =
168168 T.unlines [ "First line"
169169 , "second line."
170170 ] =?>
171− para "First line second line."
171+ para "First line\nsecond line."
172172 , "Indented paragraph" =:
173173 T.unlines [ " First line"
174174 , "second line."
175175 ] =?>
176− para "First line second line."
176+ para "First line\nsecond line."
177177 -- Emacs Muse starts a blockquote on the second line.
178178 -- We copy Amusewiki behavior and require a blank line to start a blockquote.
179179 , "Indentation in the middle of paragraph" =:
@@ -181,7 +181,7 @@ tests =
181181 , " second line"
182182 , "third line"
183183 ] =?>
184− para "First line second line third line"
184+ para "First line\nsecond line\nthird line"
185185 , "Quote" =:
186186 " This is a quotation\n" =?>
187187 blockQuote (para "This is a quotation")
@@ -189,7 +189,7 @@ tests =
189189 T.unlines [ " This is a quotation"
190190 , " with a continuation"
191191 ] =?>
192− blockQuote (para "This is a quotation with a continuation")
192+ blockQuote (para "This is a quotation\nwith a continuation")
193193 , testGroup "Div"
194194 [ "Div without id" =:
195195 "<div>Foo bar</div>" =?>
@@ -359,7 +359,7 @@ tests =
359359 T.unlines [ "Paragraph starts here"
360360 , "#anchor and ends here."
361361 ] =?>
362− para ("Paragraph starts here " <> spanWith ("anchor", [], []) mempty <> "and ends here.")
362+ para ("Paragraph starts here\n" <> spanWith ("anchor", [], []) mempty <> "and ends here.")
363363 ]
364364 , testGroup "Footnotes"
365365 [ "Simple footnote" =:
@@ -408,7 +408,7 @@ tests =
408408 ] =?>
409409 para (text "First footnote reference" <>
410410 note (para "First footnote paragraph" <>
411− para "Second footnote paragraph") <>
411+ para "Second footnote\nparagraph") <>
412412 text " and second footnote reference" <>
413413 note (para "Third footnote paragraph" <>
414414 para "Fourth footnote paragraph") <>
@@ -597,7 +597,7 @@ tests =
597597 , " bar"
598598 , " - Baz"
599599 ] =?>
600− bulletList [ para "Foo bar"
600+ bulletList [ para "Foo\nbar"
601601 , para "Baz"
602602 ]
603603 , "One blank line after multiline first item" =:
@@ -607,7 +607,7 @@ tests =
607607 , ""
608608 , " - Baz"
609609 ] =?>
610− bulletList [ para "Foo bar"
610+ bulletList [ para "Foo\nbar"
611611 , para "Baz"
612612 ]
613613 , "Two blank lines after multiline first item" =:
@@ -618,7 +618,7 @@ tests =
618618 , ""
619619 , " - Baz"
620620 ] =?>
621− bulletList [ para "Foo bar" ] <> bulletList [ para "Baz" ]
621+ bulletList [ para "Foo\nbar" ] <> bulletList [ para "Baz" ]
622622 , "No blank line after list continuation" =:
623623 T.unlines
624624 [ " - Foo"
@@ -658,7 +658,7 @@ tests =
658658 [ "First :: second"
659659 , "Foo :: bar"
660660 ] =?>
661− para "First :: second Foo :: bar"
661+ para "First :: second\nFoo :: bar"
662662 , test emacsMuse "Emacs Muse definition list"
663663 (T.unlines
664664 [ "First :: second"
@@ -688,7 +688,7 @@ tests =
688688 , "and its continuation."
689689 , " Second term :: Definition of second term."
690690 ] =?>
691− definitionList [ ("First term", [ para "Definition of first term and its continuation." ])
691+ definitionList [ ("First term", [ para "Definition of first term\nand its continuation." ])
692692 , ("Second term", [ para "Definition of second term." ])
693693 ]
694694 -- Emacs Muse creates two separate lists when indentation of items is different.
@@ -699,7 +699,7 @@ tests =
699699 , "and its continuation."
700700 , " Second term :: Definition of second term."
701701 ] =?>
702− definitionList [ ("First term", [ para "Definition of first term and its continuation." ])
702+ definitionList [ ("First term", [ para "Definition of first term\nand its continuation." ])
703703 , ("Second term", [ para "Definition of second term." ])
704704 ]
705705 , "Two blank lines separate definition lists" =: