git.iko.soy/typeable/pandoc
on master help sign in
Added 'try' in front of 'string', where needed, or
73cbae7fiddlosopher
src/Text/Pandoc/Readers/RST.hs+8−6
compare with master
unifiedsplit
@@ -397,8 +397,8 @@ romanNumeral = do
397 return result
397 return result
398
398
399orderedListEnumerator = choice [ many1 digit,
399orderedListEnumerator = choice [ many1 digit,
400− string "#",
400+ count 1 (char '#'),
401− count 1 letter,
401+ count 1 letter,
402 romanNumeral ]
402 romanNumeral ]
403
403
404-- parses ordered list start and returns its length (inc following whitespace)
404-- parses ordered list start and returns its length (inc following whitespace)
@@ -506,7 +506,7 @@ imageKey = try (do
506 (Src (removeLeadingTrailingSpace src) "")))
506 (Src (removeLeadingTrailingSpace src) "")))
507
507
508anonymousKey = try (do
508anonymousKey = try (do
509− choice [string ".. __:", string "__"]
509+ oneOfStrings [".. __:", "__"]
510 skipSpaces
510 skipSpaces
511 option ' ' newline
511 option ' ' newline
512 src <- manyTill anyChar newline
512 src <- manyTill anyChar newline
@@ -515,7 +515,8 @@ anonymousKey = try (do
515
515
516regularKeyQuoted = try (do
516regularKeyQuoted = try (do
517 string ".. _`"
517 string ".. _`"
518− ref <- manyTill inline (string "`:")
518+ ref <- manyTill inline (char '`')
519+ char ':'
519 skipSpaces
520 skipSpaces
520 option ' ' newline
521 option ' ' newline
521 src <- manyTill anyChar newline
522 src <- manyTill anyChar newline
@@ -557,7 +558,7 @@ symbol = do
557-- parses inline code, between codeStart and codeEnd
558-- parses inline code, between codeStart and codeEnd
558code = try (do
559code = try (do
559 string "``"
560 string "``"
560− result <- manyTill anyChar (string "``")
561+ result <- manyTill anyChar (try (string "``"))
561 let result' = removeLeadingTrailingSpace $ joinWithSep " " $ lines result
562 let result' = removeLeadingTrailingSpace $ joinWithSep " " $ lines result
562 return (Code result'))
563 return (Code result'))
563
564
@@ -624,7 +625,8 @@ anonymousLinkEnding = try (do
624
625
625referenceLink = try (do
626referenceLink = try (do
626 char '`'
627 char '`'
627− label <- manyTill inline (string "`_")
628+ label <- manyTill inline (char '`')
629+ char '_'
628 src <- option (Ref []) anonymousLinkEnding
630 src <- option (Ref []) anonymousLinkEnding
629 return (Link (normalizeSpaces label) src))
631 return (Link (normalizeSpaces label) src))
630
632