aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2012-08-10 21:51:54 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2012-08-10 21:52:18 -0700
commit417cde38af7a77e79f12c9f78b678aec50701af2 (patch)
tree12c978736d3ee6bbba7119958725e6bc6000d155
parent88804c89bb8c55e4e4b0742e0cec260270150015 (diff)
downloadpandoc-417cde38af7a77e79f12c9f78b678aec50701af2.tar.gz
Changed Ext_tex_math to Ext_tex_math_dollars.
-rw-r--r--README2
-rw-r--r--src/Text/Pandoc/Options.hs4
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs4
3 files changed, 5 insertions, 5 deletions
diff --git a/README b/README
index ccd8f55dd..e988b7b6f 100644
--- a/README
+++ b/README
@@ -1752,7 +1752,7 @@ Attributes can be attached to verbatim text, just as with
Math
----
-**Extension: `tex_math`**
+**Extension: `tex_math_dollars`**
Anything between two `$` characters will be treated as TeX math. The
opening `$` must have a character immediately to its right, while the
diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index 1e4ce98ba..9c6d55f25 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -57,7 +57,7 @@ data Extension = Ext_footnotes
| Ext_pipe_tables
| Ext_citations
| Ext_raw_tex
- | Ext_tex_math
+ | Ext_tex_math_dollars
| Ext_latex_macros
| Ext_delimited_code_blocks
| Ext_inline_code_attributes
@@ -93,7 +93,7 @@ pandocExtensions = Set.fromList
, Ext_pipe_tables
, Ext_citations
, Ext_raw_tex
- , Ext_tex_math
+ , Ext_tex_math_dollars
, Ext_latex_macros
, Ext_delimited_code_blocks
, Ext_inline_code_attributes
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 3e95ebbdf..1cabf70b5 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -1184,13 +1184,13 @@ math = (return . B.displayMath <$> (mathDisplay >>= applyMacros'))
mathDisplay :: Parser [Char] ParserState String
mathDisplay = try $ do
- guardEnabled Ext_tex_math
+ guardEnabled Ext_tex_math_dollars
string "$$"
many1Till (noneOf "\n" <|> (newline >>~ notFollowedBy' blankline)) (try $ string "$$")
mathInline :: Parser [Char] ParserState String
mathInline = try $ do
- guardEnabled Ext_tex_math
+ guardEnabled Ext_tex_math_dollars
char '$'
notFollowedBy space
words' <- sepBy1 mathWord (many1 (spaceChar <|> (newline >>~ notFollowedBy' blankline)))