aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2011-07-23 13:30:59 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2011-07-23 13:30:59 -0700
commit310697ce7eb369b31d76f47fc3001003f00c2baa (patch)
treea057a7231dcd806d5d125b1740a16629e1bc9d36
parent81c403d2d151eb6e5fdeaa840cf376860d151c9f (diff)
downloadpandoc-310697ce7eb369b31d76f47fc3001003f00c2baa.tar.gz
Changed `--mathjax` to link to mathjax CDN by default.
`--mathjax` now takes an optional URL argument. If it is not provided, pandoc links directly to the (secure) mathjax CDN. This is what they now recommend. Thanks to dsanson.
-rw-r--r--README4
-rw-r--r--src/pandoc.hs8
2 files changed, 9 insertions, 3 deletions
diff --git a/README b/README
index c773693f6..412757264 100644
--- a/README
+++ b/README
@@ -238,9 +238,11 @@ Options
no link to the jsMath load script will be inserted; it is then
up to the author to provide such a link in the HTML template.
-`--mathjax=`*URL*
+`--mathjax`[=*URL*]
: Use [MathJax] to display embedded TeX math in HTML output.
The *URL* should point to the `MathJax.js` load script.
+ If a *URL* is not provided, a link to the MathJax CDN will
+ be inserted.
`--gladtex`
: Enclose TeX math in `<eq>` tags in HTML output. These can then
diff --git a/src/pandoc.hs b/src/pandoc.hs
index 22afd77ea..a2e22065d 100644
--- a/src/pandoc.hs
+++ b/src/pandoc.hs
@@ -288,8 +288,12 @@ options =
"" -- "Use jsMath for HTML math"
, Option "" ["mathjax"]
- (ReqArg
- (\arg opt -> return opt { optHTMLMathMethod = MathJax arg})
+ (OptArg
+ (\arg opt -> do
+ let url' = case arg of
+ Just u -> u
+ Nothing -> "https://d3eoax9i5htok0.cloudfront.net/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
+ return opt { optHTMLMathMethod = MathJax url'})
"URL")
"" -- "Use MathJax for HTML math"