git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: fix parsing of trailing whitespace
248f607Alexander Krotov
src/Text/Pandoc/Readers/Muse.hs+1−8
compare with master
unifiedsplit
@@ -592,7 +592,7 @@ inlineList = [ whitespace
592 ]
592 ]
593
593
594inline :: PandocMonad m => MuseParser m (F Inlines)
594inline :: PandocMonad m => MuseParser m (F Inlines)
595−inline = choice [endline, linebreak] <|> choice inlineList <?> "inline"
595+inline = endline <|> choice inlineList <?> "inline"
596
596
597endline :: PandocMonad m => MuseParser m (F Inlines)
597endline :: PandocMonad m => MuseParser m (F Inlines)
598endline = try $ do
598endline = try $ do
@@ -626,13 +626,6 @@ footnote = try $ do
626 let contents' = runF contents st { stateNotes' = M.empty }
626 let contents' = runF contents st { stateNotes' = M.empty }
627 return $ B.note contents'
627 return $ B.note contents'
628
628
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−
636whitespace :: PandocMonad m => MuseParser m (F Inlines)
629whitespace :: PandocMonad m => MuseParser m (F Inlines)
637whitespace = try $ do
630whitespace = try $ do
638 skipMany1 spaceChar
631 skipMany1 spaceChar
test/Tests/Readers/Muse.hs+6
@@ -119,6 +119,12 @@ tests =
119
119
120 , "Linebreak" =: "Line <br> break" =?> para ("Line" <> linebreak <> "break")
120 , "Linebreak" =: "Line <br> break" =?> para ("Line" <> linebreak <> "break")
121
121
122+ , "Trailing whitespace inside paragraph" =:
123+ T.unlines [ "First line " -- trailing whitespace here
124+ , "second line"
125+ ]
126+ =?> para "First line\nsecond line"
127+
122 , "Non-breaking space" =: "Foo~~bar" =?> para "Foo\160bar"
128 , "Non-breaking space" =: "Foo~~bar" =?> para "Foo\160bar"
123 , "Single ~" =: "Foo~bar" =?> para "Foo~bar"
129 , "Single ~" =: "Foo~bar" =?> para "Foo~bar"
124
130