doxygen: display the deprecation label next to the name, not after brief.

diff --git a/doxygen/templates/annotated.html b/doxygen/templates/annotated.html
index f2b83fe525bc2d0ee4fc1f6f91190a8117caa919..c1e156ecbf0a9868e2dd70b325b6c60ee1c0d3ea 100644 (file)
--- a/doxygen/templates/annotated.html
+++ b/doxygen/templates/annotated.html
@@ -7,15 +7,13 @@
           {% 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 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>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}
-
-            {# the above is here to preserve the newline #}
+            <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span>
             <ul class="m-dox">
 {{ loop(i.children)|indent(4, true) }}
             </ul>
           </li>
           {% else %}
-          <li>{{ i.kind }} <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a> <span class="m-dox">{{ i.brief }}</span>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}</li>
+          <li>{{ i.kind }} <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span></li>
           {% endif %}
           {% endfor %}
         </ul>

diff --git a/doxygen/templates/files.html b/doxygen/templates/files.html
index 602cc8c6a4936fbc3d6f2d198ccd1ea82b99c6da..09efe44ad60b0ebcb96287335de4a47166605186 100644 (file)
--- a/doxygen/templates/files.html
+++ b/doxygen/templates/files.html
@@ -7,15 +7,13 @@
           {% for i in index.files recursive %}
           {% if i.children %}
           <li class="m-dox-collapsible{% if loop.depth > M_FILE_TREE_EXPAND_LEVELS %} 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>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}
-
-            {# the above is here to preserve the newline #}
+            <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span>
             <ul class="m-dox">
 {{ loop(i.children)|indent(4, true) }}
             </ul>
           </li>
           {% else %}
-          <li>{{ i.kind }} <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a> <span class="m-dox">{{ i.brief }}</span>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}</li>
+          <li>{{ i.kind }} <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span></li>
           {% endif %}
           {% endfor %}
         </ul>

diff --git a/doxygen/templates/modules.html b/doxygen/templates/modules.html
index c43d0a5663e4f86ec9d788ab4e27f07cdb9a697f..68ab0266d17d6197bcf0fbcd1f9bae6f3542fb0d 100644 (file)
--- a/doxygen/templates/modules.html
+++ b/doxygen/templates/modules.html
@@ -7,15 +7,13 @@
           {% for i in index.modules recursive %}
           {% if i.has_nestable_children %}
           <li class="m-dox-collapsible">
-            <a href="#" onclick="return toggle(this)">module</a> <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a> <span class="m-dox">{{ i.brief }}</span>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}
-
-            {# the above is here to preserve the newline #}
+            <a href="#" onclick="return toggle(this)">module</a> <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span>
             <ul class="m-dox">
 {{ loop(i.children)|indent(4, true) }}
             </ul>
           </li>
           {% else %}
-          <li>module <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a> <span class="m-dox">{{ i.brief }}</span>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}</li>
+          <li>module <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span></li>
           {% endif %}
           {% endfor %}
         </ul>

diff --git a/doxygen/templates/namespaces.html b/doxygen/templates/namespaces.html
index 70b2bc8ffdace331cc5b9105bc217d576a78c626..63794bc1a1e3912e51df76b95199dad13c57985f 100644 (file)
--- a/doxygen/templates/namespaces.html
+++ b/doxygen/templates/namespaces.html
@@ -7,15 +7,13 @@
           {% for i in index.symbols|selectattr('kind', 'equalto', 'namespace') recursive %}
           {% if i.has_nestable_children %}
           <li class="m-dox-collapsible">
-            <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>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}
-
-            {# the above is here to preserve the newline #}
+            <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span>
             <ul class="m-dox">
 {{ loop(i.children|selectattr('kind', 'equalto', 'namespace'))|indent(4, true) }}
             </ul>
           </li>
           {% else %}
-          <li>{{ i.kind }} <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a> <span class="m-dox">{{ i.brief }}</span>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %}</li>
+          <li>{{ i.kind }} <a href="{{ i.url }}" class="m-dox">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-dox">{{ i.brief }}</span></li>
           {% endif %}
           {% endfor %}
         </ul>

diff --git a/doxygen/test/compound_deprecated/annotated.html b/doxygen/test/compound_deprecated/annotated.html
index d4a13d7f45e35d5bcbfd7a11b91ed6502eba5368..6a7fba39f4a5ecb4c075e08bd059823757ffe90a 100644 (file)
--- a/doxygen/test/compound_deprecated/annotated.html
+++ b/doxygen/test/compound_deprecated/annotated.html
@@ -22,12 +22,12 @@
         <h1>Classes</h2>
         <ul class="m-dox">
           <li class="m-dox-collapsible">
-            <a href="#" onclick="return toggle(this)">namespace</a> <a href="namespaceDeprecatedNamespace.html" class="m-dox">DeprecatedNamespace</a> <span class="m-dox">A namespace.</span> <span class="m-label m-danger">deprecated</span>
+            <a href="#" onclick="return toggle(this)">namespace</a> <a href="namespaceDeprecatedNamespace.html" class="m-dox">DeprecatedNamespace</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A namespace.</span>
             <ul class="m-dox">
-              <li>struct <a href="structDeprecatedNamespace_1_1BaseDeprecatedClass.html" class="m-dox">BaseDeprecatedClass</a> <span class="m-dox">A base class.</span> <span class="m-label m-danger">deprecated</span></li>
-              <li>struct <a href="structDeprecatedNamespace_1_1DeprecatedClass.html" class="m-dox">DeprecatedClass</a> <span class="m-dox">A class.</span> <span class="m-label m-danger">deprecated</span></li>
-              <li>struct <a href="structDeprecatedNamespace_1_1DeprecatedStruct.html" class="m-dox">DeprecatedStruct</a> <span class="m-dox">A struct.</span> <span class="m-label m-danger">deprecated</span></li>
-              <li>union <a href="unionDeprecatedNamespace_1_1DeprecatedUnion.html" class="m-dox">DeprecatedUnion</a> <span class="m-dox">An union.</span> <span class="m-label m-danger">deprecated</span></li>
+              <li>struct <a href="structDeprecatedNamespace_1_1BaseDeprecatedClass.html" class="m-dox">BaseDeprecatedClass</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A base class.</span></li>
+              <li>struct <a href="structDeprecatedNamespace_1_1DeprecatedClass.html" class="m-dox">DeprecatedClass</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A class.</span></li>
+              <li>struct <a href="structDeprecatedNamespace_1_1DeprecatedStruct.html" class="m-dox">DeprecatedStruct</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A struct.</span></li>
+              <li>union <a href="unionDeprecatedNamespace_1_1DeprecatedUnion.html" class="m-dox">DeprecatedUnion</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">An union.</span></li>
             </ul>
           </li>
         </ul>

diff --git a/doxygen/test/compound_deprecated/files.html b/doxygen/test/compound_deprecated/files.html
index 4bbbc429f1c3d5122ec6386965308bb32a69ce16..70f8fac801c428dd69cbcb2c032b45af528bd4e4 100644 (file)
--- a/doxygen/test/compound_deprecated/files.html
+++ b/doxygen/test/compound_deprecated/files.html
@@ -25,12 +25,12 @@
             <a href="#" onclick="return toggle(this)">dir</a> <a href="dir_da5033def2d0db76e9883b31b76b3d0c.html" class="m-dox">Dir</a> <span class="m-dox">A directory.</span>
             <ul class="m-dox">
               <li class="m-dox-collapsible collapsed">
-                <a href="#" onclick="return toggle(this)">dir</a> <a href="dir_89d28accb4b69f59411b7eddd48bbfbd.html" class="m-dox">DeprecatedSubdir</a> <span class="m-dox">A directory.</span> <span class="m-label m-danger">deprecated</span>
+                <a href="#" onclick="return toggle(this)">dir</a> <a href="dir_89d28accb4b69f59411b7eddd48bbfbd.html" class="m-dox">DeprecatedSubdir</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A directory.</span>
                 <ul class="m-dox">
                   <li>file <a href="File_8h.html" class="m-dox">File.h</a> <span class="m-dox">A file.</span></li>
                 </ul>
               </li>
-              <li>file <a href="DeprecatedFile_8h.html" class="m-dox">DeprecatedFile.h</a> <span class="m-dox">A file.</span> <span class="m-label m-danger">deprecated</span></li>
+              <li>file <a href="DeprecatedFile_8h.html" class="m-dox">DeprecatedFile.h</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A file.</span></li>
             </ul>
           </li>
         </ul>
@@ -54,4 +54,4 @@
   </div>
 </article></main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/doxygen/test/compound_deprecated/modules.html b/doxygen/test/compound_deprecated/modules.html
index 261cffc6f57c792ec08478e8c459ef6d1bdae216..215598b282c2b9ee8c12f628ead371a7dcfdc0e9 100644 (file)
--- a/doxygen/test/compound_deprecated/modules.html
+++ b/doxygen/test/compound_deprecated/modules.html
@@ -24,7 +24,7 @@
           <li class="m-dox-collapsible">
             <a href="#" onclick="return toggle(this)">module</a> <a href="group__group.html" class="m-dox">A group</a> <span class="m-dox"></span>
             <ul class="m-dox">
-              <li>module <a href="group__deprecated-group.html" class="m-dox">A group</a> <span class="m-dox"></span> <span class="m-label m-danger">deprecated</span></li>
+              <li>module <a href="group__deprecated-group.html" class="m-dox">A group</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox"></span></li>
             </ul>
           </li>
         </ul>
@@ -48,4 +48,4 @@
   </div>
 </article></main>
 </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/doxygen/test/compound_deprecated/namespaces.html b/doxygen/test/compound_deprecated/namespaces.html
index 891726ddc13ee47a704813b8961fcc8e0ab4949c..6ed2b5fbc78dfd6be9c2d1c18958cc59c2f06434 100644 (file)
--- a/doxygen/test/compound_deprecated/namespaces.html
+++ b/doxygen/test/compound_deprecated/namespaces.html
@@ -21,7 +21,7 @@
       <div class="m-col-l-10 m-push-l-1">
         <h1>Namespaces</h2>
         <ul class="m-dox">
-          <li>namespace <a href="namespaceDeprecatedNamespace.html" class="m-dox">DeprecatedNamespace</a> <span class="m-dox">A namespace.</span> <span class="m-label m-danger">deprecated</span></li>
+          <li>namespace <a href="namespaceDeprecatedNamespace.html" class="m-dox">DeprecatedNamespace</a> <span class="m-label m-danger">deprecated</span> <span class="m-dox">A namespace.</span></li>
         </ul>
         <script>
         function toggle(e) {