doxygen: fix M_EXPAND_INNER_TYPES option.

diff --git a/doxygen/templates/annotated.html b/doxygen/templates/annotated.html
index 6b2b9bd8ce5c8cce0ad65b1f66276dbd1322439f..f6b23278becd2c9450fb507cb6a749f8304fb2a3 100644 (file)
--- a/doxygen/templates/annotated.html
+++ b/doxygen/templates/annotated.html
@@ -6,7 +6,7 @@
         <ul class="m-dox">
           {% for i in index.symbols recursive %}
           {% if i.children %}
-          <li class="m-dox-collapsible{% if loop.depth > M_CLASS_TREE_EXPAND_LEVELS or (i.kind != 'namespace' and M_EXPAND_INNER_TYPES) %} collapsed{% endif %}">
+          <li class="m-dox-collapsible{% if loop.depth > M_CLASS_TREE_EXPAND_LEVELS or (i.kind != 'namespace' and not M_EXPAND_INNER_TYPES) %} collapsed{% endif %}">
             <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a> <span class="m-dox">{{ i.brief }}</span>
             <ul class="m-dox">
 {{ loop(i.children)|indent(4, true) }}

diff --git a/doxygen/test/compound_listing/Doxyfile b/doxygen/test/compound_listing/Doxyfile
index b772c0bb96253d23c13613a5f012e9877e90b28b..f2f2ab4883c6ef435a5be5eed81937cf29454a49 100644 (file)
--- a/doxygen/test/compound_listing/Doxyfile
+++ b/doxygen/test/compound_listing/Doxyfile
@@ -8,4 +8,6 @@ GENERATE_LATEX          = NO
 GENERATE_XML            = YES
 
 M_FILE_TREE_EXPAND_LEVELS = 2
+M_CLASS_TREE_EXPAND_LEVELS = 5
+M_EXPAND_INNER_TYPES    = YES
 M_SHOW_DOXYGEN_VERSION  = NO

diff --git a/doxygen/test/compound_listing/annotated.html b/doxygen/test/compound_listing/annotated.html
index d03a150fbf34d540119a8e08d98f1316b16e8941..3884cb91629edfaad6a481600d235a45defe2c11 100644 (file)
--- a/doxygen/test/compound_listing/annotated.html
+++ b/doxygen/test/compound_listing/annotated.html
@@ -40,13 +40,13 @@
           <li class="m-dox-collapsible">
             <a href="#" onclick="return toggle(this)">namespace</a> <a href="namespaceRoot.html" class="m-dox">Root</a> <span class="m-dox">Root namespace.</span>
             <ul class="m-dox">
-              <li class="m-dox-collapsible collapsed">
+              <li class="m-dox-collapsible">
                 <a href="#" onclick="return toggle(this)">namespace</a> <a href="namespaceRoot_1_1Directory.html" class="m-dox">Directory</a> <span class="m-dox">Namespace in directory.</span>
                 <ul class="m-dox">
-                  <li class="m-dox-collapsible collapsed">
+                  <li class="m-dox-collapsible">
                     <a href="#" onclick="return toggle(this)">namespace</a> <a href="namespaceRoot_1_1Directory_1_1Sub.html" class="m-dox">Sub</a> <span class="m-dox">Namespace in subdirectory.</span>
                     <ul class="m-dox">
-                      <li class="m-dox-collapsible collapsed">
+                      <li class="m-dox-collapsible">
                         <a href="#" onclick="return toggle(this)">class</a> <a href="classRoot_1_1Directory_1_1Sub_1_1Class.html" class="m-dox">Class</a> <span class="m-dox">A class.</span>
                         <ul class="m-dox">
                           <li>union <a href="unionRoot_1_1Directory_1_1Sub_1_1Class_1_1Bar.html" class="m-dox">Bar</a> <span class="m-dox">A protected subclass.</span></li>