diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2017-10-28 19:09:09 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2017-10-28 19:09:09 (GMT) |
| commit | 2a973de8e473eb455ed176f9bd3a4c630b92afd9 (patch) | |
| tree | 615d9f80f82d919ed61013fa3c617f1346c82856 | |
| parent | aee944fe954de993a4273fafef6b5f0c726be7f3 (diff) | |
| parent | 9006394212193f45bfad9edd34f0fa9057803d91 (diff) | |
| download | Doxygen-2a973de8e473eb455ed176f9bd3a4c630b92afd9.zip Doxygen-2a973de8e473eb455ed176f9bd3a4c630b92afd9.tar.gz Doxygen-2a973de8e473eb455ed176f9bd3a4c630b92afd9.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | Doxyfile | 2 | ||||
| -rw-r--r-- | qtools/Doxyfile | 2 | ||||
| -rw-r--r-- | src/config.xml | 2 | ||||
| -rw-r--r-- | src/htmlgen.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -186,7 +186,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES USE_MATHJAX = NO MATHJAX_FORMAT = HTML-CSS -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/ MATHJAX_EXTENSIONS = MATHJAX_CODEFILE = SEARCHENGINE = YES diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 1e4fcf7..af84df1 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -188,7 +188,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES USE_MATHJAX = NO MATHJAX_FORMAT = HTML-CSS -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/ MATHJAX_EXTENSIONS = MATHJAX_CODEFILE = SEARCHENGINE = YES diff --git a/src/config.xml b/src/config.xml index 6cd7997..4d9a048 100644 --- a/src/config.xml +++ b/src/config.xml @@ -2331,7 +2331,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. <value name="NativeMML" desc="(i.e. MathML)"/> <value name="SVG"/> </option> - <option type='string' id='MATHJAX_RELPATH' format='string' defval='http://cdn.mathjax.org/mathjax/latest' depends='USE_MATHJAX'> + <option type='string' id='MATHJAX_RELPATH' format='string' defval='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/' depends='USE_MATHJAX'> <docs> <![CDATA[ When MathJax is enabled you need to specify the location relative to the diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index f80eb43..e576059 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -375,7 +375,7 @@ static QCString substituteHtmlKeywords(const QCString &s, mathJaxJs += "\n"; } mathJaxJs += "</script>"; - mathJaxJs += "<script type=\"text/javascript\" src=\"" + path + "MathJax.js\"></script>\n"; + mathJaxJs += "<script type=\"text/javascript\" async src=\"" + path + "MathJax.js\"></script>\n"; } // first substitute generic keywords |