js.documents 14.4.5 → 14.4.6

package/dist/edit/pptx/scaffold.cjs

@@ -4,6 +4,7 @@ const require_opc_content_types = require("../../opc/content-types.cjs");
 const require_opc_paths = require("../../opc/paths.cjs");
 const require_opc_rels = require("../../opc/rels.cjs");
 const require_opc_core_properties = require("../../opc/core-properties.cjs");
+let ooxml_js = require("ooxml.js");
 //#region src/edit/pptx/scaffold.ts
 const CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types";
 const RELS_NS = "http://schemas.openxmlformats.org/package/2006/relationships";
@@ -189,9 +190,10 @@ function ensureNotesMaster(pkg) {
 	const presentationPart = pkg.parts[PRESENTATION_PART_PATH];
 	const presentationElement = presentationPart?.kind === "xml" ? presentationPart.nodes.find((n) => n.type === "element") : void 0;
 	if (presentationElement === void 0) throw new Error("ensureNotesMaster: package has no ppt/presentation.xml element");
-	const sldMasterIdLstIndex = presentationElement.children.findIndex((c) => c.type === "element" && c.tag === "p:sldMasterIdLst");
+	const sldMasterIdLst = (0, ooxml_js.childrenWithTag)(presentationElement, "p:sldMasterIdLst")[0];
+	const sldMasterIdLstIndex = presentationElement.children.findIndex((child) => child === sldMasterIdLst);
 	const notesMasterIdLst = require_xml_fragment.el("p:notesMasterIdLst", {}, [require_xml_fragment.el("p:notesMasterId", { "r:id": relId })]);
-	presentationElement.children.splice(sldMasterIdLstIndex === -1 ? 0 : sldMasterIdLstIndex + 1, 0, notesMasterIdLst);
+	presentationElement.children.splice(sldMasterIdLstIndex + 1, 0, notesMasterIdLst);
 	return NOTES_MASTER_PART_PATH;
 }
 function createEmptyPptxPackage(options) {
@@ -214,6 +216,10 @@ function createEmptyPptxPackage(options) {
 		Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
 		Target: PRESENTATION_PART_PATH
 	})]);
+	const presentation = require_xml_fragment.el("p:presentation", {
+		"xmlns:p": PML_NS,
+		"xmlns:r": R_NS
+	});
 	const pkg = { parts: {
 		"[Content_Types].xml": {
 			kind: "xml",
@@ -225,10 +231,7 @@ function createEmptyPptxPackage(options) {
 		},
 		[PRESENTATION_PART_PATH]: {
 			kind: "xml",
-			nodes: [declaration(), require_xml_fragment.el("p:presentation", {
-				"xmlns:p": PML_NS,
-				"xmlns:r": R_NS
-			})]
+			nodes: [declaration(), presentation]
 		}
 	} };
 	const layoutToMasterTarget = require_opc_paths.buildRelativeTarget(SLIDE_LAYOUT_PART_PATH, SLIDE_MASTER_PART_PATH);
@@ -266,10 +269,7 @@ function createEmptyPptxPackage(options) {
 		type: SLIDE_MASTER_REL_TYPE,
 		target: presentationToMasterTarget
 	});
-	const presentationPart = pkg.parts[PRESENTATION_PART_PATH];
-	const presentationElement = presentationPart?.kind === "xml" ? presentationPart.nodes.find((n) => n.type === "element") : void 0;
-	if (presentationElement === void 0) throw new Error("createEmptyPptxPackage: failed to build ppt/presentation.xml");
-	presentationElement.children.push(require_xml_fragment.el("p:sldMasterIdLst", {}, [require_xml_fragment.el("p:sldMasterId", {
+	presentation.children.push(require_xml_fragment.el("p:sldMasterIdLst", {}, [require_xml_fragment.el("p:sldMasterId", {
 		id: String(MIN_MASTER_OR_LAYOUT_ID),
 		"r:id": presentationToMasterRelId
 	})]), require_xml_fragment.el("p:sldIdLst"), require_xml_fragment.el("p:sldSz", {

package/dist/edit/pptx/scaffold.js

@@ -3,6 +3,7 @@ import { ensureContentTypeOverride } from "../../opc/content-types.js";
 import { buildRelativeTarget } from "../../opc/paths.js";
 import { addRelationship } from "../../opc/rels.js";
 import { addCoreProperties } from "../../opc/core-properties.js";
+import { childrenWithTag } from "ooxml.js";
 //#region src/edit/pptx/scaffold.ts
 const CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types";
 const RELS_NS = "http://schemas.openxmlformats.org/package/2006/relationships";
@@ -188,9 +189,10 @@ function ensureNotesMaster(pkg) {
 	const presentationPart = pkg.parts[PRESENTATION_PART_PATH];
 	const presentationElement = presentationPart?.kind === "xml" ? presentationPart.nodes.find((n) => n.type === "element") : void 0;
 	if (presentationElement === void 0) throw new Error("ensureNotesMaster: package has no ppt/presentation.xml element");
-	const sldMasterIdLstIndex = presentationElement.children.findIndex((c) => c.type === "element" && c.tag === "p:sldMasterIdLst");
+	const sldMasterIdLst = childrenWithTag(presentationElement, "p:sldMasterIdLst")[0];
+	const sldMasterIdLstIndex = presentationElement.children.findIndex((child) => child === sldMasterIdLst);
 	const notesMasterIdLst = el("p:notesMasterIdLst", {}, [el("p:notesMasterId", { "r:id": relId })]);
-	presentationElement.children.splice(sldMasterIdLstIndex === -1 ? 0 : sldMasterIdLstIndex + 1, 0, notesMasterIdLst);
+	presentationElement.children.splice(sldMasterIdLstIndex + 1, 0, notesMasterIdLst);
 	return NOTES_MASTER_PART_PATH;
 }
 function createEmptyPptxPackage(options) {
@@ -213,6 +215,10 @@ function createEmptyPptxPackage(options) {
 		Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
 		Target: PRESENTATION_PART_PATH
 	})]);
+	const presentation = el("p:presentation", {
+		"xmlns:p": PML_NS,
+		"xmlns:r": R_NS
+	});
 	const pkg = { parts: {
 		"[Content_Types].xml": {
 			kind: "xml",
@@ -224,10 +230,7 @@ function createEmptyPptxPackage(options) {
 		},
 		[PRESENTATION_PART_PATH]: {
 			kind: "xml",
-			nodes: [declaration(), el("p:presentation", {
-				"xmlns:p": PML_NS,
-				"xmlns:r": R_NS
-			})]
+			nodes: [declaration(), presentation]
 		}
 	} };
 	const layoutToMasterTarget = buildRelativeTarget(SLIDE_LAYOUT_PART_PATH, SLIDE_MASTER_PART_PATH);
@@ -265,10 +268,7 @@ function createEmptyPptxPackage(options) {
 		type: SLIDE_MASTER_REL_TYPE,
 		target: presentationToMasterTarget
 	});
-	const presentationPart = pkg.parts[PRESENTATION_PART_PATH];
-	const presentationElement = presentationPart?.kind === "xml" ? presentationPart.nodes.find((n) => n.type === "element") : void 0;
-	if (presentationElement === void 0) throw new Error("createEmptyPptxPackage: failed to build ppt/presentation.xml");
-	presentationElement.children.push(el("p:sldMasterIdLst", {}, [el("p:sldMasterId", {
+	presentation.children.push(el("p:sldMasterIdLst", {}, [el("p:sldMasterId", {
 		id: String(MIN_MASTER_OR_LAYOUT_ID),
 		"r:id": presentationToMasterRelId
 	})]), el("p:sldIdLst"), el("p:sldSz", {

package/dist/hsqldb/script.cjs

@@ -72,7 +72,7 @@ const IGNORABLE_STATEMENT_PREFIXES = [
 	"SHUTDOWN"
 ];
 function isIgnorableStatement(statement) {
-	const normalized = statement.replace(/\s+/g, " ").trim().toUpperCase();
+	const normalized = statement.replace(/\s+/g, " ").toUpperCase();
 	return IGNORABLE_STATEMENT_PREFIXES.some((prefix) => normalized.startsWith(prefix));
 }
 const CREATE_TABLE_RE = /^CREATE\s+(?:(?:MEMORY|CACHED|TEXT|TEMP|TEMPORARY|GLOBAL\s+TEMPORARY)\s+)?TABLE\s+/i;
@@ -294,32 +294,31 @@ function unescapeSingleQuotes(s) {
 	return s.replace(/''/g, "'");
 }
 function typeBucket(typeText) {
-	const word = /^([A-Za-z_]+)/.exec(typeText.trim())?.[1]?.toUpperCase();
+	const word = /^([A-Za-z_]+)/.exec(typeText)?.[1]?.toUpperCase();
 	if (word === "DATE") return "date";
 	if (word === "TIME") return "time";
 	return "other";
 }
 const NUMBER_LITERAL_RE = /^[-+]?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?$/;
 function parseLiteral(raw, bucket) {
-	const trimmed = raw.trim();
-	if (/^NULL$/i.test(trimmed)) return { kind: "empty" };
-	const dateTyped = /^DATE\s*'((?:[^']|'')*)'$/i.exec(trimmed);
+	if (/^NULL$/i.test(raw)) return { kind: "empty" };
+	const dateTyped = /^DATE\s*'((?:[^']|'')*)'$/i.exec(raw);
 	if (dateTyped?.[1] !== void 0) return {
 		kind: "date",
 		value: unescapeSingleQuotes(dateTyped[1])
 	};
-	const timeTyped = /^TIME\s*'((?:[^']|'')*)'$/i.exec(trimmed);
+	const timeTyped = /^TIME\s*'((?:[^']|'')*)'$/i.exec(raw);
 	if (timeTyped?.[1] !== void 0) return {
 		kind: "time",
 		value: unescapeSingleQuotes(timeTyped[1])
 	};
-	const timestampTyped = /^TIMESTAMP\s*'((?:[^']|'')*)'$/i.exec(trimmed);
+	const timestampTyped = /^TIMESTAMP\s*'((?:[^']|'')*)'$/i.exec(raw);
 	if (timestampTyped?.[1] !== void 0) return {
 		kind: "date",
 		value: unescapeSingleQuotes(timestampTyped[1])
 	};
-	if (trimmed.length >= 2 && trimmed.startsWith("'") && trimmed.endsWith("'")) {
-		const text = unescapeSingleQuotes(trimmed.slice(1, -1));
+	if (raw.length >= 2 && raw.startsWith("'") && raw.endsWith("'")) {
+		const text = unescapeSingleQuotes(raw.slice(1, -1));
 		if (bucket === "date") return {
 			kind: "date",
 			value: text
@@ -333,19 +332,19 @@ function parseLiteral(raw, bucket) {
 			value: text
 		};
 	}
-	if (/^TRUE$/i.test(trimmed)) return {
+	if (/^TRUE$/i.test(raw)) return {
 		kind: "boolean",
 		value: true
 	};
-	if (/^FALSE$/i.test(trimmed)) return {
+	if (/^FALSE$/i.test(raw)) return {
 		kind: "boolean",
 		value: false
 	};
-	if (NUMBER_LITERAL_RE.test(trimmed)) return {
+	if (NUMBER_LITERAL_RE.test(raw)) return {
 		kind: "number",
-		value: Number(trimmed)
+		value: Number(raw)
 	};
-	throw new HsqldbScriptParseError(`unrecognised literal "${trimmed}"`, raw);
+	throw new HsqldbScriptParseError(`unrecognised literal "${raw}"`, raw);
 }
 function parseCreateTable(statement) {
 	const match = CREATE_TABLE_RE.exec(statement);
@@ -382,7 +381,7 @@ function parseInsertInto(statement) {
 	let explicitColumns;
 	if (statement.charAt(i) === "(") {
 		const { inner, next: afterCols } = readBalancedParens(statement, i);
-		explicitColumns = splitTopLevel(inner, ",").map((part) => readIdentifier(part.trim(), 0).name);
+		explicitColumns = splitTopLevel(inner, ",").map((part) => readIdentifier(part, 0).name);
 		i = skipWs(statement, afterCols);
 	}
 	const valuesMatch = /^VALUES\s*/i.exec(statement.slice(i));
@@ -390,7 +389,7 @@ function parseInsertInto(statement) {
 	i = skipWs(statement, i + valuesMatch[0].length);
 	if (statement.charAt(i) !== "(") throw new HsqldbScriptParseError(`INSERT INTO "${tableName}": expected "(" to start the VALUES tuple`, statement);
 	const { inner, next: afterTuple } = readBalancedParens(statement, i);
-	const trailing = statement.slice(afterTuple).trim();
+	const trailing = statement.slice(afterTuple);
 	if (trailing.length > 0) throw new HsqldbScriptParseError(`INSERT INTO "${tableName}": unexpected trailing content after the VALUES tuple ("${trailing}") — multiple tuples per INSERT are outside this bounded parser's scope`, statement);
 	return {
 		tableName,

package/dist/hsqldb/script.js

@@ -71,7 +71,7 @@ const IGNORABLE_STATEMENT_PREFIXES = [
 	"SHUTDOWN"
 ];
 function isIgnorableStatement(statement) {
-	const normalized = statement.replace(/\s+/g, " ").trim().toUpperCase();
+	const normalized = statement.replace(/\s+/g, " ").toUpperCase();
 	return IGNORABLE_STATEMENT_PREFIXES.some((prefix) => normalized.startsWith(prefix));
 }
 const CREATE_TABLE_RE = /^CREATE\s+(?:(?:MEMORY|CACHED|TEXT|TEMP|TEMPORARY|GLOBAL\s+TEMPORARY)\s+)?TABLE\s+/i;
@@ -293,32 +293,31 @@ function unescapeSingleQuotes(s) {
 	return s.replace(/''/g, "'");
 }
 function typeBucket(typeText) {
-	const word = /^([A-Za-z_]+)/.exec(typeText.trim())?.[1]?.toUpperCase();
+	const word = /^([A-Za-z_]+)/.exec(typeText)?.[1]?.toUpperCase();
 	if (word === "DATE") return "date";
 	if (word === "TIME") return "time";
 	return "other";
 }
 const NUMBER_LITERAL_RE = /^[-+]?\d+(?:\.\d+)?(?:[eE][-+]?\d+)?$/;
 function parseLiteral(raw, bucket) {
-	const trimmed = raw.trim();
-	if (/^NULL$/i.test(trimmed)) return { kind: "empty" };
-	const dateTyped = /^DATE\s*'((?:[^']|'')*)'$/i.exec(trimmed);
+	if (/^NULL$/i.test(raw)) return { kind: "empty" };
+	const dateTyped = /^DATE\s*'((?:[^']|'')*)'$/i.exec(raw);
 	if (dateTyped?.[1] !== void 0) return {
 		kind: "date",
 		value: unescapeSingleQuotes(dateTyped[1])
 	};
-	const timeTyped = /^TIME\s*'((?:[^']|'')*)'$/i.exec(trimmed);
+	const timeTyped = /^TIME\s*'((?:[^']|'')*)'$/i.exec(raw);
 	if (timeTyped?.[1] !== void 0) return {
 		kind: "time",
 		value: unescapeSingleQuotes(timeTyped[1])
 	};
-	const timestampTyped = /^TIMESTAMP\s*'((?:[^']|'')*)'$/i.exec(trimmed);
+	const timestampTyped = /^TIMESTAMP\s*'((?:[^']|'')*)'$/i.exec(raw);
 	if (timestampTyped?.[1] !== void 0) return {
 		kind: "date",
 		value: unescapeSingleQuotes(timestampTyped[1])
 	};
-	if (trimmed.length >= 2 && trimmed.startsWith("'") && trimmed.endsWith("'")) {
-		const text = unescapeSingleQuotes(trimmed.slice(1, -1));
+	if (raw.length >= 2 && raw.startsWith("'") && raw.endsWith("'")) {
+		const text = unescapeSingleQuotes(raw.slice(1, -1));
 		if (bucket === "date") return {
 			kind: "date",
 			value: text
@@ -332,19 +331,19 @@ function parseLiteral(raw, bucket) {
 			value: text
 		};
 	}
-	if (/^TRUE$/i.test(trimmed)) return {
+	if (/^TRUE$/i.test(raw)) return {
 		kind: "boolean",
 		value: true
 	};
-	if (/^FALSE$/i.test(trimmed)) return {
+	if (/^FALSE$/i.test(raw)) return {
 		kind: "boolean",
 		value: false
 	};
-	if (NUMBER_LITERAL_RE.test(trimmed)) return {
+	if (NUMBER_LITERAL_RE.test(raw)) return {
 		kind: "number",
-		value: Number(trimmed)
+		value: Number(raw)
 	};
-	throw new HsqldbScriptParseError(`unrecognised literal "${trimmed}"`, raw);
+	throw new HsqldbScriptParseError(`unrecognised literal "${raw}"`, raw);
 }
 function parseCreateTable(statement) {
 	const match = CREATE_TABLE_RE.exec(statement);
@@ -381,7 +380,7 @@ function parseInsertInto(statement) {
 	let explicitColumns;
 	if (statement.charAt(i) === "(") {
 		const { inner, next: afterCols } = readBalancedParens(statement, i);
-		explicitColumns = splitTopLevel(inner, ",").map((part) => readIdentifier(part.trim(), 0).name);
+		explicitColumns = splitTopLevel(inner, ",").map((part) => readIdentifier(part, 0).name);
 		i = skipWs(statement, afterCols);
 	}
 	const valuesMatch = /^VALUES\s*/i.exec(statement.slice(i));
@@ -389,7 +388,7 @@ function parseInsertInto(statement) {
 	i = skipWs(statement, i + valuesMatch[0].length);
 	if (statement.charAt(i) !== "(") throw new HsqldbScriptParseError(`INSERT INTO "${tableName}": expected "(" to start the VALUES tuple`, statement);
 	const { inner, next: afterTuple } = readBalancedParens(statement, i);
-	const trailing = statement.slice(afterTuple).trim();
+	const trailing = statement.slice(afterTuple);
 	if (trailing.length > 0) throw new HsqldbScriptParseError(`INSERT INTO "${tableName}": unexpected trailing content after the VALUES tuple ("${trailing}") — multiple tuples per INSERT are outside this bounded parser's scope`, statement);
 	return {
 		tableName,

package/dist/mathml/layout.cjs

@@ -14,18 +14,18 @@ function rootContext(options, diagnostics) {
 		inheritedVariant: void 0,
 		displayStyle: true,
 		cramped: false,
-		scriptLevel: 0,
+		firstScriptLevel: true,
 		diagnostics
 	};
 }
 function scriptContext(ctx, cramped) {
-	const scale = ctx.scriptLevel === 0 ? ctx.metrics.scriptPercentScaleDown : ctx.metrics.scriptScriptPercentScaleDown;
+	const scale = ctx.firstScriptLevel ? ctx.metrics.scriptPercentScaleDown : ctx.metrics.scriptScriptPercentScaleDown;
 	return {
 		...ctx,
 		sizePt: ctx.sizePt * scale,
 		displayStyle: false,
 		cramped,
-		scriptLevel: ctx.scriptLevel + 1
+		firstScriptLevel: false
 	};
 }
 function unsupported(ctx, element) {
@@ -89,6 +89,10 @@ function isStretchyOperator(element) {
 	if (require_mathml_nodes.attrValue(element, "stretchy") === "false") return false;
 	return require_mathml_operators.operatorProperties(require_mathml_nodes.textContent(element).trim()).stretchy;
 }
+function singleCodePoint(text) {
+	const codePoints = [...text];
+	return codePoints.length === 1 ? codePoints[0]?.codePointAt(0) : void 0;
+}
 function stretchedBox(result, text, ctx) {
 	const axisPt = ctx.metrics.axisHeightPt;
 	const inkHeightPt = result.inkAscentPt + result.inkDescentPt;
@@ -116,9 +120,7 @@ function stretchedBox(result, text, ctx) {
 }
 function stretchOperator(element, targetSizePt, ctx) {
 	const text = require_mathml_nodes.textContent(element).trim();
-	const codePoints = [...text];
-	if (codePoints.length !== 1) return;
-	const codePoint = codePoints[0]?.codePointAt(0);
+	const codePoint = singleCodePoint(text);
 	if (codePoint === void 0) return;
 	const result = ctx.metrics.stretch(codePoint, "vertical", targetSizePt, ctx.sizePt);
 	if (result === void 0 || result.kind === "base") return;
@@ -148,9 +150,7 @@ function horizontallyStretchedBox(result, text, ctx) {
 }
 function stretchHorizontalOperator(element, targetWidthPt, ctx) {
 	const text = require_mathml_nodes.textContent(element).trim();
-	const codePoints = [...text];
-	if (codePoints.length !== 1) return;
-	const codePoint = codePoints[0]?.codePointAt(0);
+	const codePoint = singleCodePoint(text);
 	if (codePoint === void 0) return;
 	const result = ctx.metrics.stretch(codePoint, "horizontal", targetWidthPt, ctx.sizePt);
 	if (result === void 0 || result.kind === "base") return;
@@ -165,7 +165,6 @@ function layoutUnderOverChild(childElement, targetWidthPt, scriptCtx) {
 }
 function stretchRowOperators(children, boxes, ctx) {
 	const stretchy = children.map(isStretchyOperator);
-	if (!stretchy.includes(true)) return boxes;
 	const others = boxes.filter((_, index) => stretchy[index] !== true);
 	if (others.length === 0) return boxes;
 	const axisPt = ctx.metrics.axisHeightPt;
@@ -180,14 +179,14 @@ function stretchRowOperators(children, boxes, ctx) {
 }
 function layoutRowChildren(children, ctx) {
 	const boxes = stretchRowOperators(children, children.map((child) => layoutNode(child, ctx)), ctx);
-	const gapsPt = children.map((child, index) => {
-		if (index === 0) return 0;
-		const previous = children[index - 1];
-		let gapEm = 0;
-		if (previous !== void 0 && require_mathml_nodes.elementLocalName(previous) === "mo") gapEm += require_mathml_operators.operatorProperties(require_mathml_nodes.textContent(previous).trim()).rspaceEm;
-		if (require_mathml_nodes.elementLocalName(child) === "mo") gapEm += require_mathml_operators.operatorProperties(require_mathml_nodes.textContent(child).trim()).lspaceEm;
-		return gapEm * ctx.sizePt;
-	});
+	const gapsPt = [];
+	let carriedRspaceEm = 0;
+	for (const [index, child] of children.entries()) {
+		const properties = require_mathml_nodes.elementLocalName(child) === "mo" ? require_mathml_operators.operatorProperties(require_mathml_nodes.textContent(child).trim()) : void 0;
+		const gapEm = index === 0 ? 0 : carriedRspaceEm + (properties?.lspaceEm ?? 0);
+		gapsPt.push(gapEm * ctx.sizePt);
+		carriedRspaceEm = properties?.rspaceEm ?? 0;
+	}
 	return require_mathml_compose.concatBoxesHorizontally(boxes, gapsPt);
 }
 function layoutSemantics(element, ctx) {
@@ -213,18 +212,15 @@ function mstyleContext(element, ctx) {
 }
 function layoutScripts(base, subscript, superscript, ctx) {
 	const metrics = ctx.metrics;
-	let supShiftUpPt = 0;
-	let subShiftDownPt = 0;
-	if (superscript !== void 0) supShiftUpPt = Math.max(ctx.cramped ? metrics.superscriptShiftUpCrampedPt : metrics.superscriptShiftUpPt, base.ascentPt - metrics.superscriptBaselineDropMaxPt);
-	if (subscript !== void 0) subShiftDownPt = Math.max(metrics.subscriptShiftDownPt, base.descentPt + metrics.subscriptBaselineDropMinPt);
+	const initialSupShiftUpPt = Math.max(ctx.cramped ? metrics.superscriptShiftUpCrampedPt : metrics.superscriptShiftUpPt, base.ascentPt - metrics.superscriptBaselineDropMaxPt);
+	const initialSubShiftDownPt = Math.max(metrics.subscriptShiftDownPt, base.descentPt + metrics.subscriptBaselineDropMinPt);
+	let correctionPt = 0;
 	if (superscript !== void 0 && subscript !== void 0) {
-		const gapPt = supShiftUpPt - superscript.descentPt + (subShiftDownPt - subscript.ascentPt);
-		const deficitPt = metrics.subSuperscriptGapMinPt - gapPt;
-		if (deficitPt > 0) {
-			supShiftUpPt += deficitPt / 2;
-			subShiftDownPt += deficitPt / 2;
-		}
+		const gapPt = initialSupShiftUpPt - superscript.descentPt + (initialSubShiftDownPt - subscript.ascentPt);
+		correctionPt = Math.max(0, metrics.subSuperscriptGapMinPt - gapPt) / 2;
 	}
+	const supShiftUpPt = initialSupShiftUpPt + correctionPt;
+	const subShiftDownPt = initialSubShiftDownPt + correctionPt;
 	const ascentPt = Math.max(base.ascentPt, superscript === void 0 ? 0 : supShiftUpPt + superscript.ascentPt);
 	const descentPt = Math.max(base.descentPt, subscript === void 0 ? 0 : subShiftDownPt + subscript.descentPt);
 	const scriptWidthPt = Math.max(superscript?.widthPt ?? 0, subscript?.widthPt ?? 0);
@@ -282,9 +278,7 @@ function resolveTopAccentXPt(baseElement, ctx) {
 		rawText = require_mathml_nodes.textContent(baseElement).trim();
 		intrinsicDefault = "normal";
 	} else return;
-	const codePoints = [...require_mathml_variant.applyMathVariant(rawText, tokenVariant(baseElement, intrinsicDefault, ctx))];
-	if (codePoints.length !== 1) return;
-	const codePoint = codePoints[0]?.codePointAt(0);
+	const codePoint = singleCodePoint(require_mathml_variant.applyMathVariant(rawText, tokenVariant(baseElement, intrinsicDefault, ctx)));
 	if (codePoint === void 0) return;
 	return ctx.metrics.glyph(codePoint, ctx.sizePt)?.topAccentXPt;
 }
@@ -295,7 +289,6 @@ function layoutUnderOverElement(element, kind, ctx) {
 	if (!ctx.displayStyle && isMovableLimitsOperator(baseElement)) {
 		const base = layoutNode(baseElement, ctx);
 		const scriptCtx = scriptContext(ctx, ctx.cramped);
-		if (kind === "munder") return layoutScripts(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), void 0, ctx);
 		if (kind === "mover") return layoutScripts(base, void 0, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), ctx);
 		return layoutScripts(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), children[2] === void 0 ? void 0 : layoutNode(children[2], scriptCtx), ctx);
 	}
@@ -303,12 +296,10 @@ function layoutUnderOverElement(element, kind, ctx) {
 	const scriptCtx = scriptContext(ctx, false);
 	const isAccent = require_mathml_nodes.attrValue(element, "accent") === "true";
 	const isAccentUnder = require_mathml_nodes.attrValue(element, "accentunder") === "true";
-	const topAccentXPt = isAccent || isAccentUnder ? resolveTopAccentXPt(baseElement, ctx) : void 0;
 	const accentAttachment = {
-		overXPt: isAccent ? topAccentXPt : void 0,
-		underXPt: isAccentUnder ? topAccentXPt : void 0
+		overXPt: isAccent ? resolveTopAccentXPt(baseElement, ctx) : void 0,
+		underXPt: isAccentUnder ? resolveTopAccentXPt(baseElement, ctx) : void 0
 	};
-	if (kind === "munder") return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutUnderOverChild(children[1], base.widthPt, scriptCtx), void 0, ctx, accentAttachment);
 	if (kind === "mover") return layoutUnderOver(base, void 0, children[1] === void 0 ? void 0 : layoutUnderOverChild(children[1], base.widthPt, scriptCtx), ctx, accentAttachment);
 	return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutUnderOverChild(children[1], base.widthPt, scriptCtx), children[2] === void 0 ? void 0 : layoutUnderOverChild(children[2], base.widthPt, scriptCtx), ctx, accentAttachment);
 }
@@ -316,7 +307,8 @@ function layoutFraction(element, ctx) {
 	const children = require_mathml_nodes.elementChildren(element);
 	const numeratorElement = children[0];
 	const denominatorElement = children[1];
-	if (numeratorElement === void 0 || denominatorElement === void 0) return require_mathml_compose.EMPTY_BOX;
+	if (numeratorElement === void 0) return require_mathml_compose.EMPTY_BOX;
+	if (denominatorElement === void 0) return require_mathml_compose.EMPTY_BOX;
 	const fracCtx = {
 		...ctx,
 		displayStyle: false,
@@ -425,13 +417,12 @@ function wrapRadical(radicand, index, ctx) {
 }
 function layoutTable(element, ctx) {
 	const rows = require_mathml_nodes.elementChildren(element).filter((child) => require_mathml_nodes.elementLocalName(child) === "mtr");
-	if (rows.length === 0) return require_mathml_compose.EMPTY_BOX;
-	const columnAligns = (require_mathml_nodes.attrValue(element, "columnalign") ?? "").trim().split(/\s+/).filter((s) => s.length > 0);
+	const columnAlignAttr = require_mathml_nodes.attrValue(element, "columnalign");
+	const columnAligns = columnAlignAttr === void 0 ? [] : columnAlignAttr.match(/\S+/g) ?? [];
 	const rowCells = rows.map((row) => require_mathml_nodes.elementChildren(row).filter((child) => require_mathml_nodes.elementLocalName(child) === "mtd").map((cell) => layoutRowChildren(require_mathml_nodes.elementChildren(cell), ctx)));
 	const columnCount = rowCells.reduce((max, row) => Math.max(max, row.length), 0);
 	if (columnCount === 0) return require_mathml_compose.EMPTY_BOX;
-	const columnWidthsPt = [];
-	for (let column = 0; column < columnCount; column++) columnWidthsPt.push(rowCells.reduce((max, row) => Math.max(max, row[column]?.widthPt ?? 0), 0));
+	const columnWidthsPt = Array.from({ length: columnCount }, (_, column) => rowCells.reduce((max, row) => Math.max(max, row[column]?.widthPt ?? 0), 0));
 	const columnGapPt = .8 * ctx.sizePt;
 	const rowGapPt = .5 * ctx.sizePt;
 	const items = [];
@@ -442,7 +433,7 @@ function layoutTable(element, ctx) {
 		let cursorXPt = 0;
 		row.forEach((cell, columnIndex) => {
 			const columnWidthPt = columnWidthsPt[columnIndex] ?? cell.widthPt;
-			const align = columnAligns[columnIndex] ?? columnAligns[columnAligns.length - 1] ?? "center";
+			const align = columnAligns[columnIndex] ?? columnAligns[columnAligns.length - 1];
 			const extraPt = columnWidthPt - cell.widthPt;
 			const dxPt = align === "left" ? 0 : align === "right" ? extraPt : extraPt / 2;
 			items.push(...require_mathml_compose.placeChild(cell, cursorXPt + dxPt, 0, cursorYTopPt + rowAscentPt));

package/dist/mathml/layout.d.cts

@@ -15,7 +15,7 @@ interface LayoutContext {
   readonly inheritedVariant: MathVariant | undefined;
   readonly displayStyle: boolean;
   readonly cramped: boolean;
-  readonly scriptLevel: number;
+  readonly firstScriptLevel: boolean;
   readonly diagnostics: MathDiagnostic[];
 }
 declare function layoutNode(node: MathMlNode$1, ctx: LayoutContext): MathBox;

package/dist/mathml/layout.d.ts

@@ -15,7 +15,7 @@ interface LayoutContext {
   readonly inheritedVariant: MathVariant | undefined;
   readonly displayStyle: boolean;
   readonly cramped: boolean;
-  readonly scriptLevel: number;
+  readonly firstScriptLevel: boolean;
   readonly diagnostics: MathDiagnostic[];
 }
 declare function layoutNode(node: MathMlNode$1, ctx: LayoutContext): MathBox;

package/dist/mathml/layout.js

@@ -13,18 +13,18 @@ function rootContext(options, diagnostics) {
 		inheritedVariant: void 0,
 		displayStyle: true,
 		cramped: false,
-		scriptLevel: 0,
+		firstScriptLevel: true,
 		diagnostics
 	};
 }
 function scriptContext(ctx, cramped) {
-	const scale = ctx.scriptLevel === 0 ? ctx.metrics.scriptPercentScaleDown : ctx.metrics.scriptScriptPercentScaleDown;
+	const scale = ctx.firstScriptLevel ? ctx.metrics.scriptPercentScaleDown : ctx.metrics.scriptScriptPercentScaleDown;
 	return {
 		...ctx,
 		sizePt: ctx.sizePt * scale,
 		displayStyle: false,
 		cramped,
-		scriptLevel: ctx.scriptLevel + 1
+		firstScriptLevel: false
 	};
 }
 function unsupported(ctx, element) {
@@ -88,6 +88,10 @@ function isStretchyOperator(element) {
 	if (attrValue(element, "stretchy") === "false") return false;
 	return operatorProperties(textContent(element).trim()).stretchy;
 }
+function singleCodePoint(text) {
+	const codePoints = [...text];
+	return codePoints.length === 1 ? codePoints[0]?.codePointAt(0) : void 0;
+}
 function stretchedBox(result, text, ctx) {
 	const axisPt = ctx.metrics.axisHeightPt;
 	const inkHeightPt = result.inkAscentPt + result.inkDescentPt;
@@ -115,9 +119,7 @@ function stretchedBox(result, text, ctx) {
 }
 function stretchOperator(element, targetSizePt, ctx) {
 	const text = textContent(element).trim();
-	const codePoints = [...text];
-	if (codePoints.length !== 1) return;
-	const codePoint = codePoints[0]?.codePointAt(0);
+	const codePoint = singleCodePoint(text);
 	if (codePoint === void 0) return;
 	const result = ctx.metrics.stretch(codePoint, "vertical", targetSizePt, ctx.sizePt);
 	if (result === void 0 || result.kind === "base") return;
@@ -147,9 +149,7 @@ function horizontallyStretchedBox(result, text, ctx) {
 }
 function stretchHorizontalOperator(element, targetWidthPt, ctx) {
 	const text = textContent(element).trim();
-	const codePoints = [...text];
-	if (codePoints.length !== 1) return;
-	const codePoint = codePoints[0]?.codePointAt(0);
+	const codePoint = singleCodePoint(text);
 	if (codePoint === void 0) return;
 	const result = ctx.metrics.stretch(codePoint, "horizontal", targetWidthPt, ctx.sizePt);
 	if (result === void 0 || result.kind === "base") return;
@@ -164,7 +164,6 @@ function layoutUnderOverChild(childElement, targetWidthPt, scriptCtx) {
 }
 function stretchRowOperators(children, boxes, ctx) {
 	const stretchy = children.map(isStretchyOperator);
-	if (!stretchy.includes(true)) return boxes;
 	const others = boxes.filter((_, index) => stretchy[index] !== true);
 	if (others.length === 0) return boxes;
 	const axisPt = ctx.metrics.axisHeightPt;
@@ -179,14 +178,14 @@ function stretchRowOperators(children, boxes, ctx) {
 }
 function layoutRowChildren(children, ctx) {
 	const boxes = stretchRowOperators(children, children.map((child) => layoutNode(child, ctx)), ctx);
-	const gapsPt = children.map((child, index) => {
-		if (index === 0) return 0;
-		const previous = children[index - 1];
-		let gapEm = 0;
-		if (previous !== void 0 && elementLocalName(previous) === "mo") gapEm += operatorProperties(textContent(previous).trim()).rspaceEm;
-		if (elementLocalName(child) === "mo") gapEm += operatorProperties(textContent(child).trim()).lspaceEm;
-		return gapEm * ctx.sizePt;
-	});
+	const gapsPt = [];
+	let carriedRspaceEm = 0;
+	for (const [index, child] of children.entries()) {
+		const properties = elementLocalName(child) === "mo" ? operatorProperties(textContent(child).trim()) : void 0;
+		const gapEm = index === 0 ? 0 : carriedRspaceEm + (properties?.lspaceEm ?? 0);
+		gapsPt.push(gapEm * ctx.sizePt);
+		carriedRspaceEm = properties?.rspaceEm ?? 0;
+	}
 	return concatBoxesHorizontally(boxes, gapsPt);
 }
 function layoutSemantics(element, ctx) {
@@ -212,18 +211,15 @@ function mstyleContext(element, ctx) {
 }
 function layoutScripts(base, subscript, superscript, ctx) {
 	const metrics = ctx.metrics;
-	let supShiftUpPt = 0;
-	let subShiftDownPt = 0;
-	if (superscript !== void 0) supShiftUpPt = Math.max(ctx.cramped ? metrics.superscriptShiftUpCrampedPt : metrics.superscriptShiftUpPt, base.ascentPt - metrics.superscriptBaselineDropMaxPt);
-	if (subscript !== void 0) subShiftDownPt = Math.max(metrics.subscriptShiftDownPt, base.descentPt + metrics.subscriptBaselineDropMinPt);
+	const initialSupShiftUpPt = Math.max(ctx.cramped ? metrics.superscriptShiftUpCrampedPt : metrics.superscriptShiftUpPt, base.ascentPt - metrics.superscriptBaselineDropMaxPt);
+	const initialSubShiftDownPt = Math.max(metrics.subscriptShiftDownPt, base.descentPt + metrics.subscriptBaselineDropMinPt);
+	let correctionPt = 0;
 	if (superscript !== void 0 && subscript !== void 0) {
-		const gapPt = supShiftUpPt - superscript.descentPt + (subShiftDownPt - subscript.ascentPt);
-		const deficitPt = metrics.subSuperscriptGapMinPt - gapPt;
-		if (deficitPt > 0) {
-			supShiftUpPt += deficitPt / 2;
-			subShiftDownPt += deficitPt / 2;
-		}
+		const gapPt = initialSupShiftUpPt - superscript.descentPt + (initialSubShiftDownPt - subscript.ascentPt);
+		correctionPt = Math.max(0, metrics.subSuperscriptGapMinPt - gapPt) / 2;
 	}
+	const supShiftUpPt = initialSupShiftUpPt + correctionPt;
+	const subShiftDownPt = initialSubShiftDownPt + correctionPt;
 	const ascentPt = Math.max(base.ascentPt, superscript === void 0 ? 0 : supShiftUpPt + superscript.ascentPt);
 	const descentPt = Math.max(base.descentPt, subscript === void 0 ? 0 : subShiftDownPt + subscript.descentPt);
 	const scriptWidthPt = Math.max(superscript?.widthPt ?? 0, subscript?.widthPt ?? 0);
@@ -281,9 +277,7 @@ function resolveTopAccentXPt(baseElement, ctx) {
 		rawText = textContent(baseElement).trim();
 		intrinsicDefault = "normal";
 	} else return;
-	const codePoints = [...applyMathVariant(rawText, tokenVariant(baseElement, intrinsicDefault, ctx))];
-	if (codePoints.length !== 1) return;
-	const codePoint = codePoints[0]?.codePointAt(0);
+	const codePoint = singleCodePoint(applyMathVariant(rawText, tokenVariant(baseElement, intrinsicDefault, ctx)));
 	if (codePoint === void 0) return;
 	return ctx.metrics.glyph(codePoint, ctx.sizePt)?.topAccentXPt;
 }
@@ -294,7 +288,6 @@ function layoutUnderOverElement(element, kind, ctx) {
 	if (!ctx.displayStyle && isMovableLimitsOperator(baseElement)) {
 		const base = layoutNode(baseElement, ctx);
 		const scriptCtx = scriptContext(ctx, ctx.cramped);
-		if (kind === "munder") return layoutScripts(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), void 0, ctx);
 		if (kind === "mover") return layoutScripts(base, void 0, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), ctx);
 		return layoutScripts(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), children[2] === void 0 ? void 0 : layoutNode(children[2], scriptCtx), ctx);
 	}
@@ -302,12 +295,10 @@ function layoutUnderOverElement(element, kind, ctx) {
 	const scriptCtx = scriptContext(ctx, false);
 	const isAccent = attrValue(element, "accent") === "true";
 	const isAccentUnder = attrValue(element, "accentunder") === "true";
-	const topAccentXPt = isAccent || isAccentUnder ? resolveTopAccentXPt(baseElement, ctx) : void 0;
 	const accentAttachment = {
-		overXPt: isAccent ? topAccentXPt : void 0,
-		underXPt: isAccentUnder ? topAccentXPt : void 0
+		overXPt: isAccent ? resolveTopAccentXPt(baseElement, ctx) : void 0,
+		underXPt: isAccentUnder ? resolveTopAccentXPt(baseElement, ctx) : void 0
 	};
-	if (kind === "munder") return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutUnderOverChild(children[1], base.widthPt, scriptCtx), void 0, ctx, accentAttachment);
 	if (kind === "mover") return layoutUnderOver(base, void 0, children[1] === void 0 ? void 0 : layoutUnderOverChild(children[1], base.widthPt, scriptCtx), ctx, accentAttachment);
 	return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutUnderOverChild(children[1], base.widthPt, scriptCtx), children[2] === void 0 ? void 0 : layoutUnderOverChild(children[2], base.widthPt, scriptCtx), ctx, accentAttachment);
 }
@@ -315,7 +306,8 @@ function layoutFraction(element, ctx) {
 	const children = elementChildren(element);
 	const numeratorElement = children[0];
 	const denominatorElement = children[1];
-	if (numeratorElement === void 0 || denominatorElement === void 0) return EMPTY_BOX;
+	if (numeratorElement === void 0) return EMPTY_BOX;
+	if (denominatorElement === void 0) return EMPTY_BOX;
 	const fracCtx = {
 		...ctx,
 		displayStyle: false,
@@ -424,13 +416,12 @@ function wrapRadical(radicand, index, ctx) {
 }
 function layoutTable(element, ctx) {
 	const rows = elementChildren(element).filter((child) => elementLocalName(child) === "mtr");
-	if (rows.length === 0) return EMPTY_BOX;
-	const columnAligns = (attrValue(element, "columnalign") ?? "").trim().split(/\s+/).filter((s) => s.length > 0);
+	const columnAlignAttr = attrValue(element, "columnalign");
+	const columnAligns = columnAlignAttr === void 0 ? [] : columnAlignAttr.match(/\S+/g) ?? [];
 	const rowCells = rows.map((row) => elementChildren(row).filter((child) => elementLocalName(child) === "mtd").map((cell) => layoutRowChildren(elementChildren(cell), ctx)));
 	const columnCount = rowCells.reduce((max, row) => Math.max(max, row.length), 0);
 	if (columnCount === 0) return EMPTY_BOX;
-	const columnWidthsPt = [];
-	for (let column = 0; column < columnCount; column++) columnWidthsPt.push(rowCells.reduce((max, row) => Math.max(max, row[column]?.widthPt ?? 0), 0));
+	const columnWidthsPt = Array.from({ length: columnCount }, (_, column) => rowCells.reduce((max, row) => Math.max(max, row[column]?.widthPt ?? 0), 0));
 	const columnGapPt = .8 * ctx.sizePt;
 	const rowGapPt = .5 * ctx.sizePt;
 	const items = [];
@@ -441,7 +432,7 @@ function layoutTable(element, ctx) {
 		let cursorXPt = 0;
 		row.forEach((cell, columnIndex) => {
 			const columnWidthPt = columnWidthsPt[columnIndex] ?? cell.widthPt;
-			const align = columnAligns[columnIndex] ?? columnAligns[columnAligns.length - 1] ?? "center";
+			const align = columnAligns[columnIndex] ?? columnAligns[columnAligns.length - 1];
 			const extraPt = columnWidthPt - cell.widthPt;
 			const dxPt = align === "left" ? 0 : align === "right" ? extraPt : extraPt / 2;
 			items.push(...placeChild(cell, cursorXPt + dxPt, 0, cursorYTopPt + rowAscentPt));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "14.4.5",
+  "version": "14.4.6",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -86,7 +86,7 @@
     "markdown-codec": "11.1.3",
     "odf.js": "11.1.3",
     "ooxml.js": "12.2.8",
-    "pdf-codec": "5.2.13",
+    "pdf-codec": "5.2.14",
     "ppt-codec": "2.2.3",
     "rtf-codec": "8.1.3",
     "temml": "0.13.4",