@earendil-works/pi-tui 0.84.0 → 0.84.1

package/dist/latex.js

@@ -283,6 +283,89 @@ const DISPLAY_LIMIT_SYMBOLS = new Set([
     "prod",
     "sum",
 ]);
+const RELATION_COMMANDS = new Set([
+    "Leftarrow",
+    "Leftrightarrow",
+    "Longleftarrow",
+    "Longleftrightarrow",
+    "Longrightarrow",
+    "Rightarrow",
+    "Vdash",
+    "Vvdash",
+    "approx",
+    "asymp",
+    "cong",
+    "dashv",
+    "doteq",
+    "downarrow",
+    "equiv",
+    "ge",
+    "geq",
+    "geqslant",
+    "gets",
+    "gg",
+    "hookleftarrow",
+    "hookrightarrow",
+    "iff",
+    "implies",
+    "in",
+    "leadsto",
+    "le",
+    "leftarrow",
+    "leftharpoondown",
+    "leftharpoonup",
+    "leftrightarrow",
+    "leftrightharpoons",
+    "leq",
+    "leqslant",
+    "ll",
+    "longleftarrow",
+    "longleftrightarrow",
+    "longmapsto",
+    "longrightarrow",
+    "mapsto",
+    "mid",
+    "models",
+    "ne",
+    "nearrow",
+    "neq",
+    "ni",
+    "notin",
+    "nvdash",
+    "nvDash",
+    "nwarrow",
+    "parallel",
+    "perp",
+    "prec",
+    "preceq",
+    "propto",
+    "rightharpoondown",
+    "rightharpoonup",
+    "rightleftharpoons",
+    "rightarrow",
+    "rightsquigarrow",
+    "searrow",
+    "sim",
+    "simeq",
+    "sqsubset",
+    "sqsubseteq",
+    "sqsupset",
+    "sqsupseteq",
+    "subset",
+    "subseteq",
+    "succ",
+    "succeq",
+    "supset",
+    "supseteq",
+    "swarrow",
+    "to",
+    "triangleleft",
+    "triangleright",
+    "twoheadleftarrow",
+    "twoheadrightarrow",
+    "uparrow",
+    "vdash",
+]);
 const NEGATED_SYMBOLS = {
     "<": "≮",
     ">": "≯",
@@ -504,7 +587,7 @@ function replaceCharacters(value, replacements) {
 function formatScript(value, kind) {
     value = value.trim();
     const replacements = kind === "sub" ? SUBSCRIPTS : SUPERSCRIPTS;
-    const unicode = replaceCharacters(value, replacements);
+    const unicode = replaceCharacters(value.replace(/\s*([=+-])\s*/g, "$1"), replacements);
     if (unicode !== undefined) {
         return unicode;
     }
@@ -525,8 +608,16 @@ function formatRoot(value, symbol = "√") {
     value = value.trim();
     return /^[\p{L}\p{N}.]+$/u.test(value) ? `${symbol}${value}` : `${symbol}(${value})`;
 }
+const NAMED_OPERATOR_START = "\u{f0004}";
+const NAMED_OPERATOR_END = "\u{f0005}";
+const NAMED_OPERATOR_LEFT_SPACING_PATTERN = /(?<=[\p{L}\p{N})\]}\u{f0001}])\u{f0004}/gu;
+const NAMED_OPERATOR_RIGHT_SPACING_PATTERN = /\u{f0005}(?=[\p{L}\p{N}√\u{f0000}])/gu;
 function normalizeOutput(value) {
     return value
+        .replace(NAMED_OPERATOR_LEFT_SPACING_PATTERN, " ")
+        .replaceAll(NAMED_OPERATOR_START, "")
+        .replace(NAMED_OPERATOR_RIGHT_SPACING_PATTERN, " ")
+        .replaceAll(NAMED_OPERATOR_END, "")
         .split("\n")
         .map((line) => line.replace(/[ \t]+/g, " ").trim())
         .filter((line, index, lines) => line.length > 0 || (index > 0 && index < lines.length - 1))
@@ -536,7 +627,8 @@ function normalizeOutput(value) {
 const LAYOUT_MARKER_START = "\u{f0000}";
 const LAYOUT_MARKER_END = "\u{f0001}";
 const LAYOUT_MARKER_PATTERN = /\u{f0000}(\d+)\u{f0001}/gu;
-const PROTECTED_SPACE = "\u00a0";
+const TRAILING_LAYOUT_MARKER_PATTERN = /\u{f0000}(\d+)\u{f0001}$/u;
+const PROTECTED_SPACE = "\u{f0002}";
 function padLayoutLine(line, width, centered = false) {
     const padding = Math.max(0, width - visibleWidth(line));
     const left = centered ? Math.floor(padding / 2) : 0;
@@ -572,18 +664,25 @@ function renderLayout(source, nodes) {
     for (const sourceLine of source.split("\n")) {
         const layouts = [];
         let position = 0;
-        let previousWasNode = false;
+        let previousNode;
         for (const match of sourceLine.matchAll(LAYOUT_MARKER_PATTERN)) {
             const index = match.index;
-            if (index > position) {
-                const sliced = sourceLine.slice(position, index);
-                const text = (previousWasNode ? sliced.trimStart() : sliced).trimEnd();
-                layouts.push({ lines: [text], width: visibleWidth(text), baseline: 0 });
-            }
             const node = nodes[Number(match[1])];
             if (!node) {
                 continue;
             }
+            if (index > position) {
+                const sliced = sourceLine.slice(position, index);
+                const trimmed = (previousNode ? sliced.trimStart() : sliced).trimEnd();
+                const preserveLeadingSpace = previousNode?.type === "matrix" && /^\s/.test(sliced);
+                const preserveTrailingSpace = node.type === "matrix" && /\s$/.test(sliced);
+                const text = trimmed
+                    ? `${preserveLeadingSpace ? " " : ""}${trimmed}${preserveTrailingSpace ? " " : ""}`
+                    : preserveLeadingSpace || preserveTrailingSpace
+                        ? " "
+                        : "";
+                layouts.push({ lines: [text], width: visibleWidth(text), baseline: 0 });
+            }
             if (node.type === "fraction") {
                 const numerator = renderLayout(node.numerator, nodes);
                 const denominator = renderLayout(node.denominator, nodes);
@@ -599,7 +698,7 @@ function renderLayout(source, nodes) {
                     baseline: numerator.lines.length,
                 });
             }
-            else {
+            else if (node.type === "operator") {
                 const contentWidth = Math.max(visibleWidth(node.operator), node.lower === undefined ? 0 : visibleWidth(node.lower), node.upper === undefined ? 0 : visibleWidth(node.upper));
                 const lines = [];
                 if (node.upper !== undefined) {
@@ -615,12 +714,21 @@ function renderLayout(source, nodes) {
                     baseline: node.upper === undefined ? 0 : 1,
                 });
             }
+            else {
+                const width = Math.max(0, ...node.lines.map((line) => visibleWidth(line)));
+                layouts.push({
+                    lines: node.lines.map((line) => padLayoutLine(line, width)),
+                    width,
+                    baseline: node.baseline,
+                });
+            }
             position = index + match[0].length;
-            previousWasNode = true;
+            previousNode = node;
         }
         if (position < sourceLine.length) {
             const sliced = sourceLine.slice(position);
-            const text = previousWasNode ? sliced.trimStart() : sliced;
+            const trimmed = previousNode ? sliced.trimStart() : sliced;
+            const text = previousNode?.type === "matrix" && /^\s/.test(sliced) ? ` ${trimmed}` : trimmed;
             layouts.push({ lines: [text], width: visibleWidth(text), baseline: 0 });
         }
         const lineLayout = joinLayouts(layouts);
@@ -638,12 +746,14 @@ function renderLayout(source, nodes) {
 class LatexParser {
     source;
     layoutNodes;
+    display;
     position = 0;
     supported = true;
     stackFractions = true;
-    constructor(source, layoutNodes) {
+    constructor(source, layoutNodes, display) {
         this.source = source;
         this.layoutNodes = layoutNodes;
+        this.display = display;
     }
     render() {
         const rendered = this.parseSequence();
@@ -673,6 +783,9 @@ class LatexParser {
                 const command = this.parseCommand();
                 if (command === NEGATIVE_SPACE) {
                     result = result.trimEnd();
+                    if (result.endsWith(NAMED_OPERATOR_END)) {
+                        result = result.slice(0, -NAMED_OPERATOR_END.length);
+                    }
                 }
                 else {
                     result += command;
@@ -682,13 +795,24 @@ class LatexParser {
             if (character === "^" || character === "_") {
                 this.position++;
                 result = result.trimEnd();
-                result += formatScript(this.parseRequiredArgument(false), character === "_" ? "sub" : "sup");
+                const script = formatScript(this.parseRequiredArgument(false), character === "_" ? "sub" : "sup");
+                if (result.endsWith(NAMED_OPERATOR_END)) {
+                    result = `${result.slice(0, -NAMED_OPERATOR_END.length)}${script}${NAMED_OPERATOR_END}`;
+                }
+                else {
+                    result += script;
+                }
                 continue;
             }
             if (/\s/.test(character)) {
                 result += this.parseWhitespace();
                 continue;
             }
+            if (character === "=" || character === "<" || character === ">") {
+                result = `${result.trimEnd()} ${character} `;
+                this.position++;
+                continue;
+            }
             if (character === "&") {
                 this.position++;
                 continue;
@@ -698,6 +822,16 @@ class LatexParser {
                 result += " ";
                 continue;
             }
+            if (character === ".") {
+                const marker = TRAILING_LAYOUT_MARKER_PATTERN.exec(result);
+                const node = marker ? this.layoutNodes[Number(marker[1])] : undefined;
+                if (node?.type === "matrix") {
+                    const lastLine = node.lines.length - 1;
+                    node.lines[lastLine] = `${node.lines[lastLine] ?? ""}${character}`;
+                    this.position++;
+                    continue;
+                }
+            }
             result += character;
             this.position++;
         }
@@ -759,24 +893,27 @@ class LatexParser {
             const value = this.parseRequiredArgument(false).trim();
             const negated = NEGATED_SYMBOLS[value];
             if (negated !== undefined) {
-                return negated;
+                return ` ${negated} `;
             }
             const characters = Array.from(value);
             if (characters.length === 0) {
                 this.supported = false;
                 return "";
             }
-            return `${characters[0]}\u0338${characters.slice(1).join("")}`;
+            return ` ${characters[0]}\u0338${characters.slice(1).join("")} `;
         }
         if (LIMIT_OPERATORS.has(command)) {
             return this.parseOperator(command, "bracket", true, true);
         }
         const symbol = SYMBOLS[command];
         if (symbol !== undefined) {
-            return DISPLAY_LIMIT_SYMBOLS.has(command) ? this.parseOperator(symbol, "script", true) : symbol;
+            if (DISPLAY_LIMIT_SYMBOLS.has(command)) {
+                return this.parseOperator(symbol, "script", true);
+            }
+            return command === "cdot" || command === "times" || RELATION_COMMANDS.has(command) ? ` ${symbol} ` : symbol;
         }
         if (NAMED_OPERATORS.has(command)) {
-            return ` ${command} `;
+            return `${NAMED_OPERATOR_START}${command}${NAMED_OPERATOR_END}`;
         }
         if (SIZE_COMMANDS.has(command)) {
             return "";
@@ -788,10 +925,10 @@ class LatexParser {
             return "";
         }
         if (command === "frac" || command === "dfrac" || command === "tfrac") {
-            const shouldStack = this.layoutNodes !== undefined && this.stackFractions && command !== "tfrac";
+            const shouldStack = this.display && this.stackFractions && command !== "tfrac";
             const numerator = this.parseRequiredArgument(!shouldStack);
             const denominator = this.parseRequiredArgument(!shouldStack);
-            if (shouldStack && this.layoutNodes) {
+            if (shouldStack) {
                 const index = this.layoutNodes.push({
                     type: "fraction",
                     numerator: normalizeOutput(numerator),
@@ -906,7 +1043,7 @@ class LatexParser {
                 upper = value;
             }
         }
-        if (this.layoutNodes && useDisplayLimits && (lower !== undefined || upper !== undefined)) {
+        if (this.display && useDisplayLimits && (lower !== undefined || upper !== undefined)) {
             const index = this.layoutNodes.push({ type: "operator", operator, lower, upper }) - 1;
             return `${LAYOUT_MARKER_START}${index}${LAYOUT_MARKER_END}`;
         }
@@ -1065,34 +1202,37 @@ class LatexParser {
             const cell = row[column] ?? "";
             return `${cell}${PROTECTED_SPACE.repeat(Math.max(0, (columnWidths[column] ?? 0) - visibleWidth(cell)))}`;
         }).join(" │ "));
+        let lines;
         if (environment === "array" || environment === "matrix" || environment === "smallmatrix") {
-            return rows.join("\n");
-        }
-        const delimiters = {
-            pmatrix: ["⎛", "⎞", "⎜", "⎟", "⎝", "⎠"],
-            bmatrix: ["⎡", "⎤", "⎢", "⎥", "⎣", "⎦"],
-            Bmatrix: ["⎧", "⎫", "⎨", "⎬", "⎩", "⎭"],
-            vmatrix: ["│", "│", "│", "│", "│", "│"],
-            Vmatrix: ["║", "║", "║", "║", "║", "║"],
-        };
-        const delimiter = delimiters[environment];
-        if (!delimiter) {
-            this.supported = false;
-            return rows.join("\n");
-        }
-        if (rows.length === 1) {
-            return `${delimiter[0]} ${rows[0]} ${delimiter[1]}`;
-        }
-        return rows
-            .map((row, index) => {
-            const left = index === 0 ? delimiter[0] : index === rows.length - 1 ? delimiter[4] : delimiter[2];
-            const right = index === 0 ? delimiter[1] : index === rows.length - 1 ? delimiter[5] : delimiter[3];
-            return `${left} ${row} ${right}`;
-        })
-            .join("\n");
+            lines = rows;
+        }
+        else {
+            const delimiters = {
+                pmatrix: ["⎛", "⎞", "⎜", "⎟", "⎝", "⎠"],
+                bmatrix: ["⎡", "⎤", "⎢", "⎥", "⎣", "⎦"],
+                Bmatrix: ["⎧", "⎫", "⎨", "⎬", "⎩", "⎭"],
+                vmatrix: ["│", "│", "│", "│", "│", "│"],
+                Vmatrix: ["║", "║", "║", "║", "║", "║"],
+            };
+            const delimiter = delimiters[environment];
+            if (!delimiter) {
+                this.supported = false;
+                return rows.join("\n");
+            }
+            lines = rows.map((row, index) => {
+                const left = index === 0 ? delimiter[0] : index === rows.length - 1 ? delimiter[4] : delimiter[2];
+                const right = index === 0 ? delimiter[1] : index === rows.length - 1 ? delimiter[5] : delimiter[3];
+                return `${left} ${row} ${right}`;
+            });
+        }
+        if (lines.length <= 1) {
+            return lines[0] ?? "";
+        }
+        const index = this.layoutNodes.push({ type: "matrix", lines, baseline: 0 }) - 1;
+        return `${LAYOUT_MARKER_START}${index}${LAYOUT_MARKER_END}`;
     }
     renderNested(source, stackFractions = true) {
-        const rendered = new LatexParser(source, stackFractions ? this.layoutNodes : undefined).render();
+        const rendered = new LatexParser(source, this.layoutNodes, this.display && stackFractions).render();
         if (rendered === undefined) {
             this.supported = false;
             return source;
@@ -1105,12 +1245,12 @@ class LatexParser {
  * Returns undefined when the expression contains unsupported or malformed syntax.
  */
 export function renderLatex(source, options = {}) {
-    const layoutNodes = options.display ? [] : undefined;
-    const rendered = new LatexParser(source, layoutNodes).render();
+    const layoutNodes = [];
+    const rendered = new LatexParser(source, layoutNodes, options.display === true).render();
     if (rendered === undefined) {
         return undefined;
     }
-    if (!layoutNodes || layoutNodes.length === 0) {
+    if (layoutNodes.length === 0) {
         return rendered.replaceAll(PROTECTED_SPACE, " ");
     }
     const lines = renderLayout(rendered, layoutNodes).lines;