From: Vladimír Vondruš <mosra@centrum.cz>
Date: Tue, 16 Jan 2018 18:23:59 +0000 (+0100)
Subject: doxygen: remove M_SHOW_DOXYGEN_VERSION setting.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=8821d51cabdc6bba25d7c6619104647e6420dd3b;p=blog.git

doxygen: remove M_SHOW_DOXYGEN_VERSION setting.

Was used only for testing, can be supplemented by modifying
M_PAGE_FINE_PRINT.
---

diff --git a/doc/doxygen.rst b/doc/doxygen.rst
index 2deb4ba6..5aaf3261 100644
--- a/doc/doxygen.rst
+++ b/doc/doxygen.rst
@@ -262,9 +262,6 @@ Variable                            Description
 :ini:`M_EXPAND_INNER_TYPES`         Whether to expand inner types (e.g. a class
                                     inside a class) in the symbol tree. If not
                                     set, ``NO`` is used.
-:ini:`M_SHOW_DOXYGEN_VERSION`       Show Doxygen version in the footer. If not
-                                    set, ``YES`` is used; useful to disable for
-                                    output verification.
 =================================== =======================================
 
 Note that namespace, directory and page lists are always fully expanded as
diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index 2c735285..ba9fec2c 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -1774,8 +1774,7 @@ def parse_doxyfile(state: State, doxyfile, config = None):
         'M_FILE_TREE_EXPAND_LEVELS': ['1'],
         'M_EXPAND_INNER_TYPES': ['NO'],
         'M_THEME_COLOR': ['#22272e'],
-        'M_PAGE_FINE_PRINT': ['[default]'],
-        'M_SHOW_DOXYGEN_VERSION': ['YES']
+        'M_PAGE_FINE_PRINT': ['[default]']
     }
 
     def parse_value(var):
@@ -1860,8 +1859,7 @@ def parse_doxyfile(state: State, doxyfile, config = None):
         if i in config: state.doxyfile[i] = int(' '.join(config[i]))
 
     # Boolean values that we want
-    for i in ['M_EXPAND_INNER_TYPES',
-              'M_SHOW_DOXYGEN_VERSION']:
+    for i in ['M_EXPAND_INNER_TYPES']:
         if i in config: state.doxyfile[i] = ' '.join(config[i]) == 'YES'
 
     # List values that we want. Drop empty lines.
diff --git a/doxygen/templates/base.html b/doxygen/templates/base.html
index ccb62b01..6715bccd 100644
--- a/doxygen/templates/base.html
+++ b/doxygen/templates/base.html
@@ -54,7 +54,7 @@
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
         {% if M_PAGE_FINE_PRINT == '[default]' %}
-        <p>{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created by <a href="http://doxygen.org/">Doxygen</a>{% if M_SHOW_DOXYGEN_VERSION %} {{ DOXYGEN_VERSION }}{% endif %} and <a href="http://mcss.mosra.cz/">m.css</a>.</p>
+        <p>{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created by <a href="http://doxygen.org/">Doxygen</a> {{ DOXYGEN_VERSION }} and <a href="http://mcss.mosra.cz/">m.css</a>.</p>
         {% else %}
         {{ M_PAGE_FINE_PRINT|replace('{doxygen_version}', DOXYGEN_VERSION) }}
         {% endif %}
diff --git a/doxygen/test/test_doxyfile.py b/doxygen/test/test_doxyfile.py
index 24234373..343309cb 100644
--- a/doxygen/test/test_doxyfile.py
+++ b/doxygen/test/test_doxyfile.py
@@ -39,7 +39,6 @@ class Doxyfile(unittest.TestCase):
             'M_FILE_TREE_EXPAND_LEVELS': 1,
             'M_PAGE_FINE_PRINT': 'this is "quotes"',
             'M_PAGE_HEADER': 'this is "quotes" \'apostrophes\'',
-            'M_SHOW_DOXYGEN_VERSION': True,
             'M_THEME_COLOR': '#22272e',
             'OUTPUT_DIRECTORY': '',
             'PROJECT_BRIEF': 'is cool',