fossbook 0.2.0 → 0.2.2

package/README.md

@@ -176,6 +176,12 @@ Fossbook generates a separate static page for each available language. The
 browser loads only the selected language page; changing languages follows a
 normal link and does not require JavaScript.
 
+When a reader uses the language switcher, Fossbook remembers that choice in
+the browser. A later visit to the default-language homepage redirects to the
+remembered language's homepage. Direct links to posts and other pages are
+never redirected, and language links continue to work when browser storage is
+unavailable.
+
 ### Configuration
 
 Add the languages supported by the site to `fossbook.config.js`:

package/lib/mod/marked.js

@@ -1,6 +1,71 @@
 const marked = require("marked");
 const hljs = require("highlight.js");
 
+function escapeAttribute(value) {
+  return value
+    .replace(/&/g, "&")
+    .replace(/"/g, """)
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+}
+
+function parsePanelAttributes(source) {
+  const attributes = {};
+  const attributePattern = /([a-z][a-z-]*)="([^"]*)"/gy;
+  let offset = 0;
+
+  while (offset < source.length) {
+    while (source[offset] === " " || source[offset] === "\t") offset += 1;
+    if (offset === source.length) break;
+
+    attributePattern.lastIndex = offset;
+    const match = attributePattern.exec(source);
+    if (!match) throw new Error(`Invalid panels attribute near: ${source.slice(offset)}`);
+    if (match[1] !== "columns" && match[1] !== "label") {
+      throw new Error(`Unsupported panels attribute: ${match[1]}`);
+    }
+    if (Object.hasOwn(attributes, match[1])) {
+      throw new Error(`Duplicate panels attribute: ${match[1]}`);
+    }
+    attributes[match[1]] = match[2];
+    offset = attributePattern.lastIndex;
+  }
+
+  const columns = attributes.columns === undefined ? 2 : Number(attributes.columns);
+  if (!Number.isInteger(columns) || columns < 1 || columns > 6) {
+    throw new Error("Panel columns must be an integer from 1 to 6");
+  }
+
+  return { columns, label: attributes.label };
+}
+
+const panelsExtension = {
+  name: "panels",
+  level: "block",
+  start(source) {
+    return source.match(/^:::panels(?:[ \t]|$)/m)?.index;
+  },
+  tokenizer(source) {
+    const match = /^:::panels([^\n]*)\n([\s\S]*?)\n:::(?:\n|$)/.exec(source);
+    if (!match) return undefined;
+
+    const attributes = parsePanelAttributes(match[1].trim());
+    return {
+      type: "panels",
+      raw: match[0],
+      columns: attributes.columns,
+      label: attributes.label,
+      tokens: this.lexer.blockTokens(match[2]),
+    };
+  },
+  renderer(token) {
+    const label = token.label
+      ? ` role="group" aria-label="${escapeAttribute(token.label)}"`
+      : "";
+    return `<div class="panel-group" style="--panel-columns: ${token.columns};"${label}>\n${this.parser.parse(token.tokens)}</div>\n`;
+  },
+};
+
 marked.setOptions({
   renderer: new marked.Renderer(),
   pedantic: false,
@@ -66,7 +131,7 @@ const renderer = {
     // Construct the image tag with optional size and title
     let imageTag = `<img src="${href}" alt="${text}"`;
     if (size) {
-      imageTag += ` style="width: ${size};"`;
+      imageTag += ` class="sized-image" style="width: ${size};"`;
     }
     imageTag += ">";
 
@@ -114,6 +179,7 @@ const renderer = {
 };
 
 marked.use({
+  extensions: [panelsExtension],
   renderer,
   hooks: {
     postprocess(html) {

package/lib/mod/page_base.js

@@ -48,6 +48,47 @@ module.exports = class PageBase {
     return `<nav class="language-switcher" aria-label="Languages">${links.join("")}</nav>`;
   }
 
+  languagePreference(redirectFromDefaultHome = false) {
+    if (this.translations.length < 2) return "";
+
+    const supportedLanguages = this.translations.map((translation) => translation.language);
+    const languagePaths = Object.fromEntries(
+      this.translations.map((translation) => [
+        translation.language,
+        translation.path || translation.url,
+      ]),
+    );
+    const shouldRedirect =
+      redirectFromDefaultHome && this.config.language === this.config.defaultLanguage;
+
+    return `<script>
+          (() => {
+            const storageKey = "fossbook-language";
+            const supportedLanguages = ${JSON.stringify(supportedLanguages).replace(/</g, "\\u003c")};
+            const languagePaths = ${JSON.stringify(languagePaths).replace(/</g, "\\u003c")};
+            try {
+              ${shouldRedirect ? `const preferredLanguage = localStorage.getItem(storageKey);
+              if (preferredLanguage && preferredLanguage !== ${JSON.stringify(this.config.language)} && supportedLanguages.includes(preferredLanguage)) {
+                location.replace(languagePaths[preferredLanguage]);
+                return;
+              }` : ""}
+              document.addEventListener("DOMContentLoaded", () => {
+                document.querySelectorAll('.language-switcher a[hreflang]').forEach((link) => {
+                  link.addEventListener("click", () => {
+                    const language = link.getAttribute("hreflang");
+                    if (supportedLanguages.includes(language)) {
+                      try {
+                        localStorage.setItem(storageKey, language);
+                      } catch (error) {}
+                    }
+                  });
+                });
+              });
+            } catch (error) {}
+          })();
+        </script>`;
+  }
+
   googleAnalytics(trackingId) {
     return `<script async src="https://www.googletagmanager.com/gtag/js?id=${trackingId}"></script>
         <script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fossbook",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A lightweight static blog site generator for GitHub Pages",
   "main": "lib/index.js",
   "scripts": {

package/themes/archie/assets/styles/main.css

@@ -223,6 +223,46 @@
   figure img {
     max-height: 500px;
   }
+
+  .panel-group {
+    display: grid;
+    grid-template-columns: repeat(var(--panel-columns), minmax(0, 1fr));
+    gap: 1.5rem;
+    align-items: start;
+    margin: 1.5rem 0;
+  }
+
+  .panel-group .image-container,
+  .panel-group figure {
+    min-width: 0;
+    width: 100%;
+  }
+
+  .panel-group figure {
+    display: block;
+    padding: 0;
+  }
+
+  .panel-group img {
+    display: block;
+    height: auto;
+    width: 100%;
+  }
+
+  .panel-group figcaption {
+    margin-top: 0.75rem;
+    text-align: center;
+  }
+
+  @media screen and (max-width: 599px) {
+    .panel-group {
+      grid-template-columns: 1fr;
+    }
+
+    .sized-image {
+      width: 100% !important;
+    }
+  }
   
   @media screen and (min-width: 600px) {
     figure {

package/themes/archie/layouts/all_posts.html

@@ -12,6 +12,7 @@
         <title>${page.config.blogName}: ${data.pageTitle}</title>
         <link rel="canonical" href="${page.url}" />
         ${page.alternateLanguageLinks()}
+        ${page.languagePreference()}
         ${page.openGraph("website")}
     </head>
     <body>

package/themes/archie/layouts/home.html

@@ -12,6 +12,7 @@
         <meta name="description" content="${page.config.blogDescription}" />
         <link rel="canonical" href="${page.url}" />
         ${page.alternateLanguageLinks()}
+        ${page.languagePreference(data.prev === null)}
         ${page.openGraph("website")}
         <!-- Twitter Card -->
         ${page.twitterCard("summary")}

package/themes/archie/layouts/page.html

@@ -13,6 +13,7 @@
         <meta name="description" content="${page.config.blogDescription}" />
         <link rel="canonical" href="${page.url}" />
         ${page.alternateLanguageLinks()}
+        ${page.languagePreference()}
         ${page.openGraph("website")}
 
         <meta name="twitter:card" content="summary_large_image" />

package/themes/archie/layouts/post.html

@@ -16,6 +16,7 @@
         <meta name="description" content="${page.description}" />
         <link rel="canonical" href="${page.url}" />
         ${page.alternateLanguageLinks()}
+        ${page.languagePreference()}
 
         ${page.openGraph(
           "article",

package/themes/archie/layouts/tag.html

@@ -10,6 +10,7 @@
         <!-- Google tag (gtag.js) -->
         ${page.config.googleAnalyticsID ? page.googleAnalytics(page.config.googleAnalyticsID) : ""}
         <title>${page.config.blogName}: Entries tagged - ${data.tag}</title>
+        ${page.languagePreference()}
         ${page.openGraph("website")}
     </head>
     <body>

package/themes/archie/layouts/tag_list.html

@@ -13,6 +13,7 @@
         <title>${page.config.blogName}: ${data.pageTitle}</title>
         <link rel="canonical" href="${page.url}" />
         ${page.alternateLanguageLinks()}
+        ${page.languagePreference()}
         ${page.openGraph("website")}
     </head>
     <body>