Skip to content

Commit

Permalink
Fix newlines not preserved in code blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
dlesbre committed May 8, 2024
1 parent ddaa4c3 commit 1a7cbf2
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 38 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ _site/

# Ignore folders generated by Bundler
.bundle/
vendor/
*~
*~
70 changes: 34 additions & 36 deletions _layouts/odoc.html
Original file line number Diff line number Diff line change
@@ -1,50 +1,48 @@
---
layout: default
title: Codex API
layout: default
description: ...
compress_html: blanklines
css: ["api", "pygments"]
---


<script src="/assets/js/highlight.pack.js"></script>
<script>hljs.highlightAll();</script>

<body class="page nonTouch">
<script src="/assets/js/highlight.pack.js"></script>
<script>hljs.highlightAll();</script>

<div id="wrapper" class="hfeed">
<nav class="breadcrumb-nav" aria-label="breadcrumb">
{% if page.odoc.breadcrumbs %}
<ol class="breadcrumb-nav-list">
<li class="breadcrumb-nav-list-item">
<a class="nav-link" href="../{{ page.odoc.breadcrumbs.first.href }}">API</a>
</li>
{% assign breadcrumbs = page.odoc.breadcrumbs | where_exp:"item","item.name != 'index'" %}
{% for b in breadcrumbs %}
<li class="breadcrumb-nav-list-item">
{% if forloop.last == false %}
<a class="nav-link" href="{{ b.href }}"> {{ b.name }} </a>
{% else %}
<span>{{ b.name }}</span>
{% endif %}
</li>
{% endfor %}
<div id="wrapper" class="hfeed">
<nav class="breadcrumb-nav" aria-label="breadcrumb">
{% if page.odoc.breadcrumbs %}
<ol class="breadcrumb-nav-list">
<li class="breadcrumb-nav-list-item">
<a class="nav-link" href="../{{ page.odoc.breadcrumbs.first.href }}">API</a>
</li>
{% assign breadcrumbs = page.odoc.breadcrumbs | where_exp:"item","item.name != 'index'" %}
{% for b in breadcrumbs %}
<li class="breadcrumb-nav-list-item">
{% if forloop.last == false %}
<a class="nav-link" href="{{ b.href }}"> {{ b.name }} </a>
{% else %}
API
<span>{{ b.name }}</span>
{% endif %}
</ol>
</nav>
<div id="container" class="mainContainer">
<div class="pageAPI pages">
{% assign name = page.odoc.breadcrumbs.last.name %}
{% unless name == "index" %}
<h1>Patricia-Tree API - <code>{{ name }}</code></h1>
{% endunless %}
</li>
{% endfor %}
{% else %}
API
{% endif %}
</ol>
</nav>
<div id="container" class="mainContainer">
<div class="pageAPI pages">
{% assign name = page.odoc.breadcrumbs.last.name %}
{% unless name == "index" %}
<h1>Patricia-Tree API - <code>{{ name }}</code></h1>
{% endunless %}

{{ page.odoc.preamble }}
{{ page.odoc.preamble }}

{{ page.odoc.content }}
</div>
<div class="clear"></div>
{{ page.odoc.content }}
</div>
<div class="clear"></div>
</div>
</body>
</div>
10 changes: 10 additions & 0 deletions _layouts/vendor/compress.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
# Jekyll layout that compresses HTML
# v3.1.0
# http://jch.penibelst.de/
# © 2014–2015 Anatol Broder
# MIT License
---

{% capture _LINE_FEED %}
{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" or layout.compress_html == "disabled" or page.compress_html == "disabled" %}{{ 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 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 or page.compress_html == "blanklines" or layout.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 %}

0 comments on commit 1a7cbf2

Please sign in to comment.