git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #4914 from danse/4912-2
9161dc4John MacFarlane
src/Text/Pandoc/Readers/RST.hs+1−1
compare with master
unifiedsplit
@@ -1315,7 +1315,6 @@ table = gridTable False <|> simpleTable False <|>
1315inline :: PandocMonad m => RSTParser m Inlines
1315inline :: PandocMonad m => RSTParser m Inlines
1316inline = choice [ note -- can start with whitespace, so try before ws
1316inline = choice [ note -- can start with whitespace, so try before ws
1317 , link
1317 , link
1318− , endline
1319 , strong
1318 , strong
1320 , emph
1319 , emph
1321 , code
1320 , code
@@ -1328,6 +1327,7 @@ inline = choice [ note -- can start with whitespace, so try before ws
1328inlineContent :: PandocMonad m => RSTParser m Inlines
1327inlineContent :: PandocMonad m => RSTParser m Inlines
1329inlineContent = choice [ whitespace
1328inlineContent = choice [ whitespace
1330 , str
1329 , str
1330+ , endline
1331 , smart
1331 , smart
1332 , hyphens
1332 , hyphens
1333 , escapedChar
1333 , escapedChar
test/Tests/Readers/RST.hs+3
@@ -198,5 +198,8 @@ tests = [ "line block with blank line" =:
198 , "bare URI parsing disabled inside emphasis (#4561)" =:
198 , "bare URI parsing disabled inside emphasis (#4561)" =:
199 "*http://location*" =?>
199 "*http://location*" =?>
200 para (emph (text "http://location"))
200 para (emph (text "http://location"))
201+ , "include newlines" =:
202+ "**before\nafter**" =?>
203+ para (strong (text "before\nafter"))
201 ]
204 ]
202 ]
205 ]