[SVN] r2249 www.twisterrob.net in /Web/www.twisterrob.net/

[MOD] Update compress due to Liquid errors
[FIX] Liquid errors in masthead
[FIX] baseurl in local configuration now works

Author: TWiStErRob

Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
 # for some reason omitting the version defaults to 0
-gem 'github-pages', '>= 96'
-gem 'pygments.rb'
+gem 'github-pages', '>= 98'
 
 # http://jekyllrb.com/docs/windows/#auto-regeneration
 # for --watch to work on Windows

README.md

@@ -22,6 +22,7 @@ me@website$ bundle install # takes about 5 minutes
 ```
 
 In case of `SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed` follow [these instructions](https://gist.github.com/luislavena/f064211759ee0f806c88).
+If there's the same SSL issue, for example when using `jekyll-gist`, then [try this](https://gist.github.com/fnichol/867550#the-manual-way-boring).
 
 
 ## Run

_config.yml

@@ -191,7 +191,9 @@ sass:
 compress_html:
   clippings: all
   comments: ["<!-- ", " -->"]
+  startings: []
   endings: all
+  blanklines: false
   profile: false
   ignore:
     envs: [development]

_config_dev.yml

@@ -7,10 +7,8 @@
 url: 'http://localhost:4000'
 
 # Make sure the site is ready to be served in a subfolder with a simple config change
-# `baseurl` is broken in Jekyll 3.x, fixed in Jekyll 3.2.0
-# waiting for https://github.com/jekyll/jekyll/pull/4953 to be released to pages-gem
-#baseurl: '/dev'
-#urlimg: '/dev/images/'
+baseurl: '/dev'
+urlimg: '/dev/images/'
 
 # Need to be unsafe for {{ var | debug }} plugin
 safe: false

_config_local.yml

@@ -10,3 +10,9 @@ url: 'http://localhost:4000'
 # Disable when not in production
 google_analytics_tracking_id: false
 disqus_shortname: false
+
+liquid:
+  # :lax acts like liquid 2.5 and silently ignores malformed tags in most cases.
+  # :warn is the default and will give deprecation warnings when invalid syntax is used.
+  # :strict will enforce correct syntax.
+  error_mode: strict

_includes/masthead.html

@@ -33,7 +33,7 @@ <h1 id="print-logo" class="print-only">
 {% include masthead-breadcrumbs.html %}
 {% endif %}
 
-{% if page.header.caption_url && page.header.caption %}
+{% if page.header.caption_url and page.header.caption %}
 <div class="masthead-caption">
 	<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
 </div>
@@ -61,7 +61,7 @@ <h1 id="print-logo" class="print-only">
 {% include masthead-breadcrumbs.html %}
 {% endif %}
 
-{% if page.header.caption_url && page.header.caption %}
+{% if page.header.caption_url and page.header.caption %}
 <div class="masthead-caption">
 	<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
 </div>
@@ -89,7 +89,7 @@ <h1 id="print-logo" class="print-only">
 {% include masthead-breadcrumbs.html %}
 {% endif %}
 
-{% if page.header.caption_url && page.header.caption %}
+{% if page.header.caption_url and page.header.caption %}
 <div class="masthead-caption">
 	<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
 </div>
@@ -117,7 +117,7 @@ <h1 id="print-logo" class="print-only">
 {% include masthead-breadcrumbs.html %}
 {% endif %}
 
-{% if page.header.caption_url && page.header.caption %}
+{% if page.header.caption_url and page.header.caption %}
 <div class="masthead-caption">
 	<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
 </div>

_layouts/compress.html

@@ -1,19 +1,10 @@
 ---
 # Jekyll layout that compresses HTML
-# v1.3.0
+# v3.0.2
 # http://jch.penibelst.de/
 # © 2014–2015 Anatol Broder
 # MIT License
 ---
 
-{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile or site.compress_html.debugging %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% case _pres.size %}{% when 2 %}{% capture _content %}{{ _content }}<pre{{ _pres.first }}</pre>{{ _pres.last | split: " " | join: " " }}{% endcapture %}{% when 1 %}{% capture _content %}{{ _content }}{{ _pres.last | split: " " | join: " " }}{% endcapture %}{% endcase %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments.size == 2 %}{% assign _comment_befores = _content | split: site.compress_html.comments.first %}{% for _comment_before in _comment_befores %}{% assign _comment_content = _comment_before | split: site.compress_html.comments.last | first %}{% if _comment_content %}{% capture _comment %}{{ site.compress_html.comments.first }}{{ _comment_content }}{{ site.compress_html.comments.last }}{% endcapture %}{% assign _content = _content | remove: _comment %}{% endif %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %}
-  <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile">
-    <thead>
-    <tr><td>Step<td>Bytes
-    <tbody>
-    <tr><td>raw<td>{{ content | size }}{% if _profile_endings %}
-    <tr><td>endings<td>{{ _profile_endings }}{% endif %}{% if _profile_collapse %}
-    <tr><td>collapse<td>{{ _profile_collapse }}{% endif %}{% if _profile_comments %}
-    <tr><td>comments<td>{{ _profile_comments }}{% endif %}{% if _profile_clippings %}
-    <tr><td>clippings<td>{{ _profile_clippings }}{% endif %}
-  </table>{% endif %}{% endif %}
+{% capture _LINE_FEED %}
+{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ content | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}