248f607 · typeable/pandoc

git.iko.soy/typeable/pandoc

Muse reader: fix parsing of trailing whitespace

Newline after whitespace now results in softbreak instead of space.

commit248f6076bc1df7f3dd55d7402707233ae08d3cdb authorAlexander Krotov <ilabdsf@gmail.com> dateSun 28 Jan 2018, 02:59 (9 years ago) parent75762ee

2 files changed+7−8

unifiedsplit

src/Text/Pandoc/Readers/Muse.hs+1−8

@@ -592,7 +592,7 @@ inlineList = [ whitespace

592592 ]

593593

594594inline :: PandocMonad m => MuseParser m (F Inlines)

595−inline = choice [endline, linebreak] <|> choice inlineList <?> "inline"

595+inline = endline <|> choice inlineList <?> "inline"

596596

597597endline :: PandocMonad m => MuseParser m (F Inlines)

598598endline = try $ do

@@ -626,13 +626,6 @@ footnote = try $ do

626626 let contents' = runF contents st { stateNotes' = M.empty }

627627 return $ B.note contents'

628628

629−linebreak :: PandocMonad m => MuseParser m (F Inlines)

630−linebreak = try $ do

631− skipMany spaceChar

632− newline

633− notFollowedBy newline

634− return $ return B.space

635−

636629whitespace :: PandocMonad m => MuseParser m (F Inlines)

637630whitespace = try $ do

638631 skipMany1 spaceChar

test/Tests/Readers/Muse.hs+6

@@ -119,6 +119,12 @@ tests =

119119

120120 , "Linebreak" =: "Line <br> break" =?> para ("Line" <> linebreak <> "break")

121121

122+ , "Trailing whitespace inside paragraph" =:

123+ T.unlines [ "First line " -- trailing whitespace here

124+ , "second line"

125+ ]

126+ =?> para "First line\nsecond line"

127+

122128 , "Non-breaking space" =: "Foo~~bar" =?> para "Foo\160bar"

123129 , "Single ~" =: "Foo~bar" =?> para "Foo~bar"

124130