diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-05-24 10:10:16 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-05-24 10:10:16 (GMT) |
| commit | 8fa6f9c282ee328df22b0ba007a407e2c2751bab (patch) | |
| tree | a987c9c1a7ce14378baa7f37cfa9f0d2c43c332f | |
| parent | 09b4200ed5bb66b58f4c77f439336398253f57ea (diff) | |
| parent | 8bd1b49051ee6c69d1216b952bf6e69e4f2987c1 (diff) | |
| download | Doxygen-8fa6f9c282ee328df22b0ba007a407e2c2751bab.zip Doxygen-8fa6f9c282ee328df22b0ba007a407e2c2751bab.tar.gz Doxygen-8fa6f9c282ee328df22b0ba007a407e2c2751bab.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/htmlgen.cpp | 7 | ||||
| -rw-r--r-- | src/pycode.l | 2 | ||||
| -rw-r--r-- | src/pyscanner.l | 2 | ||||
| -rw-r--r-- | templates/html/header.html | 2 | ||||
| -rw-r--r-- | templates/html/htmlbase.tpl | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index ee9560a..c8c8021 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -449,6 +449,7 @@ static QCString substituteHtmlKeywords(const QCString &str, if (mathJaxVersion == "MathJax_3") { + mathJaxJs += "<script src=\"https://polyfill.io/v3/polyfill.min.js?features=es6\"></script>\n"; mathJaxJs += "<script>\n" " window.MathJax = {\n" " options: {\n" @@ -459,7 +460,8 @@ static QCString substituteHtmlKeywords(const QCString &str, if (!mathJaxExtensions.empty() || !g_latex_macro.isEmpty()) { mathJaxJs+= " tex: {\n" - " packages: ['base'"; + " macros: {},\n" + " packages: ['base','configmacros'"; if (!g_latex_macro.isEmpty()) { mathJaxJs+= ",'newcommand'"; @@ -469,9 +471,6 @@ static QCString substituteHtmlKeywords(const QCString &str, mathJaxJs+= ",'"+QCString(s.c_str())+"'"; } mathJaxJs += "]\n" - " },\n" - " tex: {\n" - " macros: {}\n" " }\n"; } mathJaxJs += " };\n"; diff --git a/src/pycode.l b/src/pycode.l index 6acf333..f24c8c9 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -183,7 +183,7 @@ LONGSTRINGCHAR [^\\"'] ESCAPESEQ ("\\")(.) LONGSTRINGITEM ({LONGSTRINGCHAR}|{ESCAPESEQ}) SMALLQUOTE ("\"\""|"\""|"'"|"''") -LONGSTRINGBLOCK ({LONGSTRINGITEM}+|{SMALLQUOTE}) +LONGSTRINGBLOCK ({LONGSTRINGITEM}|{SMALLQUOTE}) SHORTSTRING ("'"{SHORTSTRINGITEM}*"'"|'"'{SHORTSTRINGITEM}*'"') SHORTSTRINGITEM ({SHORTSTRINGCHAR}|{ESCAPESEQ}) diff --git a/src/pyscanner.l b/src/pyscanner.l index bf2a914..a34dc18 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -180,7 +180,7 @@ LONGSTRINGCHAR [^\\"'] ESCAPESEQ ("\\")(.) LONGSTRINGITEM ({LONGSTRINGCHAR}|{ESCAPESEQ}) SMALLQUOTE ("\"\""|"\""|"'"|"''") -LONGSTRINGBLOCK ({LONGSTRINGITEM}+|{SMALLQUOTE}) +LONGSTRINGBLOCK ({LONGSTRINGITEM}|{SMALLQUOTE}) SHORTSTRING ("'"{SHORTSTRINGITEM}*"'"|'"'{SHORTSTRINGITEM}*'"') SHORTSTRINGITEM ({SHORTSTRINGCHAR}|{ESCAPESEQ}) diff --git a/templates/html/header.html b/templates/html/header.html index 628b61e..8db982e 100644 --- a/templates/html/header.html +++ b/templates/html/header.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> -<meta http-equiv="X-UA-Compatible" content="IE=9"/> +<meta http-equiv="X-UA-Compatible" content="IE=11"/> <meta name="generator" content="Doxygen $doxygenversion"/> <meta name="viewport" content="width=device-width, initial-scale=1"/> <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME--> diff --git a/templates/html/htmlbase.tpl b/templates/html/htmlbase.tpl index 6727da0..8343af9 100644 --- a/templates/html/htmlbase.tpl +++ b/templates/html/htmlbase.tpl @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> -<meta http-equiv="X-UA-Compatible" content="IE=9"/> +<meta http-equiv="X-UA-Compatible" content="IE=11"/> <meta name="generator" content="Doxygen {{ doxygen.version }}"/> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>{% if config.PROJECT_NAME %}{{ config.PROJECT_NAME }}: {% endif %}{{ page.title }}</title> |