Fix menus in html documentation when using Doxygen > 1.8.14 (#2155)

* Update Doxygen version * Fix broken menus when using Doxygen > 1.8.11
meetecho · May 18, 2020 · 49dcd4e · 49dcd4e
1 parent f539089
commit 49dcd4e
Show file tree

Hide file tree

Showing 6 changed files with 1,632 additions and 1,081 deletions.
diff --git a/configure.ac b/configure.ac
@@ -470,10 +470,16 @@ AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" = "xyes"])
 if test "x$enable_docs" = "xyes"; then
 	doxygen_version=$($DOXYGEN --version)
 	AS_VERSION_COMPARE([$doxygen_version], [1.8.11],
-					   [],
-					   [],
-					   [AC_MSG_ERROR([Doxygen $doxygen_version too new: versions higher than 1.8.11 are known to render poorly.])]
-					  )
+                           [],
+                           [],
+                           [
+                            AS_VERSION_COMPARE([$doxygen_version], [1.8.14],
+                                               [AC_MSG_ERROR([Doxygen $doxygen_version not usable: versions between 1.8.12 and 1.8.14 are known to render poorly.])],
+                                               [],
+                                               []
+                                              )
+                           ]
+                          )
 fi
 
 AC_CHECK_PROG([GENGETOPT_CHECK],

diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -9,7 +9,6 @@ all: html-local
 html-local:
 	doxygen janus-doxygen.cfg
 	cp doxy-boot.js html/
-	cp dynsections.js html/
 	mkdir -p html/css
 	cp ../html/css/demo.css html/css/
 	mkdir -p html/js

diff --git a/docs/dynsections.js b/docs/dynsections.js
diff --git a/docs/footer.html b/docs/footer.html
@@ -1,4 +1,4 @@
-<!-- HTML footer for doxygen 1.8.3.1-->
+<!-- HTML footer for doxygen 1.8.18-->
 <!-- start footer part -->
 <!--BEGIN GENERATE_TREEVIEW-->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->

diff --git a/docs/header.html b/docs/header.html
@@ -1,15 +1,18 @@
-<!-- HTML header for doxygen 1.8.3.1-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- HTML header for doxygen 1.8.18-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <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 name="viewport" content="width=device-width, initial-scale=1.0"/>
-<!--BEGIN PROJECT_NAME--><title>$title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
+<meta name="generator" content="Doxygen $doxygenversion"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>$title</title>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
+$treeview
 $search
+$mathjax
+$extrastylesheet
 <link href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/cerulean/bootstrap.min.css" rel="stylesheet">
 <link href="css/demo.css" rel="stylesheet">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>