fight liquid whitespace

3 files changed, 22 insertions, 23 deletions

diff --git a/_includes/header.html b/_includes/header.html
index a87fae9..68c6e25 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -14,26 +14,24 @@
         </div>
         <div id="navbar" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li{% if page.url == "/news/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}/news">News</a></li>
-                {% comment %}
+                <li{% if page.url == "/news/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}/news">News</a></li>{%
+                  comment %}
                     Exclude the news feed and the paginated news pages.
-                {% endcomment %}
-                {% capture pageidx %}{% include weighted_sorted_pages.html %}{% endcapture %}{% assign pageidx = pageidx | strip_newlines | split:',' %}
-                {% assign ap = site.pages %}
+                {% endcomment %}{% capture pageidx %}{% include weighted_sorted_pages.html %}{% endcapture %}{% assign pageidx = pageidx | strip_newlines | split:',' %}{% comment %}
+                {% endcomment %}{% assign ap = site.pages %}
                 {% for it in pageidx %}{% assign p_idx = it | times:1 %}{% assign node = ap[p_idx] %}{% comment %}
-                {% endcomment %}
-                {% if node.categories contains "_nav" %}
-                {% if page.url == node.url %}
+                {% endcomment %}{% if node.categories contains "_nav" %}{% comment %}
+                {% endcomment %}{% if page.url == node.url %}
                 <li class="active">
                     <a href="{{ site.baseurl }}{{ node.url }}" class="active">{{ node.title }}</a>
-                </li>
-                {% else %}
+                </li>{% comment %}
+                {% endcomment %}{% else %}
                 <li>
                     <a href="{{ site.baseurl }}{{ node.url }}">{{ node.title }}</a>
-                </li>
-                {% endif %}
-                {% endif %}
-                {% endfor %}
+                </li>{% comment %}
+                {% endcomment %}{% endif %}{% comment %}
+                {% endcomment %}{% endif %}{% comment %}
+                {% endcomment %}{% endfor %}
                 <li><a href="//irssi-import.github.io/themes/">Themes</a></li>
                 <li><a href="http://scripts.irssi.org/">Scripts</a></li>
                 <li><a href="https://github.com/irssi/irssi/issues">Bugs</a></li>
diff --git a/_includes/ordinal.html b/_includes/ordinal.html
index aac7b74..c942963 100644
--- a/_includes/ordinal.html
+++ b/_includes/ordinal.html
@@ -1,4 +1,5 @@
-{% assign ordinalize=include.ordinalize %}{% if ordinalize == "1" or ordinalize == "21" or ordinalize == "31" %}st
+{% assign ordinalize=include.ordinalize %}
+{% if ordinalize == "1" or ordinalize == "21" or ordinalize == "31" %}st
 {% elsif ordinalize == "2" or ordinalize == "22" %}nd
 {% elsif ordinalize == "3" or ordinalize == "23" %}rd
 {% else %}th{% endif %}
diff --git a/_includes/postmeta.html b/_includes/postmeta.html
index 4a4d5b3..3bc9bf7 100644
--- a/_includes/postmeta.html
+++ b/_includes/postmeta.html
@@ -2,9 +2,9 @@
 {% if node.author or node.date %}
     <p>
         <small>
-            Posted
-            {% if node.author %}
-                by
+            Posted {% comment %}
+            {% endcomment %}{% if node.author %}{% comment %}
+                {% endcomment %}by
                 {% if node.web %}
                     <a href="{{ node.web }}">{{ node.author }}</a>
                 {% elsif node.email %}
@@ -12,12 +12,12 @@
                 {% else %}
                     {{ node.author }}
                 {% endif %}
-            {% endif %}
+            {% endif %}{% comment %}
 
-            {% if node.date %}
-                {% assign ordinalize = node.date | date: "%-d" %}
-                on {{ node.date | date: "%B %-d" }}<sup>{% include ordinal.html ordinalize=ordinalize %}</sup>
-                {{ node.date | date: "%Y" }}
+            {% endcomment %}{% if node.date %}{% comment %}
+                {% endcomment %}{% assign rd = node.date | date: "%-d" %}{% capture ordinalize %}{% include ordinal.html ordinalize=rd %}{% endcapture %}{% comment %}
+                {% endcomment %}on {{ node.date | date: "%B %-d" }}<sup>{{ ordinalize | strip_newlines }}</sup>{% comment %}
+                {% endcomment %} {{ node.date | date: "%Y" }}
             {% endif %}
         </small>
     </p>