hematite 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c31b77be5a329f70985b04f78078a87cf74d79c1f462018d8eed576e18efadc
-  data.tar.gz: 643ca6f28aaf67740b9e71b9de4a0f21bbe08f0f139b95e7b67819b28f9b1648
+  metadata.gz: 8764d5501c8a2e08a066ff8a3c595e6301544f302a3073505947faa226cd95d9
+  data.tar.gz: fd4b02059497fd70358abbd0dc7e753e4631c4c8c95347cb1cd201dc56ea9383
 SHA512:
-  metadata.gz: 3200f91d6ddd479b360c08b74862ff2a1260d45a92d3e84aa5c9686556cea7303835129c10329bd1b84d0cf965225eeb0808771f4d8edb338870feeb2d9c52e2
-  data.tar.gz: 79a331beca39bdfb4c1f8fb9447a3f04f9f36cb7f17856103b24353c875bc2ca36a77f866613d03d11daa3fff95a45de727d4a7a977eb022f5f4df31f09590d7
+  metadata.gz: 8e00a63422072524a31554c16c036b0be5a30f3e344cb955354b452506cc735a8eaf48e3ffb77a0c553209bd74596603c44322bf1ec231f5eacea3ad6d9a2b15
+  data.tar.gz: ec4c74f00d80c83f563727b0415a88408285bf849b8792e454335b582ffb4905a9b06a1708f2ede5d39935b6a87531a6ba2088ccced0ac4c05d66b348ad94368

data/_includes/extern_library_imports.html

@@ -5,3 +5,40 @@
 
 {% include mermaid_includes.html %}
 {% include katex_includes.html %}
+
+<!-- Page/site-specific imports and configuration -->
+{{ site.additional_import_html | default: "" }}
+{{ layout.additional_import_html | default: "" }}
+{{ page.additional_import_html | default: "" }}
+
+{% comment %}
+Each [spec]=["key", { property: value, property2: value2, ... }]
+{% endcomment %}
+{% for spec in layout.additional_imports | concat: page.additional_imports %}
+    {% assign target = spec[1] %}
+    {% if target.type == 'js' or target.type == 'mjs' %}
+        {% assign tag="script" %}
+        {% assign url_spec = "src" %}
+        {% assign options = "" %}
+    {% else %}
+        {% assign tag="link" %}
+        {% assign options = "rel='stylesheet'" %}
+        {% assign url_spec = "href" %}
+    {% endif %}
+
+    {% if target.type == 'mjs' %}
+        {% assign options = "type = 'module'" %}
+    {% endif %}
+
+    {% if target.absolute_url %}
+        {% assign url = target.absolute_url %}
+    {% else %}
+        {% assign url = target.url | relative_url %}
+    {% endif %}
+
+    <{{ tag }} {{ options }}
+        {{ target.inline_options | default: "" }}
+        {{url_spec}}={{ url | jsonify }}
+        onload={{ target.onload | default: "" | jsonify }}></{{tag}}>
+{% endfor %}
+

data/_includes/katex_includes.html

@@ -4,7 +4,7 @@
     KaTeX can be enabled with page.katex.
 -->
 
-{% if page.katex || site.mermaid %}
+{% if page.katex or layout.katex or site.mermaid %}
 
 <!-- See the releases tab on https://github.com/KaTeX/KaTeX  -->
 <link

data/_includes/mermaid_includes.html

@@ -2,7 +2,7 @@
 <!--
     Include mermaid-js scripts.
 -->
-{% if page.mermaid || site.mermaid %}
+{% if page.mermaid or site.mermaid or layout.mermaid %}
 <script>
     var MERMAID_CONFIG = window.MERMAID_CONFIG ?? {{ site.mermaid_config | jsonify }} ?? { };
 

data/_layouts/example_custom_remark_slideshow.html

@@ -0,0 +1,43 @@
+---
+layout: remark_slideshow
+additional_imports:
+    katex:
+        type: js
+        url: /assets/plugin/katex/katex.min.js
+    katex_auto_init_math:
+        type: js
+        url: /assets/plugin/katex/contrib/auto-render.min.js
+        onload: renderMathInElement(document.body)
+        inline_options: defer
+        comment: >-
+            We're passing 'defer' above because we want this script to load
+            _after_ the body.
+    katex_css:
+        type: css
+        url: /assets/plugin/katex/katex.min.css
+
+remark_presentation_config:
+    navigation:
+        scroll: false
+    slideNumberFormat: "Slide %current% of %total%."
+
+mermaid: true
+remark_presentation_config_html: >-
+    Testing...
+---
+
+{% comment %}
+This template is an example of how to customize remark slideshows
+by creating a new template.
+
+`additional_imports` can be used on any page. In this case, the imports
+are included both in the remark presentation `iframe` and in the main page.
+
+Of course, we could include `katex` or `mermaid` here by setting `katex: true`
+or `mermaid: true` in the header`, but `additional_imports` is another way to
+specify this.
+
+Note that `remark_presentation_config` is passed directly to remark.
+{% endcomment %}
+
+{{ content }}

data/_layouts/remark_slideshow.html

@@ -3,6 +3,14 @@ layout: default
 ---
 
 <!-- Defines a https://remarkjs.com/ slideshow -->
+<!--
+    Configure remark with
+    page.remark_presentation_config, site.remark_presentation_config,
+    page.remark_presentation_config_html
+
+    Note: Jekyll's default parser must not parse the input markdown file.
+    Either use a non-md extension or wrap its content in a <div markdown=false>...</div>
+-->
 
 {% assign frame_resource_url = 'assets/html/remark_presentation_frame.html.resource' | relative_url %}
 
@@ -12,17 +20,51 @@ layout: default
             onload="window.presentationFrameLoaded = true;"></iframe>
 </main>
 
+<!--
+    Liquid (sometimes?) does not handle unicode (e.g. π) characters properly when using
+    url_encode (or at least not consistently with JS's unescape), so include
+    content directly:
+-->
+<textarea id="source" style="display: none;">
+{{content}}
+</textarea>
+
 <script defer type="module">
+    // Matches <div>...</div> or <div markdown=0>...</div>
+    // Jekyll can remove the 'markdown=0' while parsing.
+    const WRAPPING_DIV_EXP = /\s*[<]div.*[>]((?:.|[\n\r])*)[<]\/div[>]\s*/;
+
     import slideshow from "{{ 'assets/js/layout/remark_slideshow.mjs' | relative_url }}";
 
     let presentationFrame = document.querySelector("#presentation_frame");
     presentationFrame.src = {{ frame_resource_url | jsonify }};
     window.presentationFrameLoaded = false;
 
-    let config = {{ page.remark_presentation_config | default: site.remark_presentation_config | jsonify }};
-    config ??= {};
 
-    config.source = {{ page.content | jsonify }};
+    let siteConfig = {{ site.remark_presentation_config | jsonify }} ?? {};
+    let layoutConfig = {{ layout.remark_presentation_config | jsonify }} ?? {};
+    let pageConfig = {{ page.remark_presentation_config | jsonify }} ?? {};
+    let config = {};
+
+    // Merge the remark configurations. siteConfig has highest precedence.
+    for (let currentConfig of [siteConfig, layoutConfig, pageConfig]) {
+        for (let key in currentConfig) {
+            config[key] = currentConfig[key];
+        }
+    }
+
+    console.log(config);
+
+    // Escape the content to prevent liquid from rendering it.
+    config.source = document.querySelector("#source").value;
+
+    // Unwrap if surrounded by markdown-parser-disabling HTML
+    let markdownDisableMatches = config.source.match(WRAPPING_DIV_EXP);
+
+    // Replace with first capture (contents of the wrapping element).
+    if (markdownDisableMatches && markdownDisableMatches.length > 0) {
+        config.source = markdownDisableMatches[1];
+    }
 
     // Library imports intended for this page: Forward to the frame.
     let libraryImports = unescape(`
@@ -47,6 +89,19 @@ layout: default
         presentationDoc.write("<!DOCTYPE html>");
         presentationDoc.write(slideshowHtml);
         presentationDoc.write(libraryImports);
+
+        // Any additional configuration scripts/html specific to remark
+        presentationDoc.write(unescape(
+            {{
+                page.remark_presentation_config_html | default: site.remark_presentation_config_html | default: "" | url_encode | replace: "+", " " | jsonify
+            }}
+        ));
+
+        // If another layout extends this layout,
+        presentationDoc.write(unescape(
+            {{ layout.remark_presentation_config_html | default: "" | url_encode | replace: "+", " " | jsonify }}
+        ));
+
         presentationDoc.write(`
             <${"script"}>
             if (window.MERMAID_CONFIG) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Henry Heino
@@ -48,6 +48,7 @@ files:
 - _includes/settings.html
 - _layouts/calendar.html
 - _layouts/default.html
+- _layouts/example_custom_remark_slideshow.html
 - _layouts/home.html
 - _layouts/page.html
 - _layouts/post.html