git.iko.soy/typeable/pandoc
on master help sign in
Changed definition of 'enclosed' in Text.Pandoc.Shared so that
f04df62fiddlosopher
src/Text/Pandoc/Readers/LaTeX.hs+1−1
@@ -551,7 +551,7 @@ singleQuoteEnd = try $ char '\'' >> notFollowedBy alphaNum
551
551
552doubleQuoteStart = string "``"
552doubleQuoteStart = string "``"
553
553
554−doubleQuoteEnd = string "''"
554+doubleQuoteEnd = try $ string "''"
555
555
556ellipses = try $ string "\\ldots" >> optional (try (string "{}")) >>
556ellipses = try $ string "\\ldots" >> optional (try (string "{}")) >>
557 return Ellipses
557 return Ellipses
src/Text/Pandoc/Readers/Markdown.hs+3−3
@@ -684,11 +684,11 @@ emph = ((enclosed (char '*') (char '*') inline) <|>
684 (enclosed (char '_') (char '_') inline)) >>=
684 (enclosed (char '_') (char '_') inline)) >>=
685 return . Emph . normalizeSpaces
685 return . Emph . normalizeSpaces
686
686
687−strong = ((enclosed (string "**") (string "**") inline) <|>
687+strong = ((enclosed (string "**") (try $ string "**") inline) <|>
688− (enclosed (string "__") (string "__") inline)) >>=
688+ (enclosed (string "__") (try $ string "__") inline)) >>=
689 return . Strong . normalizeSpaces
689 return . Strong . normalizeSpaces
690
690
691−strikeout = failIfStrict >> enclosed (string "~~") (string "~~") inline >>=
691+strikeout = failIfStrict >> enclosed (string "~~") (try $ string "~~") inline >>=
692 return . Strikeout . normalizeSpaces
692 return . Strikeout . normalizeSpaces
693
693
694superscript = failIfStrict >> enclosed (char '^') (char '^')
694superscript = failIfStrict >> enclosed (char '^') (char '^')
src/Text/Pandoc/Readers/RST.hs+1−1
@@ -514,7 +514,7 @@ code = try $ do
514emph = enclosed (char '*') (char '*') inline >>=
514emph = enclosed (char '*') (char '*') inline >>=
515 return . Emph . normalizeSpaces
515 return . Emph . normalizeSpaces
516
516
517−strong = enclosed (string "**") (string "**") inline >>=
517+strong = enclosed (string "**") (try $ string "**") inline >>=
518 return . Strong . normalizeSpaces
518 return . Strong . normalizeSpaces
519
519
520interpreted role = try $ do
520interpreted role = try $ do
src/Text/Pandoc/Shared.hs+2−2
@@ -287,8 +287,8 @@ enclosed :: GenParser Char st t -- ^ start parser
287 -> GenParser Char st a -- ^ content parser (to be used repeatedly)
287 -> GenParser Char st a -- ^ content parser (to be used repeatedly)
288 -> GenParser Char st [a]
288 -> GenParser Char st [a]
289enclosed start end parser = try $
289enclosed start end parser = try $
290− start >> notFollowedBy space >> many1Till parser (try end)
290+ start >> notFollowedBy space >> many1Till parser end
291−
291+
292-- | Parse string, case insensitive.
292-- | Parse string, case insensitive.
293stringAnyCase :: [Char] -> CharParser st String
293stringAnyCase :: [Char] -> CharParser st String
294stringAnyCase [] = string ""
294stringAnyCase [] = string ""