aboutsummaryrefslogtreecommitdiff
path: root/Text
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-07-15 20:41:27 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-07-15 20:41:27 +0000
commit7c35c0bc253c3ca15c29adf3309f08a42b99127c (patch)
tree7e991fb37e7866a48533aa23892287a61949596a /Text
parent235e41f2464afbee31463f0edcd3a6ca579b7cfb (diff)
downloadpandoc-7c35c0bc253c3ca15c29adf3309f08a42b99127c.tar.gz
Fixed bug in Markdown parser: regular $s triggering math mode.
For example: "shoes ($20) and socks ($5)." The fix consists in two new restrictions: + the $ that ends a math span may not be directly followed by a digit. + no blank lines may be included within a math span. Thanks to Joseph Reagle for noticing the bug. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1326 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'Text')
-rw-r--r--Text/Pandoc/Readers/Markdown.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Text/Pandoc/Readers/Markdown.hs b/Text/Pandoc/Readers/Markdown.hs
index f702a6e33..db9e214b0 100644
--- a/Text/Pandoc/Readers/Markdown.hs
+++ b/Text/Pandoc/Readers/Markdown.hs
@@ -873,8 +873,9 @@ math = try $ do
failIfStrict
char '$'
notFollowedBy space
- words' <- sepBy1 mathWord (many1 space)
+ words' <- sepBy1 mathWord (many1 (spaceChar <|> (newline >>~ notFollowedBy' blankline)))
char '$'
+ notFollowedBy digit
return $ Math $ joinWithSep " " words'
emph :: GenParser Char ParserState Inline