hematite 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d695f60bf686920b70204b57a6938283468f63be8ba35467bff6db792fbed6af
-  data.tar.gz: d5b505891fb8bb9be670d61454b8c80e5c0ac7463d22fbeba4244ceea9692a78
+  metadata.gz: 35584fa03a622c59a4b30f481935571355857bd0095c31f9884d97f26b41ba0d
+  data.tar.gz: dd0e32bd5dfdc7041898a6e2d6eec06854ec1d772756ff447a0ae71fe576595e
 SHA512:
-  metadata.gz: 1f67a7e799a1a0bf26222a9fb9891e8265bf70d1f2e5210cdc85d0e293499c6da68ed589c401ab754ff30588d81eb8a3923a104b2343569539f01d95f0f80d39
-  data.tar.gz: e8c5c1dcde0d2f9087a251658e5a7e5eb15dd97f2a8ac31bdeb2147fad6fac8f609d42a96d85bb36964c6f43511baa0cc5202cdd3335a11dadb8fb2729d5e398
+  metadata.gz: 6fd8ce2ca17d3826b982a2e289d6d1e9386245258e5263d587edf53ef90efc3c9c765587ebf5d1a45435d37469c56c43a6f6039eac591767ba5ebb5a9e0d29c6
+  data.tar.gz: 736c44dbaaddbb632f377b214f8b4dc5a43b872198b64dcb06fad06d8b0b573a6e0b3a2d443c9840b6ce9cfc82ba6c7e7ae3a780bff747cdff2262999563fbbe

data/_includes/extern_library_imports.html

@@ -8,4 +8,40 @@
 
 <!-- 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 %}
+
+    {% if target.context and target.context != include.context %}
+    {% else %}
+    <{{ tag }} {{ options }}
+        {{ target.inline_options | default: "" }}
+        {{url_spec}}={{ url | jsonify }}
+        onload={{ target.onload | default: "" | jsonify }}></{{tag}}>
+    {% endif %}
+{% 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,47 @@
+---
+layout: remark_slideshow
+additional_imports:
+    katex:
+        type: js
+        url: /assets/plugin/katex/katex.min.js
+        context: remark_frame
+        comment: >-
+            Setting context to remark_frame means to only run this
+            in the remark-specific iframe.
+    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... This should be included at the top of the file.
+---
+
+{% 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

@@ -32,7 +32,7 @@ layout: default
 <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*/;
+    const WRAPPING_DIV_EXP = /^\s*[<]div.*[>]((?:.|[\n\r])*)[<]\/div[>]\s*$/;
 
     import slideshow from "{{ 'assets/js/layout/remark_slideshow.mjs' | relative_url }}";
 
@@ -40,16 +40,24 @@ layout: default
     presentationFrame.src = {{ frame_resource_url | jsonify }};
     window.presentationFrameLoaded = false;
 
-    let config =
-        {{ page.remark_presentation_config | default: site.remark_presentation_config | jsonify }};
-    config ??= {};
+
+    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];
+        }
+    }
 
     // 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);
-    console.log(markdownDisableMatches, config.source);
 
     // Replace with first capture (contents of the wrapping element).
     if (markdownDisableMatches && markdownDisableMatches.length > 0) {
@@ -59,7 +67,7 @@ layout: default
     // Library imports intended for this page: Forward to the frame.
     let libraryImports = unescape(`
         {% capture library_imports %}
-            {% include extern_library_imports.html %}
+            {% include extern_library_imports.html context='remark_frame' %}
         {% endcapture %}
         {{ library_imports | url_encode | replace: "+", " " }}
     `);
@@ -82,7 +90,14 @@ layout: default
 
         // Any additional configuration scripts/html specific to remark
         presentationDoc.write(unescape(
-            {{ page.remark_presentation_config_html | default: "" | url_encode | replace: "+", " " | jsonify }}
+            {{
+                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(`
@@ -94,8 +109,8 @@ layout: default
             }
             </${"script"}>
         `);
-        presentationDoc.close();
-        (async () => {
+
+        presentationWin.initPresentation = (async () => {
             await slideshow.start(presentationFrame.contentWindow, config);
 
             // Ensure that mermaid has already been run!
@@ -103,7 +118,14 @@ layout: default
                 presentationWin.mermaid.init();
                 console.log("Ran mermaid!");
             }
-        })();
+        });
+
+        presentationDoc.write(`
+            <${"script"}>
+                window.initPresentation();
+            </${"script"}>
+        `);
+        presentationDoc.close();
     };
 
     if (window.presentationFrameLoaded) {
@@ -112,4 +134,6 @@ layout: default
     else {
         presentationFrame.onload = initSlides;
     }
+
+    document.documentElement.classList.add("slideshow-mode");
 </script>

data/_sass/_layout.scss

@@ -169,6 +169,17 @@ main.slideshow-mode {
     }
 }
 
+// Make the main content large enough that the sidebar doesn't
+// auto-expand.
+:root.slideshow-mode {
+    .main-container {
+        max-width: 100vw;
+
+        // Transition immediately!
+        transition: width 0s ease, max-width 0s ease;
+    }
+}
+
 // On mobile devices,
 @media screen and (max-width: $site-content-preferred-width) {
     .main-container {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 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