@abreen/tada 1.15.10 → 1.15.12

package/build/utils/code.ts

@@ -7,6 +7,7 @@ import { getExtensionToShikiLanguage } from '../site-variables';
 import { highlightCode } from './shiki-highlighter';
 import externalLinksPlugin from '../external-links-plugin';
 import { createApplyBasePath } from './paths';
+import katexPlugin from './katex';
 import { splitLines } from './literate-java';
 import type { JavaTocEntry, SiteVariables } from '../types';
 
@@ -40,10 +41,9 @@ const log = makeLogger(import.meta.url);
 const PROSE_LINE = /^\s*\/\/\/(\s|$)/;
 
 function createCodeMarkdown(siteVariables: SiteVariables): MarkdownIt {
-  return new MarkdownIt({ html: true, typographer: true }).use(
-    externalLinksPlugin,
-    siteVariables,
-  );
+  return new MarkdownIt({ html: true, typographer: true })
+    .use(externalLinksPlugin, siteVariables)
+    .use(katexPlugin);
 }
 
 // Matches Markdown links: [text](url)

package/build/utils/katex.ts

@@ -0,0 +1,37 @@
+import type MarkdownIt from 'markdown-it';
+import Token from 'markdown-it/lib/token.mjs';
+import markdownItKatex from '@vscode/markdown-it-katex';
+import katex from 'katex';
+import renderA11yString from 'katex/contrib/render-a11y-string';
+
+export default function katexPlugin(markdown: MarkdownIt): void {
+  markdown.use(markdownItKatex);
+
+  // The @vscode/markdown-it-katex plugin's renderers swallow errors thrown
+  // by katex.renderToString() and return error HTML instead of propagating
+  // the exception. Override the renderers so parse errors fail the build.
+  // The plugin's tokenizer ($ and $$ delimiter parsing) is kept.
+  // Each renderer also adds an aria-label with a screen-reader-friendly
+  // description generated by katex/contrib/render-a11y-string.
+  markdown.renderer.rules.math_inline = (tokens: Token[], idx: number) => {
+    const latex = tokens[idx].content;
+    const html = katex.renderToString(latex, { throwOnError: true });
+    const a11y = markdown.utils.escapeHtml(renderA11yString(latex));
+    return html.replace(
+      '<span class="katex">',
+      `<span class="katex" aria-label="${a11y}">`,
+    );
+  };
+  const katexBlockRenderer = (tokens: Token[], idx: number) => {
+    const latex = tokens[idx].content;
+    const html = katex.renderToString(latex, {
+      throwOnError: true,
+      displayMode: true,
+    });
+    const a11y = markdown.utils.escapeHtml(renderA11yString(latex));
+    return `<p class="katex-block" aria-label="${a11y}">` + html + `</p>\n`;
+  };
+  markdown.renderer.rules.math_block = katexBlockRenderer;
+  markdown.renderer.rules.math_inline_block = katexBlockRenderer;
+  markdown.renderer.rules.math_inline_bare_block = katexBlockRenderer;
+}

package/build/utils/markdown-partials.ts

@@ -104,7 +104,7 @@ function tokenizePartialContent(
 
   try {
     const childState = new state.md.block.State(
-      content,
+      content.replace(/\r\n?/g, '\n'),
       state.md,
       state.env,
       state.tokens,

package/build/utils/markdown.ts

@@ -15,9 +15,7 @@ import deflistIdPlugin from '../deflist-id-plugin';
 import externalLinksPlugin from '../external-links-plugin';
 import { tocPlugin } from '../toc-plugin';
 import columnsPlugin from '../columns-plugin';
-import markdownItKatex from '@vscode/markdown-it-katex';
-import katex from 'katex';
-import renderA11yString from 'katex/contrib/render-a11y-string';
+import katexPlugin from './katex';
 import markdownPartialsPlugin from './markdown-partials';
 import type { RenderDependencyCollector, SiteVariables } from '../types';
 
@@ -81,7 +79,7 @@ export function createMarkdown(
     .use(externalLinksPlugin, siteVariables)
     .use(tocPlugin)
     .use(columnsPlugin)
-    .use(markdownItKatex)
+    .use(katexPlugin)
     .use(markdownItContainer, 'details', {
       marker: '<',
       validate: function (params: string) {
@@ -476,34 +474,6 @@ export function createMarkdown(
     state.tokens = transformedTokens;
   });
 
-  // The @vscode/markdown-it-katex plugin's renderers swallow errors thrown
-  // by katex.renderToString() and return error HTML instead of propagating
-  // the exception. Override the renderers so parse errors fail the build.
-  // The plugin's tokenizer ($ and $$ delimiter parsing) is kept.
-  // Each renderer also adds an aria-label with a screen-reader-friendly
-  // description generated by katex/contrib/render-a11y-string.
-  markdown.renderer.rules.math_inline = (tokens: Token[], idx: number) => {
-    const latex = tokens[idx].content;
-    const html = katex.renderToString(latex, { throwOnError: true });
-    const a11y = markdown.utils.escapeHtml(renderA11yString(latex));
-    return html.replace(
-      '<span class="katex">',
-      `<span class="katex" aria-label="${a11y}">`,
-    );
-  };
-  const katexBlockRenderer = (tokens: Token[], idx: number) => {
-    const latex = tokens[idx].content;
-    const html = katex.renderToString(latex, {
-      throwOnError: true,
-      displayMode: true,
-    });
-    const a11y = markdown.utils.escapeHtml(renderA11yString(latex));
-    return `<p class="katex-block" aria-label="${a11y}">` + html + `</p>\n`;
-  };
-  markdown.renderer.rules.math_block = katexBlockRenderer;
-  markdown.renderer.rules.math_inline_block = katexBlockRenderer;
-  markdown.renderer.rules.math_inline_bare_block = katexBlockRenderer;
-
   const usedIds = new Map<string, number>();
   markdown.use(markdownItContainer, 'alert', {
     marker: '!',

package/build/utils/render.ts

@@ -359,13 +359,10 @@ export function renderCodePageAsset({
     isWatchMode: isWatchMode(assetFiles),
   });
 
+  const templateHtml = render('code.html', templateParameters) as string;
   const finalized = finalizeHtmlPage({
     filePath,
-    html: injectAssetTags(
-      render('code.html', templateParameters) as string,
-      assetFiles,
-      distDir,
-    ),
+    html: preparePageTemplateHtml({ templateHtml, assetFiles, distDir }),
     siteVariables,
     sourceUrlPath,
     validInternalTargets,

package/init/content/lectures/01/Rectangle.java

@@ -6,6 +6,8 @@
 /// See [`rectangle.py`](./rectangle.py) for a Python version of this class.
 ///
 /// Here's `vars.foobar`: <%= vars.foobar %>
+///
+/// Here's some LaTeX: $\frac{n(n-1)}{2}$ is $O(n^2)$
 public class Rectangle {
     private int width;
     private int height;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.15.10",
+  "version": "1.15.12",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",

package/src/index.ts

@@ -3,7 +3,7 @@ import './style.scss';
 import './anchor/style.scss';
 import './code.scss';
 import './code/style.scss';
-import './literate/style.scss';
+import './literate.scss';
 import './header/style.scss';
 import './print/style.scss';
 import './question/style.scss';