From 4cb16c168439ea239ff19de6d7ed0413627ba615 Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Fri, 18 Dec 2015 23:03:49 +0100 Subject: [PATCH 1/2] Increase the version --- src/compress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compress.yaml b/src/compress.yaml index 406fed5..80c84f2 100644 --- a/src/compress.yaml +++ b/src/compress.yaml @@ -1,6 +1,6 @@ --- # Jekyll layout that compresses HTML -# v3.0.0 +# v3.0.1 # http://jch.penibelst.de/ # © 2014–2015 Anatol Broder # MIT License From 0ae7d4a043173b991a17e41bf456cf4e4d068f4e Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Fri, 18 Dec 2015 23:21:40 +0100 Subject: [PATCH 2/2] Upgrade the site layout --- site/_layouts/compress.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/site/_layouts/compress.html b/site/_layouts/compress.html index 2d3c21c..3db753a 100644 --- a/site/_layouts/compress.html +++ b/site/_layouts/compress.html @@ -1,11 +1,10 @@ --- # Jekyll layout that compresses HTML -# v2.1.0 +# v3.0.1 # 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 %}{% 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 %}{% 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.ignore.whitespaces %}{% assign _random = site.time | date: "%s%N" %}{% if site.compress_html.ignore.whitespaces contains "SPACE" %}{% capture _ignore_space %} {% endcapture %}{% capture _freeze_space %}space{{ _random }}{% endcapture %}{% capture _join %} -{% endcapture %}{% else %}{% capture _ignore_space %}{% endcapture %}{% capture _freeze_space %}{% endcapture %}{% capture _join %} {% endcapture %}{% endif %}{% if site.compress_html.ignore.whitespaces contains "LINE FEED" %}{% capture _ignore_line_feed %} -{% endcapture %}{% capture _freeze_line_feed %}line_feed{{ _random }}{% endcapture %}{% else %}{% capture _ignore_line_feed %}{% endcapture %}{% capture _freeze_line_feed %}{% endcapture %}{% endif %}{% if site.compress_html.ignore.whitespaces contains "CHARACTER TABULATION" %}{% capture _ignore_character_tabulation %} {% endcapture %}{% capture _freeze_character_tabulation %}character_tabulation{{ _random }}{% endcapture %}{% else %}{% capture _ignore_character_tabulation %}{% endcapture %}{% capture _freeze_character_tabulation %}{% endcapture %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% if _pres.size != 0 %}{% if site.compress_html.ignore.whitespaces %}{% assign _pres_after = _pres.last | replace: _ignore_space, _freeze_space | replace: _ignore_line_feed, _freeze_line_feed | replace: _ignore_character_tabulation, _freeze_character_tabulation | split: " " | join: _join | replace: _freeze_character_tabulation, _ignore_character_tabulation | replace: _freeze_line_feed, _ignore_line_feed | replace: _freeze_space, _ignore_space %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% case _pres.size %}{% when 2 %}{% capture _content %}{{ _content }}{{ _pres_after }}{% endcapture %}{% when 1 %}{% capture _content %}{{ _content }}{{ _pres_after }}{% endcapture %}{% endcase %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _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 %}{% assign _comment_befores = _content | split: _comments.first %}{% for _comment_before in _comment_befores %}{% assign _comment_content = _comment_before | split: _comments.last | first %}{% if _comment_content %}{% capture _comment %}{{ _comments.first }}{{ _comment_content }}{{ _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 = " ;; ;" | 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 %}
Step Bytes
raw {{ content | size }}{% if _profile_endings %}
endings {{ _profile_endings }}{% endif %}{% if _profile_startings %}
startings {{ _profile_startings }}{% endif %}{% if _profile_collapse %}
collapse {{ _profile_collapse }}{% endif %}{% if _profile_comments %}
comments {{ _profile_comments }}{% endif %}{% if _profile_clippings %}
clippings {{ _profile_clippings }}{% endif %}
{% 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 %}{% 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: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% assign _lastchar = _pres.last | split: "" | last %}{% assign _outerloop = forloop %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if forloop.last and _lastchar == _LINE_FEED %}{% unless _outerloop.last %}{{ _LINE_FEED }}{% endunless %}{% continue %}{% endif %}{% 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 "" %}{% endif %}{% unless _pre_before contains "" 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 = " ;; ;" | 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 %}
Step Bytes
raw {{ content | size }}{% if _profile_endings %}
endings {{ _profile_endings }}{% endif %}{% if _profile_startings %}
startings {{ _profile_startings }}{% endif %}{% if _profile_comments %}
comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %}
collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %}
clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %}