summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2014-06-11 23:03:00 +0900
committershimizukawa <shimizukawa@gmail.com>2014-06-11 23:03:00 +0900
commitf8fdce88db304862e1c33f04ad9e8cf61b0981ef (patch)
tree523cda8054f0827770ce69cd83159deac9a2307b
parenta2cdbd0003564a5e05556a03e63984e6139beeb0 (diff)
downloadsphinx-f8fdce88db304862e1c33f04ad9e8cf61b0981ef.tar.gz
* fix again for mathjax secure url. refs #1459.
-rw-r--r--CHANGES2
-rw-r--r--sphinx/ext/mathjax.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 648dcc30..5a39388e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -148,7 +148,7 @@ Bugs fixed
* #1466,PR#241: Fix failure of the cpp domain parser to parse C+11
"variadic templates" declarations. Thanks to Victor Zverovich.
* #1459,PR#244: Fix default mathjax js path point to `http://` that cause
- mixed-content error on HTTPS server. Thanks to sbrandtb.
+ mixed-content error on HTTPS server. Thanks to sbrandtb and robo9k.
Documentation
-------------
diff --git a/sphinx/ext/mathjax.py b/sphinx/ext/mathjax.py
index f7914b2f..472ec55f 100644
--- a/sphinx/ext/mathjax.py
+++ b/sphinx/ext/mathjax.py
@@ -60,8 +60,10 @@ def builder_inited(app):
def setup(app):
mathbase_setup(app, (html_visit_math, None), (html_visit_displaymath, None))
+ # more information for mathjax secure url is here:
+ # http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn
app.add_config_value('mathjax_path',
- 'https://cdn.mathjax.org/mathjax/latest/MathJax.js?'
+ 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?'
'config=TeX-AMS-MML_HTMLorMML', False)
app.add_config_value('mathjax_inline', [r'\(', r'\)'], 'html')
app.add_config_value('mathjax_display', [r'\[', r'\]'], 'html')