4229cf2 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

MD Reader: Smart `'` after inline math

4229cf2Nikolay Yakimov12 years ago

src/Text/Pandoc/Parsing.hs+6−1

@@ -161,7 +161,8 @@ module Text.Pandoc.Parsing ( anyLine,

161 setSourceColumn,

162 setSourceLine,

163 newPos,

164− addWarning

164+ addWarning,

165+ (<+?>)

165 )

166 )

166where

167where

167

168

@@ -1245,3 +1246,7 @@ addWarning mbpos msg =

1245

1246

1246generalize :: (Monad m) => Parser s st a -> ParserT s st m a

1247generalize :: (Monad m) => Parser s st a -> ParserT s st m a

1247generalize m = mkPT (\ s -> (return $ (return . runIdentity) <$> runIdentity (runParsecT m s)))

1248generalize m = mkPT (\ s -> (return $ (return . runIdentity) <$> runIdentity (runParsecT m s)))

1249+

1250+infixr 5 <+?>

1251+(<+?>) :: (Monoid a, Monad m) => ParserT s st m a -> ParserT s st m a -> ParserT s st m a

1252+a <+?> b = a >>= flip fmap (try b <|> return mempty) . (<>)

src/Text/Pandoc/Readers/Markdown.hs+2−1

@@ -1487,7 +1487,8 @@ code = try $ do

1487

1488math :: MarkdownParser Inlines

1489math = (B.displayMath <$> (mathDisplay >>= applyMacros'))

1490− <|> (B.math <$> (mathInline >>= applyMacros'))

1490+ <|> ((B.math <$> (mathInline >>= applyMacros')) <+?>

1491+ ((getOption readerSmart >>= guard) *> apostrophe <* notFollowedBy space))

1491

1492

1492-- Parses material enclosed in *s, **s, _s, or __s.

1493-- Parses material enclosed in *s, **s, _s, or __s.

1493-- Designed to avoid backtracking.

1494-- Designed to avoid backtracking.