From 244cb40ef034a15b381151d2fc67f957efca34d8 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sat, 15 May 2021 18:48:27 +0200
Subject: Extra settings for MathJax V3

For support of the `\eqref` command (used in CGAL) in MathJax V3 a small change has to be made (for a rationale see the discussion on https://groups.google.com/g/mathjax-users/c/oS0yQLb5BMk)
---
 src/htmlgen.cpp             | 7 +++----
 templates/html/header.html  | 2 +-
 templates/html/htmlbase.tpl | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index cde7ef2..94d9056 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/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 11cb054..7882e25 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>
-- 
cgit v0.12


From 7ba8384ec466c47bac353744c6942f5be1dd9ab8 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sun, 23 May 2021 18:50:19 +0200
Subject: issue #8564 input buffer overflow, can't enlarge buffer because
 scanner uses REJECT

When we have a very large "LONGSTRINBLOCK" (e.g. a very large documentation part or an encode executable in e.g. base64 encoding) , there are a lot of lines that have to be read at once, this is not really necessary they can be read sequentially (probably at the cost of some speed)
---
 src/pycode.l    | 2 +-
 src/pyscanner.l | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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})
-- 
cgit v0.12

