From: Marr11317 <remimarche@gmail.com>
Date: Thu, 9 Apr 2020 22:47:00 +0000 (-0400)
Subject: documentation/doxygen: do not show Doxygen version 0 on empty index.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=017e3a3762f20e09c5fd3b1b80321a3c7c7f6daf;p=blog.git

documentation/doxygen: do not show Doxygen version 0 on empty index.

Co-authored-by: Vladimír Vondruš <mosra@centrum.cz>
---

diff --git a/documentation/doxygen.py b/documentation/doxygen.py
index a0830be4..0560f51b 100755
--- a/documentation/doxygen.py
+++ b/documentation/doxygen.py
@@ -3603,7 +3603,7 @@ def run(state: State, *, templates=default_templates, wildcard=default_wildcard,
         compound.breadcrumb = [(state.doxyfile['PROJECT_NAME'], 'index.html')]
         template = env.get_template('page.html')
         rendered = template.render(compound=compound,
-            DOXYGEN_VERSION='0',
+            DOXYGEN_VERSION=None,
             FILENAME='index.html',
             SEARCHDATA_FORMAT_VERSION=searchdata_format_version,
             **state.doxyfile)
diff --git a/documentation/templates/doxygen/base.html b/documentation/templates/doxygen/base.html
index a1eee4c6..39ea7c26 100644
--- a/documentation/templates/doxygen/base.html
+++ b/documentation/templates/doxygen/base.html
@@ -152,7 +152,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 with <a href="https://doxygen.org/">Doxygen</a> {{ DOXYGEN_VERSION }} and <a href="https://mcss.mosra.cz/">m.css</a>.</p>
+        <p>{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created with {% if DOXYGEN_VERSION %}<a href="https://doxygen.org/">Doxygen</a> {{ DOXYGEN_VERSION }} and {% endif %}<a href="https://mcss.mosra.cz/">m.css</a>.</p>
         {% else %}
         {{ M_PAGE_FINE_PRINT|replace('{doxygen_version}', DOXYGEN_VERSION) }}
         {% endif %}
diff --git a/documentation/test_doxygen/page_empty_index/Doxyfile b/documentation/test_doxygen/page_empty_index/Doxyfile
index 07979766..b24370df 100644
--- a/documentation/test_doxygen/page_empty_index/Doxyfile
+++ b/documentation/test_doxygen/page_empty_index/Doxyfile
@@ -6,7 +6,9 @@ GENERATE_XML            = YES
 XML_PROGRAMLISTING      = NO
 CASE_SENSE_NAMES        = YES
 
-##! M_PAGE_FINE_PRINT   =
+# Keeping the default M_PAGE_FINE_PRINT to test that no "Doxygen version 0" is
+# added to the footer.
+
 ##! M_THEME_COLOR       =
 ##! M_FAVICON           =
 ##! M_LINKS_NAVBAR1     =
diff --git a/documentation/test_doxygen/page_empty_index/index.html b/documentation/test_doxygen/page_empty_index/index.html
index 0c441b48..cbc0947c 100644
--- a/documentation/test_doxygen/page_empty_index/index.html
+++ b/documentation/test_doxygen/page_empty_index/index.html
@@ -26,5 +26,14 @@
     </div>
   </div>
 </article></main>
+<footer><nav>
+  <div class="m-container">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <p>My Project. Created with <a href="https://mcss.mosra.cz/">m.css</a>.</p>
+      </div>
+    </div>
+  </div>
+</nav></footer>
 </body>
 </html>