doxygen: use native Doxyfile booleans instead of 0/1.

diff --git a/doc/doxygen.rst b/doc/doxygen.rst
index c0b98aa3ce7c9c63be316f1c4361fd93b726d523..1ed4b6c0eb28a754acce0b31280232415f3c9851 100644 (file)
--- a/doc/doxygen.rst
+++ b/doc/doxygen.rst
@@ -248,7 +248,7 @@ Variable                            Description
                                     are shown. If not set, ``1`` is used.
 :ini:`M_EXPAND_INNER_TYPES`         Whether to expand inner types (e.g. a class
                                     inside a class) in the symbol tree. If not
-                                    set, ``0`` is used.
+                                    set, ``NO`` is used.
 =================================== =======================================
 
 Note that namespace, directory and page lists are always fully expanded as

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index 492a9a35d8a97e24d03a6675a100307be3da097c..fc39e9b93d7cb155b33a0d7f12e05b638a9ea3d2 100755 (executable)
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -1542,7 +1542,7 @@ def parse_doxyfile(state: State, doxyfile, config = None):
 
         'M_CLASS_TREE_EXPAND_LEVELS': ['1'],
         'M_FILE_TREE_EXPAND_LEVELS': ['1'],
-        'M_EXPAND_INNER_TYPES': ['0'],
+        'M_EXPAND_INNER_TYPES': ['NO'],
         'M_THEME_COLOR': ['#22272e']
     }
 
@@ -1623,10 +1623,13 @@ def parse_doxyfile(state: State, doxyfile, config = None):
 
     # Int values that we want
     for i in ['M_CLASS_TREE_EXPAND_LEVELS',
-              'M_FILE_TREE_EXPAND_LEVELS',
-              'M_EXPAND_INNER_TYPES']:
+              'M_FILE_TREE_EXPAND_LEVELS']:
         if i in config: state.doxyfile[i] = int(' '.join(config[i]))
 
+    # Boolean values that we want
+    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.
     for i in ['TAGFILES',
               'HTML_EXTRA_STYLESHEET',

diff --git a/doxygen/test/test_doxyfile.py b/doxygen/test/test_doxyfile.py
index 8e1a29b687435e0d96d8927b3eb0e0069cab28db..862f5961d4049685e946631aba13bb00817148a2 100644 (file)
--- a/doxygen/test/test_doxyfile.py
+++ b/doxygen/test/test_doxyfile.py
@@ -11,7 +11,7 @@ class Doxyfile(unittest.TestCase):
             'HTML_EXTRA_STYLESHEET': ['a.css', 'b.css'],
             'HTML_OUTPUT': 'html',
             'M_CLASS_TREE_EXPAND_LEVELS': 1,
-            'M_EXPAND_INNER_TYPES': 0,
+            'M_EXPAND_INNER_TYPES': False,
             'M_FILE_TREE_EXPAND_LEVELS': 1,
             'M_THEME_COLOR': '#22272e',
             'OUTPUT_DIRECTORY': '',