5 files changed, 33 insertions, 8 deletions
diff --git a/templates/html/htmlbase.tpl b/templates/html/htmlbase.tpl
index 8343af9..39bfa8a 100644
--- a/templates/html/htmlbase.tpl
+++ b/templates/html/htmlbase.tpl
@@ -43,14 +43,37 @@
   {% endif %}
 {% endif %}
 {% if config.USE_MATHJAX %}
+{% if config.MATHJAX_VERSION=="MathJax_3" %}
+<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+<script type="text/javascript">
+window.MathJax = {
+  options: {
+    ignoreHtmlClass: 'tex2jax_ignore',
+    processHtmlClass: 'tex2jax_process'
+  },
+  tex: {
+{% if doxygen.mathJaxMacros %}
+    macros: { {{ doxygen.mathJaxMacros|raw }} },
+{% endif %}
+    packages: ['base','configmacros'{% if doxygen.mathJaxMacros %},'newcommand'{% endif %}{% for ext in config.MATHJAX_EXTENSIONS %},'{{ ext }}'{% endfor %}]
+  }
+};
+{{ doxygen.mathJaxCodeFile }}
+</script>
+<script type="text/javascript" id="MathJax-script" async="async" src="{{ config.MATHJAX_RELPATH }}{% if config.MATHJAX_RELPATH|relative %}{{ page.relPath }}{% endif %}es5/tex-{{ config.MATHJAX_FORMAT|lower }}.js"></script>
+{% else %}{# MathJax_2 #}
 <script type="text/x-mathjax-config">
-  MathJax.Hub.Config({
-    extensions: ["tex2jax.js"{% for ext in config.MATHJAX_EXTENSIONS %}, "{{ ext }}"{% endfor %}],
-    jax: ["input/TeX","output/{{ config.MATHJAX_FORMAT|default:'HTML-CSS' }}"],
+MathJax.Hub.Config({
+  extensions: ["tex2jax.js"{% for ext in config.MATHJAX_EXTENSIONS %}, "{{ ext }}.js"{% endfor %}],
+  jax: ["input/TeX","output/{{ config.MATHJAX_FORMAT|default:'HTML-CSS' }}"],
+{% if doxygen.mathJaxMacros %}
+  TeX: { Macros: { {{ doxygen.mathJaxMacros|raw }} } }
+{% endif %}
 });
 {{ doxygen.mathJaxCodeFile }}
 </script>
-<script type="text/javascript" src="{{ config.MATHJAX_RELPATH }}{% if config.MATHJAX_RELPATH|relative %}{{ page.relPath }}{% endif %}MathJax.js"></script>
+<script type="text/javascript" async="async" src="{{ config.MATHJAX_RELPATH }}{% if config.MATHJAX_RELPATH|relative %}{{ page.relPath }}{% endif %}MathJax.js"></script>
+{% endif %}{# MathJax_3 #}
 {% endif %}{# MathJax #}
 <link href="{{ page.relPath }}{{ config.HTML_STYLESHEET|default:'doxygen.css' }}" rel="stylesheet" type="text/css" />
 {% if config.HTML_EXTRA_STYLESHEET %}
diff --git a/templates/html/htmljsmenudata.tpl b/templates/html/htmljsmenudata.tpl
index e795918..2d0a53e 100644
--- a/templates/html/htmljsmenudata.tpl
+++ b/templates/html/htmljsmenudata.tpl
@@ -46,7 +46,7 @@ var menudata={children:[
 ,{text:"{{ tr.classes }}",url:"annotated{{ config.HTML_FILE_EXTENSION }}",children:[
  {text:"{{ tr.classList }}",url:"annotated{{ config.HTML_FILE_EXTENSION }}"}
 ,{text:"{{ tr.classIndex }}",url:"classes{{ config.HTML_FILE_EXTENSION }}"}
-{% if classHierarchy.tree %}
+{% if classHierarchy.tree and classHierarchy.maxDepth>1 %}
 ,{text:"{{ tr.classHierarchy }}",url:"hierarchy{{ config.HTML_FILE_EXTENSION }}"}
 {% endif %}
 {% if classMembersIndex.all %}
diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index 0fbe458..f96de7e 100644
--- a/templates/html/htmllayout.tpl
+++ b/templates/html/htmllayout.tpl
@@ -30,9 +30,11 @@
 {% resource 'nav_f.lum' %}
 {% resource 'nav_g.png' %}
 {% resource 'nav_h.lum' %}
+{% if config.GENERATE_TREEVIEW %}
 {% resource 'navtree.css' %}
 {% resource 'navtree.js' %}
 {% resource 'resize.js' %}
+{% endif %}
 {% resource 'menu.js' %}
 {% resource 'doc.luma' %}
 {% resource 'folderopen.luma' %}
@@ -221,7 +223,7 @@
   {% endif %}
 
   {# write the class inheritance hierarchy #}
-  {% if classHierarchy.tree %}
+  {% if classHierarchy.tree and classHierarchy.maxDepth>1 %}
     {% with page=classHierarchy %}
       {% create classHierarchy.fileName|append:config.HTML_FILE_EXTENSION from 'htmlhierarchy.tpl' %}
       {% if config.HAVE_DOT and config.GRAPHICAL_HIERARCHY %}
diff --git a/templates/html/htmlpage.tpl b/templates/html/htmlpage.tpl
index 449f601..74396e7 100644
--- a/templates/html/htmlpage.tpl
+++ b/templates/html/htmlpage.tpl
@@ -33,7 +33,7 @@
   <ul>
     <li><a href="{{ page.relPath }}annotated{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classList }}</span></a></li>
     <li><a href="{{ page.relPath }}classes{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classIndex }}</span></a></li>
-    {% if classHierarchy.tree %}
+    {% if classHierarchy.tree and classHierarchy.maxDepth>1 %}
     <li><a href="{{ page.relPath }}hierarchy{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classHierarchy }} </span></a></li>
     {% endif %}
     {% if classMembersIndex.all %}
diff --git a/templates/html/htmltabs.tpl b/templates/html/htmltabs.tpl
index b8632cb..7ade5f1 100644
--- a/templates/html/htmltabs.tpl
+++ b/templates/html/htmltabs.tpl
@@ -81,7 +81,7 @@
   {% if page.highlight=='classes' %}
     <li{% if page.subhighlight=='classlist' %} class="current"{% endif %}><a href="{{ page.relPath }}annotated{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classList|nowrap }}</span></a></li>
     <li{% if page.subhighlight=='classindex' %} class="current"{% endif %}><a href="{{ page.relPath }}classes{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classIndex|nowrap }}</span></a></li>
-    {% if classHierarchy.tree %}
+    {% if classHierarchy.tree and classHierarchy.maxDepth>1 %}
     <li{% if page.subhighlight=='classhierarchy' %} class="current"{% endif %}><a href="{{ page.relPath }}hierarchy{{ config.HTML_FILE_EXTENSION }}"><span>{{ tr.classHierarchy|nowrap }}</span></a></li>
     {% endif %}
     {% if classMembersIndex.all %}