From 9b7f4aee26134277730fd3a35a7a20f2c7ba8f65 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 7 Jul 2019 21:34:50 +0200
Subject: [PATCH] Trim extra trailing newlines before passing it to Jinja's
 indent().

In Jinja 2.9 indent() unconditionally stripped the trailing newline, in
2.10 it preserves it. That ... actually makes sense, so we have to
adapt.
---
 documentation/templates/doxygen/annotated.html       |  2 +-
 .../templates/doxygen/base-class-reference.html      |  2 +-
 documentation/templates/doxygen/base-reference.html  |  2 +-
 documentation/templates/doxygen/base.html            |  4 ++--
 documentation/templates/doxygen/files.html           |  2 +-
 documentation/templates/doxygen/modules.html         |  2 +-
 documentation/templates/doxygen/namespaces.html      |  2 +-
 documentation/templates/doxygen/page.html            |  2 +-
 documentation/templates/doxygen/pages.html           |  2 +-
 documentation/templates/python/base.html             |  6 +++---
 documentation/templates/python/classes.html          |  2 +-
 documentation/templates/python/modules.html          |  2 +-
 documentation/templates/python/pages.html            |  2 +-
 pelican-theme/templates/archives.html                |  6 +++---
 pelican-theme/templates/article.html                 | 12 ++++++------
 pelican-theme/templates/article_badges.html          |  4 ++--
 pelican-theme/templates/author.html                  |  2 +-
 pelican-theme/templates/base.html                    |  2 +-
 pelican-theme/templates/base_blog_section.html       |  6 +++---
 pelican-theme/templates/category.html                |  2 +-
 pelican-theme/templates/page.html                    |  2 +-
 pelican-theme/templates/passthrough.html             |  2 +-
 pelican-theme/templates/tag.html                     |  2 +-
 23 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/documentation/templates/doxygen/annotated.html b/documentation/templates/doxygen/annotated.html
index f86a7667..a81e2031 100644
--- a/documentation/templates/doxygen/annotated.html
+++ b/documentation/templates/doxygen/annotated.html
@@ -9,7 +9,7 @@
           <li class="m-doc-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-doc">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-doc">{{ i.brief }}</span>
             <ul class="m-doc">
-{{ loop(i.children)|indent(4, true) }}
+{{ loop(i.children)|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/doxygen/base-class-reference.html b/documentation/templates/doxygen/base-class-reference.html
index d20b3d47..abcb996c 100644
--- a/documentation/templates/doxygen/base-class-reference.html
+++ b/documentation/templates/doxygen/base-class-reference.html
@@ -58,7 +58,7 @@
             <li>
               <a href="#{{ id }}">{{ name }}</a>
               <ul>
-{{ loop(children)|indent(4, true) }}
+{{ loop(children)|rtrim|indent(4, true) }}
               </ul>
             </li>
             {% else %}
diff --git a/documentation/templates/doxygen/base-reference.html b/documentation/templates/doxygen/base-reference.html
index 82e0f145..0613dde4 100644
--- a/documentation/templates/doxygen/base-reference.html
+++ b/documentation/templates/doxygen/base-reference.html
@@ -34,7 +34,7 @@
             <li>
               <a href="#{{ id }}">{{ name }}</a>
               <ul>
-{{ loop(children)|indent(4, true) }}
+{{ loop(children)|rtrim|indent(4, true) }}
               </ul>
             </li>
             {% else %}
diff --git a/documentation/templates/doxygen/base.html b/documentation/templates/doxygen/base.html
index d98bc83d..e06ff8a5 100644
--- a/documentation/templates/doxygen/base.html
+++ b/documentation/templates/doxygen/base.html
@@ -19,7 +19,7 @@
   <meta name="theme-color" content="{{ M_THEME_COLOR }}" />
   {% endif %}
   {% if M_HTML_HEADER %}
-  {{ M_HTML_HEADER|indent(2) }}
+  {{ M_HTML_HEADER|rtrim|indent(2) }}
   {% endif %}
 </head>
 <body>
@@ -128,7 +128,7 @@
           </form>
           <noscript class="m-text m-danger m-text-center">Unlike everything else in the docs, the search functionality <em>requires</em> JavaScript.{% if M_SEARCH_EXTERNAL_URL %} Enable it or <a href="{{ M_SEARCH_EXTERNAL_URL|replace('{query}', '') }}">use an external search engine</a>.{% endif %}</noscript>
           <div id="search-help" class="m-text m-dim m-text-center">
-            {{ M_SEARCH_HELP|indent(12) }}
+            {{ M_SEARCH_HELP|rtrim|indent(12) }}
           </div>
           <div id="search-notfound" class="m-text m-warning m-text-center">Sorry, nothing was found.{% if M_SEARCH_EXTERNAL_URL %}<br />Maybe try a full-text <a href="#" id="search-external" data-search-engine="{{ M_SEARCH_EXTERNAL_URL }}">search with external engine</a>?{% endif %}</div>
           <ul id="search-results"></ul>
diff --git a/documentation/templates/doxygen/files.html b/documentation/templates/doxygen/files.html
index c2331cea..972ca7d0 100644
--- a/documentation/templates/doxygen/files.html
+++ b/documentation/templates/doxygen/files.html
@@ -9,7 +9,7 @@
           <li class="m-doc-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-doc">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-doc">{{ i.brief }}</span>
             <ul class="m-doc">
-{{ loop(i.children)|indent(4, true) }}
+{{ loop(i.children)|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/doxygen/modules.html b/documentation/templates/doxygen/modules.html
index b59d47c1..8487a1bd 100644
--- a/documentation/templates/doxygen/modules.html
+++ b/documentation/templates/doxygen/modules.html
@@ -9,7 +9,7 @@
           <li class="m-doc-collapsible">
             <a href="#" onclick="return toggle(this)">module</a> <a href="{{ i.url }}" class="m-doc">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-doc">{{ i.brief }}</span>
             <ul class="m-doc">
-{{ loop(i.children)|indent(4, true) }}
+{{ loop(i.children)|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/doxygen/namespaces.html b/documentation/templates/doxygen/namespaces.html
index eb8d1cff..986ab38c 100644
--- a/documentation/templates/doxygen/namespaces.html
+++ b/documentation/templates/doxygen/namespaces.html
@@ -9,7 +9,7 @@
           <li class="m-doc-collapsible">
             <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-doc">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-doc">{{ i.brief }}</span>
             <ul class="m-doc">
-{{ loop(i.children|selectattr('kind', 'equalto', 'namespace'))|indent(4, true) }}
+{{ loop(i.children|selectattr('kind', 'equalto', 'namespace'))|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/doxygen/page.html b/documentation/templates/doxygen/page.html
index 82d8087b..473d30f3 100644
--- a/documentation/templates/doxygen/page.html
+++ b/documentation/templates/doxygen/page.html
@@ -30,7 +30,7 @@
             <li>
               <a href="#{{ id }}">{{ name }}</a>
               <ul>
-{{ loop(children)|indent(4, true) }}
+{{ loop(children)|rtrim|indent(4, true) }}
               </ul>
             </li>
             {% else %}
diff --git a/documentation/templates/doxygen/pages.html b/documentation/templates/doxygen/pages.html
index ac812fb9..8d52dd8a 100644
--- a/documentation/templates/doxygen/pages.html
+++ b/documentation/templates/doxygen/pages.html
@@ -9,7 +9,7 @@
           <li class="m-doc-collapsible">
             <a href="#" onclick="return toggle(this)"></a><a href="{{ i.url }}" class="m-doc">{{ i.name }}</a>{% if i.is_deprecated %} <span class="m-label m-danger">deprecated</span>{% endif %} <span class="m-doc">{{ i.brief }}</span>
             <ul class="m-doc">
-{{ loop(i.children)|indent(4, true) }}
+{{ loop(i.children)|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/python/base.html b/documentation/templates/python/base.html
index 6c61189f..aaa3197f 100644
--- a/documentation/templates/python/base.html
+++ b/documentation/templates/python/base.html
@@ -19,7 +19,7 @@
   <meta name="theme-color" content="{{ THEME_COLOR }}" />
   {% endif %}
   {% if HTML_HEADER %}
-  {{ HTML_HEADER|indent(2) }}
+  {{ HTML_HEADER|rtrim|indent(2) }}
   {% endif %}
 </head>
 <body>
@@ -120,7 +120,7 @@
           </form>
           <noscript class="m-text m-danger m-text-center">Unlike everything else in the docs, the search functionality <em>requires</em> JavaScript.{% if SEARCH_EXTERNAL_URL %} Enable it or <a href="{{ SEARCH_EXTERNAL_URL|replace('{query}', '') }}">use an external search engine</a>.{% endif %}</noscript>
           <div id="search-help" class="m-text m-dim m-text-center">
-            {{ SEARCH_HELP|render_rst|indent(12) }}
+            {{ SEARCH_HELP|render_rst|rtrim|indent(12) }}
           </div>
           <div id="search-notfound" class="m-text m-warning m-text-center">Sorry, nothing was found.{% if SEARCH_EXTERNAL_URL %}<br />Maybe try a full-text <a href="#" id="search-external" data-search-engine="{{ SEARCH_EXTERNAL_URL }}">search with external engine</a>?{% endif %}</div>
           <ul id="search-results"></ul>
@@ -146,7 +146,7 @@
         {% if FINE_PRINT == '[default]' %}
         <p>{{ PROJECT_TITLE }}{% if PROJECT_SUBTITLE %} {{ PROJECT_SUBTITLE }}{% endif %}. Created with <a href="https://mcss.mosra.cz/documentation/python/">m.css Python doc generator</a>.</p>
         {% else %}
-        {{ FINE_PRINT|render_rst|indent(8) }}
+        {{ FINE_PRINT|render_rst|rtrim|indent(8) }}
         {% endif %}
       </div>
     </div>
diff --git a/documentation/templates/python/classes.html b/documentation/templates/python/classes.html
index 2f9404dd..8b0b3bdb 100644
--- a/documentation/templates/python/classes.html
+++ b/documentation/templates/python/classes.html
@@ -9,7 +9,7 @@
           <li class="m-doc-collapsible{% if loop.depth > CLASS_INDEX_EXPAND_LEVELS or (i.kind != 'module' and not CLASS_INDEX_EXPAND_INNER) %} collapsed{% endif %}">
             <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-doc">{{ i.name }}</a> <span class="m-doc">{{ i.summary }}</span>
             <ul class="m-doc">
-{{ loop(i.children)|indent(4, true) }}
+{{ loop(i.children)|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/python/modules.html b/documentation/templates/python/modules.html
index 8264d2fc..cd954c9b 100644
--- a/documentation/templates/python/modules.html
+++ b/documentation/templates/python/modules.html
@@ -9,7 +9,7 @@
           <li class="m-doc-collapsible">
             <a href="#" onclick="return toggle(this)">{{ i.kind }}</a> <a href="{{ i.url }}" class="m-doc">{{ i.name }}</a> <span class="m-doc">{{ i.summary }}</span>
             <ul class="m-doc">
-{{ loop(i.children|selectattr('kind', 'equalto', 'module'))|indent(4, true) }}
+{{ loop(i.children|selectattr('kind', 'equalto', 'module'))|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/documentation/templates/python/pages.html b/documentation/templates/python/pages.html
index 25c40990..629d7160 100644
--- a/documentation/templates/python/pages.html
+++ b/documentation/templates/python/pages.html
@@ -9,7 +9,7 @@
           <li class="m-doc-collapsible">
             <a href="#" onclick="return toggle(this)"></a><a href="{{ i.url }}" class="m-doc">{{ i.name }}</a> <span class="m-doc">{{ i.summary }}</span>
             <ul class="m-doc">
-{{ loop(i.children)|indent(4, true) }}
+{{ loop(i.children)|rtrim|indent(4, true) }}
             </ul>
           </li>
           {% else %}
diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html
index 2332d95c..7ccd07d0 100644
--- a/pelican-theme/templates/archives.html
+++ b/pelican-theme/templates/archives.html
@@ -54,7 +54,7 @@
       {% for article in article_list %}
       <article>
         {% macro header() %}{% include "article_header.html" %}{% endmacro %}
-        {{ header()|indent(8) }}
+        {{ header()|rtrim|indent(8) }}
         {% set show_content =
             article.content and loop.first and (not articles_page or articles_page.number == 1) and
             ((article.collapse_first is defined and article.collapse_first != 'True') or
@@ -67,7 +67,7 @@
         {% endif %}
         <footer>
           {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-          {{ footer()|indent(10) }}
+          {{ footer()|rtrim|indent(10) }}
         </footer>
         {% if not show_content %}
         <div class="m-clearfix-l"></div>
@@ -76,7 +76,7 @@
       {% endfor %}
       {% if articles_page and articles_page.has_other_pages() %}
       {% macro pagination() %}{% include 'pagination.html' %}{% endmacro %}
-      {{ pagination()|indent(6) }}
+      {{ pagination()|rtrim|indent(6) }}
       {% endif %}
     </div>
 {% endblock %}
diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index 266e132c..7b09f18b 100644
--- a/pelican-theme/templates/article.html
+++ b/pelican-theme/templates/article.html
@@ -96,7 +96,7 @@
 {{ article.content|trim }}
 <!-- /content -->
           {% if article.category.badge or (article.author and article.author.badge) %}
-          {{ badges()|indent(10) }}
+          {{ badges()|rtrim|indent(10) }}
           {% endif %}
         </div>
       </div>
@@ -106,7 +106,7 @@
       <div class="m-row">
         <div class="m-col-m-10 m-push-m-1 m-nopadb">
           {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-          {{ footer()|indent(10) }}
+          {{ footer()|rtrim|indent(10) }}
         </div>
       </div>
     </footer>
@@ -114,10 +114,10 @@
   {% else %}
     <article class="m-col-m-10 m-nopadb">
       {% macro header() %}{% include "article_header.html" %}{% endmacro %}
-      {{ header()|indent(6) }}
+      {{ header()|rtrim|indent(6) }}
       <div class="m-clearfix-l"></div>
       {% if article.archived == 'True' and M_ARCHIVED_ARTICLE_BADGE %}
-      {{ M_ARCHIVED_ARTICLE_BADGE|render_rst|replace('{year}', article.date.year)|indent(6) }}
+      {{ M_ARCHIVED_ARTICLE_BADGE|render_rst|replace('{year}', article.date.year)|rtrim|indent(6) }}
       {% endif %}
       {% if article.content %}
 <!-- content -->
@@ -125,11 +125,11 @@
 <!-- /content -->
       {% endif %}
       {% if article.category.badge or (article.author and article.author.badge) %}
-      {{ badges()|indent(6) }}
+      {{ badges()|rtrim|indent(6) }}
       {% endif %}
       <footer>
         {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-        {{ footer()|indent(8) }}
+        {{ footer()|rtrim|indent(8) }}
       </footer>
     </article>
     {% endif %}
diff --git a/pelican-theme/templates/article_badges.html b/pelican-theme/templates/article_badges.html
index e62c9d0f..95f129c9 100644
--- a/pelican-theme/templates/article_badges.html
+++ b/pelican-theme/templates/article_badges.html
@@ -4,7 +4,7 @@
   <img src="{{ article.author.image|expand_link(article)|e }}" alt="{{ article.author|e }}" />
   {% endif %}
   <h3>About the author</h3>
-  {{ article.author.badge|expand_links(article)|indent(2) }}
+  {{ article.author.badge|expand_links(article)|rtrim|indent(2) }}
 </div>
 {% endif %}
 {% if article.category.badge %}
@@ -13,6 +13,6 @@
   <img src="{{ article.category.image|expand_link(article)|e }}" alt="{{ article.category|e }}" />
   {% endif %}
   <h3>{% if article.category.badge_title %}{{ article.category.badge_title }}{% else %}{{ article.category|e }}{% endif %}</h3>
-  {{ article.category.badge|expand_links(article)|indent(2) }}
+  {{ article.category.badge|expand_links(article)|rtrim|indent(2) }}
 </div>
 {% endif %}
diff --git a/pelican-theme/templates/author.html b/pelican-theme/templates/author.html
index c919d7f5..917b1f87 100644
--- a/pelican-theme/templates/author.html
+++ b/pelican-theme/templates/author.html
@@ -41,7 +41,7 @@
         <img src="{{ author.page.image|expand_link(author.page)|e }}" alt="{{ author|e }}" />
         {% endif %}
         <h3>{% if author.page.title %}{{ author.page.title }}{% else %}{{ author|e }}{% endif %}</h3>
-        {{ author.page.content|indent(8) }}
+        {{ author.page.content|rtrim|indent(8) }}
       </div>
       {% endif %}
 {% endblock %}
diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index 9c6d1e67..71442dfb 100644
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -171,7 +171,7 @@
     {% if not M_FINE_PRINT is defined or M_FINE_PRINT %}
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        {{ (M_FINE_PRINT or SITENAME + ". Powered by `Pelican <https://getpelican.com>`_ and `m.css <https://mcss.mosra.cz>`_.")|render_rst|indent(8) }}
+        {{ (M_FINE_PRINT or SITENAME + ". Powered by `Pelican <https://getpelican.com>`_ and `m.css <https://mcss.mosra.cz>`_.")|render_rst|rtrim|indent(8) }}
       </div>
     </div>
     {% endif %}
diff --git a/pelican-theme/templates/base_blog_section.html b/pelican-theme/templates/base_blog_section.html
index 5d10e120..327ad150 100644
--- a/pelican-theme/templates/base_blog_section.html
+++ b/pelican-theme/templates/base_blog_section.html
@@ -25,17 +25,17 @@
       {% for article in articles_page.object_list %}
       <article>
         {% macro header() %}{% include "article_header.html" %}{% endmacro %}
-        {{ header()|indent(8) }}
+        {{ header()|rtrim|indent(8) }}
         <footer>
           {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-          {{ footer()|indent(10) }}
+          {{ footer()|rtrim|indent(10) }}
         </footer>
         <div class="m-clearfix-l"></div>
       </article>
       {% endfor %}
       {% if articles_page.has_other_pages() %}
       {% macro pagination() %}{% include 'pagination.html' %}{% endmacro %}
-      {{ pagination()|indent(6) }}
+      {{ pagination()|rtrim|indent(6) }}
       {% endif %}
     </div>
 {% endblock %}
diff --git a/pelican-theme/templates/category.html b/pelican-theme/templates/category.html
index c3bf5d74..4eeaac35 100644
--- a/pelican-theme/templates/category.html
+++ b/pelican-theme/templates/category.html
@@ -35,7 +35,7 @@
         <img src="{{ category.page.image|expand_link(category.page)|e }}" alt="{{ category|e }}" />
         {% endif %}
         <h3>{% if category.page.title %}{{ category.page.title }}{% else %}{{ category|e }}{% endif %}</h3>
-        {{ category.page.content|indent(8) }}
+        {{ category.page.content|rtrim|indent(8) }}
       </div>
       {% endif %}
 {% endblock %}
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 23bbaf6f..2328e101 100644
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -63,7 +63,7 @@
   {% endfor %}
   {% endif %}
   {% if page.html_header %}
-  {{ page.html_header|indent(2) }}
+  {{ page.html_header|rtrim|indent(2) }}
   {% endif %}
 {% endblock %}
 
diff --git a/pelican-theme/templates/passthrough.html b/pelican-theme/templates/passthrough.html
index d06be23b..bdf92b77 100644
--- a/pelican-theme/templates/passthrough.html
+++ b/pelican-theme/templates/passthrough.html
@@ -17,7 +17,7 @@
   {% endfor %}
   {% endif %}
   {% if page.html_header %}
-  {{ page.html_header.strip()|indent(2) }}
+  {{ page.html_header|trim|indent(2) }}
   {% endif %}
 </head>
 <body>
diff --git a/pelican-theme/templates/tag.html b/pelican-theme/templates/tag.html
index b1cb113a..7ef0fd42 100644
--- a/pelican-theme/templates/tag.html
+++ b/pelican-theme/templates/tag.html
@@ -29,7 +29,7 @@
       {% if tag.page and tag.page.content and articles_page.number == 1 %}
       <div class="m-block m-info">
         <h3>{% if tag.page.title %}{{ tag.page.title }}{% else %}{{ tag|e }}{% endif %}</h3>
-        {{ tag.page.content|indent(8) }}
+        {{ tag.page.content|rtrim|indent(8) }}
       </div>
       {% endif %}
 {% endblock %}
-- 
2.30.2