documents.js 1.60.3 → 1.62.0

package/dist/layout/sheets.js

@@ -1,6 +1,7 @@
+import { flipY } from "../model/geometry.js";
 import { COLOR_BLACK as COLOR_BLACK$1, rgbHexToColor } from "../model/color.js";
 import { DEFAULT_LAYOUT_FONT } from "../model/style.js";
-import { alignmentOffsetPt, lineNaturalHeightPt, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
+import { alignmentOffsetPt, lineNaturalHeightPt, pushCellBorderLines, sumColumnWidthsPt, toStyledRuns } from "./shared.js";
 import { throwIfAborted } from "../ports/abort.js";
 import { LAYOUT_FORMAT_VERSION } from "document-schema.js";
 import { wrapRunsToWidth } from "pdf-codec";
@@ -183,15 +184,39 @@ function axisSpanSizePt(axis, startIndex, span) {
 	if (startPosition === void 0) return 0;
 	return sumColumnWidthsPt(axis.sizesPt, startPosition, span);
 }
-function renderCellText(cell, rowCells, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageHeightPt, measurer, out) {
+function resolveCellFrame(cell, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt) {
 	const columnPosition = columnAxis.positionByIndex.get(cell.column);
 	const rowPosition = rowAxis.positionByIndex.get(cell.row);
 	if (columnPosition === void 0 || rowPosition === void 0) return;
-	const ownWidthPt = axisSpanSizePt(columnAxis, cell.column, cell.colSpan ?? 1);
-	const heightPt = axisSpanSizePt(rowAxis, cell.row, cell.rowSpan ?? 1);
-	const xLeftPt = gridLeftXPt + columnAxis.offsetsPt[columnPosition];
-	const yTopDownPt = gridTopYDownPt + rowAxis.offsetsPt[rowPosition];
-	const alignment = defaultAlignmentForValue(cell.value.kind);
+	return {
+		xPt: gridLeftXPt + columnAxis.offsetsPt[columnPosition],
+		yPt: gridTopYDownPt + rowAxis.offsetsPt[rowPosition],
+		widthPt: axisSpanSizePt(columnAxis, cell.column, cell.colSpan ?? 1),
+		heightPt: axisSpanSizePt(rowAxis, cell.row, cell.rowSpan ?? 1)
+	};
+}
+function renderCellBackground(cell, frameYDown, pageHeightPt, out) {
+	if (cell.background === void 0) return;
+	const flipped = flipY(frameYDown, pageHeightPt);
+	out.push({
+		kind: "rect",
+		xPt: flipped.xPt,
+		yPt: flipped.yPt,
+		widthPt: flipped.widthPt,
+		heightPt: flipped.heightPt,
+		fill: cell.background,
+		sourcePath: cell.sourcePath
+	});
+}
+const DEFAULT_CELL_VERTICAL_ALIGNMENT = "bottom";
+function verticalLineTopYDownPt(verticalAlignment, cellTopYDownPt, cellHeightPt, lineHeightPt) {
+	if (verticalAlignment === "top") return cellTopYDownPt + CELL_TEXT_PADDING_PT;
+	if (verticalAlignment === "middle") return cellTopYDownPt + Math.max(CELL_TEXT_PADDING_PT, (cellHeightPt - lineHeightPt) / 2);
+	return cellTopYDownPt + Math.max(CELL_TEXT_PADDING_PT, cellHeightPt - CELL_TEXT_PADDING_PT - lineHeightPt);
+}
+function renderCellText(cell, frameYDown, rowCells, columnAxis, pageHeightPt, measurer, out) {
+	const { xPt: xLeftPt, yPt: yTopDownPt, widthPt: ownWidthPt, heightPt } = frameYDown;
+	const alignment = cell.alignment ?? defaultAlignmentForValue(cell.value.kind);
 	const numericLike = isNumericLikeValue(cell.value.kind);
 	const styledRuns = cellStyledRuns(cell);
 	const naturalLine = wrapRunsToWidth(styledRuns, measurer, Number.POSITIVE_INFINITY)[0];
@@ -221,7 +246,7 @@ function renderCellText(cell, rowCells, columnAxis, rowAxis, gridLeftXPt, gridTo
 	const alignOffsetPt = alignmentOffsetPt(alignment, availableWidthPt, lineWidthPt);
 	const textStartXPt = xLeftPt + CELL_TEXT_PADDING_PT + alignOffsetPt;
 	const lineHeightPt = lineNaturalHeightPt(naturalLine, measurer, styledRuns[0]);
-	const baselineYDownPt = yTopDownPt + Math.max(CELL_TEXT_PADDING_PT, heightPt - CELL_TEXT_PADDING_PT - lineHeightPt) + naturalLine.ascentPt;
+	const baselineYDownPt = verticalLineTopYDownPt(cell.verticalAlignment ?? DEFAULT_CELL_VERTICAL_ALIGNMENT, yTopDownPt, heightPt, lineHeightPt) + naturalLine.ascentPt;
 	for (const fragment of fragments) {
 		const textItem = {
 			kind: "text",
@@ -381,18 +406,27 @@ function convertSheetToPages(sheet, measurer, signal, out) {
 		const gridTopYDownPt = margins.topPt + gutter.heightPt;
 		const gridWidthPt = columnAxis.offsetsPt[columnAxis.offsetsPt.length - 1];
 		const gridHeightPt = rowAxis.offsetsPt[rowAxis.offsetsPt.length - 1];
-		const items = [];
-		if (printSettings.gridlines) renderGridlines(gridLeftXPt, gridTopYDownPt, gridWidthPt, gridHeightPt, columnAxis.offsetsPt, rowAxis.offsetsPt, pageSize.heightPt, items);
-		if (printSettings.headers) renderHeaderLabels(gutter, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, measurer, items);
+		const backgroundItems = [];
+		const borderItems = [];
+		const textItems = [];
 		for (const rowIndex of rowAxis.indices) {
 			const rowCells = cellsByRow.get(rowIndex);
 			if (rowCells === void 0) continue;
 			for (const [columnIndex, cell] of rowCells) {
 				throwIfAborted(signal);
 				if (!columnAxis.positionByIndex.has(columnIndex) || hiddenColumnIndices.has(columnIndex) || hiddenRowIndices.has(cell.row)) continue;
-				renderCellText(cell, rowCells, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, measurer, items);
+				const cellFrame = resolveCellFrame(cell, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt);
+				if (cellFrame === void 0) continue;
+				renderCellBackground(cell, cellFrame, pageSize.heightPt, backgroundItems);
+				if (cell.borders !== void 0) pushCellBorderLines(cell.borders, cellFrame, pageSize.heightPt, cell.sourcePath, borderItems);
+				renderCellText(cell, cellFrame, rowCells, columnAxis, pageSize.heightPt, measurer, textItems);
 			}
 		}
+		const items = [...backgroundItems];
+		if (printSettings.gridlines) renderGridlines(gridLeftXPt, gridTopYDownPt, gridWidthPt, gridHeightPt, columnAxis.offsetsPt, rowAxis.offsetsPt, pageSize.heightPt, items);
+		items.push(...borderItems);
+		if (printSettings.headers) renderHeaderLabels(gutter, columnAxis, rowAxis, gridLeftXPt, gridTopYDownPt, pageSize.heightPt, measurer, items);
+		items.push(...textItems);
 		out.push({
 			widthPt: pageSize.widthPt,
 			heightPt: pageSize.heightPt,

package/dist/layout/slides.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_model_geometry = require("../model/geometry.cjs");
+const require_model_formula = require("../model/formula.cjs");
 const require_mathml_layout = require("../mathml/layout.cjs");
 const require_layout_shared = require("./shared.cjs");
 let document_schema_js = require("document-schema.js");
@@ -115,11 +116,11 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 	return cursorYDown;
 }
 function layoutShapeFormula(block, flippedFrame, formulaContext) {
-	const embedded = block.sourcePath === void 0 ? void 0 : formulaContext.formulas.get(block.sourcePath);
-	if (embedded === void 0) return;
+	const formula = require_model_formula.formulaOfBlock(block);
+	if (formula === void 0 || formula.mathml.length === 0) return;
 	const sizePt = formulaSizePtFromFrame(block.frame.heightPt);
 	const metrics = (0, pdf_codec.loadMathFont)().metricsAt(sizePt);
-	const { box } = require_mathml_layout.layoutFormula(embedded.mathml, {
+	const { box } = require_mathml_layout.layoutFormula(formula.mathml, {
 		metrics,
 		sizePt,
 		color: document_schema_js.COLOR_BLACK
@@ -160,10 +161,9 @@ function convertShape(shape, slideHeightPt, measurer, images, out, formulaContex
 	} else if (block.kind === "table") cursorYDown = layoutTable(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, placement, measurer, out);
 	else if (block.kind === "embeddedObject" && block.objectKind === "formula" && formulaContext !== void 0) layoutShapeFormula(block, flippedFrame, formulaContext);
 }
-function convertSlide(slide, slideIndex, measurer, images, formulas, positioned) {
+function convertSlide(slide, slideIndex, measurer, images, positioned) {
 	const items = [];
-	const formulaContext = formulas === void 0 ? void 0 : {
-		formulas,
+	const formulaContext = {
 		pageIndex: slideIndex,
 		positioned
 	};
@@ -178,7 +178,7 @@ function convertSlide(slide, slideIndex, measurer, images, formulas, positioned)
 function convertPresentationToLayout(doc, options) {
 	const images = {};
 	const formulas = [];
-	const pages = doc.slides.map((slide, slideIndex) => convertSlide(slide, slideIndex, options.measurer, images, options.formulas, formulas));
+	const pages = doc.slides.map((slide, slideIndex) => convertSlide(slide, slideIndex, options.measurer, images, formulas));
 	return {
 		document: {
 			formatVersion: document_schema_js.LAYOUT_FORMAT_VERSION,

package/dist/layout/slides.d.cts

@@ -1,10 +1,8 @@
-import { EmbeddedFormula } from "../model/formula.cjs";
 import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem } from "document-schema.js";
 import { PositionedFormula, TextMeasurer } from "pdf-codec";
 //#region src/layout/slides.d.ts
 interface SlidesLayoutOptions {
   readonly measurer: TextMeasurer;
-  readonly formulas?: ReadonlyMap<string, EmbeddedFormula>;
 }
 interface PresentationLayoutResult {
   readonly document: LayoutDocument;
@@ -14,7 +12,6 @@ type PresentationContentDocument = Extract<ContentDocument, {
   kind: 'presentation';
 }>;
 interface ShapeFormulaContext {
-  readonly formulas: ReadonlyMap<string, EmbeddedFormula>;
   readonly pageIndex: number;
   readonly positioned: PositionedFormula[];
 }

package/dist/layout/slides.d.ts

@@ -1,10 +1,8 @@
-import { EmbeddedFormula } from "../model/formula.js";
 import { ContentDocument, ContentShape, LayoutDocument, LayoutImageAsset, LayoutItem } from "document-schema.js";
 import { PositionedFormula, TextMeasurer } from "pdf-codec";
 //#region src/layout/slides.d.ts
 interface SlidesLayoutOptions {
   readonly measurer: TextMeasurer;
-  readonly formulas?: ReadonlyMap<string, EmbeddedFormula>;
 }
 interface PresentationLayoutResult {
   readonly document: LayoutDocument;
@@ -14,7 +12,6 @@ type PresentationContentDocument = Extract<ContentDocument, {
   kind: 'presentation';
 }>;
 interface ShapeFormulaContext {
-  readonly formulas: ReadonlyMap<string, EmbeddedFormula>;
   readonly pageIndex: number;
   readonly positioned: PositionedFormula[];
 }

package/dist/layout/slides.js

@@ -1,4 +1,5 @@
 import { flipY } from "../model/geometry.js";
+import { formulaOfBlock } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, lineNaturalHeightPt, registerImage, sumColumnWidthsPt } from "./shared.js";
 import { COLOR_BLACK, LAYOUT_FORMAT_VERSION } from "document-schema.js";
@@ -114,11 +115,11 @@ function layoutTable(table, contentLeftXDown, contentWidthPt, startYDown, slideH
 	return cursorYDown;
 }
 function layoutShapeFormula(block, flippedFrame, formulaContext) {
-	const embedded = block.sourcePath === void 0 ? void 0 : formulaContext.formulas.get(block.sourcePath);
-	if (embedded === void 0) return;
+	const formula = formulaOfBlock(block);
+	if (formula === void 0 || formula.mathml.length === 0) return;
 	const sizePt = formulaSizePtFromFrame(block.frame.heightPt);
 	const metrics = loadMathFont().metricsAt(sizePt);
-	const { box } = layoutFormula(embedded.mathml, {
+	const { box } = layoutFormula(formula.mathml, {
 		metrics,
 		sizePt,
 		color: COLOR_BLACK
@@ -159,10 +160,9 @@ function convertShape(shape, slideHeightPt, measurer, images, out, formulaContex
 	} else if (block.kind === "table") cursorYDown = layoutTable(block, contentLeftXDown, contentWidthPt, cursorYDown, slideHeightPt, placement, measurer, out);
 	else if (block.kind === "embeddedObject" && block.objectKind === "formula" && formulaContext !== void 0) layoutShapeFormula(block, flippedFrame, formulaContext);
 }
-function convertSlide(slide, slideIndex, measurer, images, formulas, positioned) {
+function convertSlide(slide, slideIndex, measurer, images, positioned) {
 	const items = [];
-	const formulaContext = formulas === void 0 ? void 0 : {
-		formulas,
+	const formulaContext = {
 		pageIndex: slideIndex,
 		positioned
 	};
@@ -177,7 +177,7 @@ function convertSlide(slide, slideIndex, measurer, images, formulas, positioned)
 function convertPresentationToLayout(doc, options) {
 	const images = {};
 	const formulas = [];
-	const pages = doc.slides.map((slide, slideIndex) => convertSlide(slide, slideIndex, options.measurer, images, options.formulas, formulas));
+	const pages = doc.slides.map((slide, slideIndex) => convertSlide(slide, slideIndex, options.measurer, images, formulas));
 	return {
 		document: {
 			formatVersion: LAYOUT_FORMAT_VERSION,

package/dist/markdown/write.cjs

@@ -1,4 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_formula = require("../model/formula.cjs");
+const require_model_embedded_drawing = require("../model/embedded-drawing.cjs");
 let markdown_codec = require("markdown-codec");
 //#region src/markdown/write.ts
 function toLegacyEmbeddedDocument(document) {
@@ -12,16 +14,27 @@ function toLegacyBlock(block) {
 			...row,
 			cells: row.cells.map((cell) => ({
 				...cell,
-				blocks: cell.blocks.map(toLegacyBlock)
+				blocks: toLegacyBlocks(cell.blocks)
 			}))
 		}))
 	};
-	if (block.kind === "embeddedObject") return {
-		...block,
-		document: toLegacyEmbeddedDocument(block.document)
-	};
+	if (block.kind === "embeddedObject") {
+		if (require_model_embedded_drawing.drawingOfBlock(block) !== void 0) return;
+		const formula = require_model_formula.formulaOfBlock(block);
+		if (formula !== void 0) return {
+			kind: "paragraph",
+			runs: [{ text: require_model_formula.formulaPlaceholderText(formula) }]
+		};
+		return {
+			...block,
+			document: toLegacyEmbeddedDocument(block.document)
+		};
+	}
 	return block;
 }
+function toLegacyBlocks(blocks) {
+	return blocks.map(toLegacyBlock).filter((block) => block !== void 0);
+}
 function toLegacyWordprocessingDocument(document) {
 	return {
 		kind: "wordprocessing",
@@ -29,7 +42,7 @@ function toLegacyWordprocessingDocument(document) {
 		metadata: document.metadata,
 		sections: document.sections.map((section) => ({
 			...section,
-			blocks: section.blocks.map(toLegacyBlock)
+			blocks: toLegacyBlocks(section.blocks)
 		}))
 	};
 }

package/dist/markdown/write.js

@@ -1,3 +1,5 @@
+import { formulaOfBlock, formulaPlaceholderText } from "../model/formula.js";
+import { drawingOfBlock } from "../model/embedded-drawing.js";
 import { MarkdownUnsupportedDocumentKindError, writeMarkdown } from "markdown-codec";
 //#region src/markdown/write.ts
 function toLegacyEmbeddedDocument(document) {
@@ -11,16 +13,27 @@ function toLegacyBlock(block) {
 			...row,
 			cells: row.cells.map((cell) => ({
 				...cell,
-				blocks: cell.blocks.map(toLegacyBlock)
+				blocks: toLegacyBlocks(cell.blocks)
 			}))
 		}))
 	};
-	if (block.kind === "embeddedObject") return {
-		...block,
-		document: toLegacyEmbeddedDocument(block.document)
-	};
+	if (block.kind === "embeddedObject") {
+		if (drawingOfBlock(block) !== void 0) return;
+		const formula = formulaOfBlock(block);
+		if (formula !== void 0) return {
+			kind: "paragraph",
+			runs: [{ text: formulaPlaceholderText(formula) }]
+		};
+		return {
+			...block,
+			document: toLegacyEmbeddedDocument(block.document)
+		};
+	}
 	return block;
 }
+function toLegacyBlocks(blocks) {
+	return blocks.map(toLegacyBlock).filter((block) => block !== void 0);
+}
 function toLegacyWordprocessingDocument(document) {
 	return {
 		kind: "wordprocessing",
@@ -28,7 +41,7 @@ function toLegacyWordprocessingDocument(document) {
 		metadata: document.metadata,
 		sections: document.sections.map((section) => ({
 			...section,
-			blocks: section.blocks.map(toLegacyBlock)
+			blocks: toLegacyBlocks(section.blocks)
 		}))
 	};
 }

package/dist/mathml/layout.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_mathml_compose = require("./compose.cjs");
 const require_mathml_length = require("./length.cjs");
 const require_mathml_nodes = require("./nodes.cjs");
 const require_mathml_operators = require("./operators.cjs");
-const require_mathml_radical = require("./radical.cjs");
 const require_mathml_variant = require("./variant.cjs");
+const require_mathml_compose = require("./compose.cjs");
+const require_mathml_radical = require("./radical.cjs");
 //#region src/mathml/layout.ts
 function rootContext(options, diagnostics) {
 	return {
@@ -142,16 +142,23 @@ function layoutScripts(base, subscript, superscript, ctx) {
 		items
 	};
 }
-function layoutUnderOver(base, under, over, ctx) {
+function layoutUnderOver(base, under, over, ctx, accentAttachment = {}) {
 	const gapPt = ctx.metrics.stackGapMinPt;
 	const overHeightPt = over === void 0 ? 0 : gapPt + over.heightPt;
 	const underHeightPt = under === void 0 ? 0 : gapPt + under.heightPt;
 	const ascentPt = base.ascentPt + overHeightPt;
 	const descentPt = base.descentPt + underHeightPt;
 	const widthPt = Math.max(base.widthPt, under?.widthPt ?? 0, over?.widthPt ?? 0);
-	const items = [...require_mathml_compose.placeChild(base, (widthPt - base.widthPt) / 2, 0, ascentPt)];
-	if (over !== void 0) items.push(...require_mathml_compose.placeChild(over, (widthPt - over.widthPt) / 2, -(base.ascentPt + gapPt + over.descentPt), ascentPt));
-	if (under !== void 0) items.push(...require_mathml_compose.placeChild(under, (widthPt - under.widthPt) / 2, base.descentPt + gapPt + under.ascentPt, ascentPt));
+	const baseXPt = (widthPt - base.widthPt) / 2;
+	const items = [...require_mathml_compose.placeChild(base, baseXPt, 0, ascentPt)];
+	if (over !== void 0) {
+		const overXPt = accentAttachment.overXPt === void 0 ? (widthPt - over.widthPt) / 2 : baseXPt + accentAttachment.overXPt - over.widthPt / 2;
+		items.push(...require_mathml_compose.placeChild(over, overXPt, -(base.ascentPt + gapPt + over.descentPt), ascentPt));
+	}
+	if (under !== void 0) {
+		const underXPt = accentAttachment.underXPt === void 0 ? (widthPt - under.widthPt) / 2 : baseXPt + accentAttachment.underXPt - under.widthPt / 2;
+		items.push(...require_mathml_compose.placeChild(under, underXPt, base.descentPt + gapPt + under.ascentPt, ascentPt));
+	}
 	return {
 		widthPt,
 		ascentPt,
@@ -163,6 +170,26 @@ function layoutUnderOver(base, under, over, ctx) {
 function isMovableLimitsOperator(element) {
 	return require_mathml_nodes.elementLocalName(element) === "mo" && require_mathml_operators.operatorProperties(require_mathml_nodes.textContent(element).trim()).movablelimits;
 }
+function resolveTopAccentXPt(baseElement, ctx) {
+	const name = require_mathml_nodes.elementLocalName(baseElement);
+	let rawText;
+	let intrinsicDefault;
+	if (name === "mi") {
+		rawText = require_mathml_nodes.textContent(baseElement);
+		intrinsicDefault = miIntrinsicDefault(rawText);
+	} else if (name === "mn" || name === "mtext") {
+		rawText = require_mathml_nodes.textContent(baseElement);
+		intrinsicDefault = "normal";
+	} else if (name === "mo") {
+		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);
+	if (codePoint === void 0) return;
+	return ctx.metrics.glyph(codePoint, ctx.sizePt)?.topAccentXPt;
+}
 function layoutUnderOverElement(element, kind, ctx) {
 	const children = require_mathml_nodes.elementChildren(element);
 	const baseElement = children[0];
@@ -176,9 +203,16 @@ function layoutUnderOverElement(element, kind, ctx) {
 	}
 	const base = layoutNode(baseElement, ctx);
 	const scriptCtx = scriptContext(ctx, false);
-	if (kind === "munder") return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), void 0, ctx);
-	if (kind === "mover") return layoutUnderOver(base, void 0, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), ctx);
-	return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), children[2] === void 0 ? void 0 : layoutNode(children[2], scriptCtx), ctx);
+	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
+	};
+	if (kind === "munder") return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), void 0, ctx, accentAttachment);
+	if (kind === "mover") return layoutUnderOver(base, void 0, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), ctx, accentAttachment);
+	return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), children[2] === void 0 ? void 0 : layoutNode(children[2], scriptCtx), ctx, accentAttachment);
 }
 function layoutFraction(element, ctx) {
 	const children = require_mathml_nodes.elementChildren(element);

package/dist/mathml/layout.d.cts

@@ -1,6 +1,6 @@
+import { r as MathMlNode } from "../nodes-pArN9ilm.cjs";
 import { MathBox, MathColor, MathDiagnostic, MathLayoutResult } from "./layout-types.cjs";
 import { MathFontMetrics } from "./metrics.cjs";
-import { r as MathMlNode } from "../nodes-pArN9ilm.cjs";
 import { MathVariant } from "./variant.cjs";
 //#region src/mathml/layout.d.ts
 interface LayoutFormulaOptions {

package/dist/mathml/layout.d.ts

@@ -1,6 +1,6 @@
+import { r as MathMlNode } from "../nodes-pArN9ilm.js";
 import { MathBox, MathColor, MathDiagnostic, MathLayoutResult } from "./layout-types.js";
 import { MathFontMetrics } from "./metrics.js";
-import { r as MathMlNode } from "../nodes-pArN9ilm.js";
 import { MathVariant } from "./variant.js";
 //#region src/mathml/layout.d.ts
 interface LayoutFormulaOptions {

package/dist/mathml/layout.js

@@ -1,9 +1,9 @@
-import { EMPTY_BOX, concatBoxesHorizontally, placeChild, shiftItems } from "./compose.js";
 import { parseMathLength } from "./length.js";
 import { attrValue, elementChildren, elementLocalName, isMathMlElement, textContent } from "./nodes.js";
 import { operatorProperties } from "./operators.js";
-import { buildRadicalSign } from "./radical.js";
 import { applyMathVariant, isMathVariant } from "./variant.js";
+import { EMPTY_BOX, concatBoxesHorizontally, placeChild, shiftItems } from "./compose.js";
+import { buildRadicalSign } from "./radical.js";
 //#region src/mathml/layout.ts
 function rootContext(options, diagnostics) {
 	return {
@@ -141,16 +141,23 @@ function layoutScripts(base, subscript, superscript, ctx) {
 		items
 	};
 }
-function layoutUnderOver(base, under, over, ctx) {
+function layoutUnderOver(base, under, over, ctx, accentAttachment = {}) {
 	const gapPt = ctx.metrics.stackGapMinPt;
 	const overHeightPt = over === void 0 ? 0 : gapPt + over.heightPt;
 	const underHeightPt = under === void 0 ? 0 : gapPt + under.heightPt;
 	const ascentPt = base.ascentPt + overHeightPt;
 	const descentPt = base.descentPt + underHeightPt;
 	const widthPt = Math.max(base.widthPt, under?.widthPt ?? 0, over?.widthPt ?? 0);
-	const items = [...placeChild(base, (widthPt - base.widthPt) / 2, 0, ascentPt)];
-	if (over !== void 0) items.push(...placeChild(over, (widthPt - over.widthPt) / 2, -(base.ascentPt + gapPt + over.descentPt), ascentPt));
-	if (under !== void 0) items.push(...placeChild(under, (widthPt - under.widthPt) / 2, base.descentPt + gapPt + under.ascentPt, ascentPt));
+	const baseXPt = (widthPt - base.widthPt) / 2;
+	const items = [...placeChild(base, baseXPt, 0, ascentPt)];
+	if (over !== void 0) {
+		const overXPt = accentAttachment.overXPt === void 0 ? (widthPt - over.widthPt) / 2 : baseXPt + accentAttachment.overXPt - over.widthPt / 2;
+		items.push(...placeChild(over, overXPt, -(base.ascentPt + gapPt + over.descentPt), ascentPt));
+	}
+	if (under !== void 0) {
+		const underXPt = accentAttachment.underXPt === void 0 ? (widthPt - under.widthPt) / 2 : baseXPt + accentAttachment.underXPt - under.widthPt / 2;
+		items.push(...placeChild(under, underXPt, base.descentPt + gapPt + under.ascentPt, ascentPt));
+	}
 	return {
 		widthPt,
 		ascentPt,
@@ -162,6 +169,26 @@ function layoutUnderOver(base, under, over, ctx) {
 function isMovableLimitsOperator(element) {
 	return elementLocalName(element) === "mo" && operatorProperties(textContent(element).trim()).movablelimits;
 }
+function resolveTopAccentXPt(baseElement, ctx) {
+	const name = elementLocalName(baseElement);
+	let rawText;
+	let intrinsicDefault;
+	if (name === "mi") {
+		rawText = textContent(baseElement);
+		intrinsicDefault = miIntrinsicDefault(rawText);
+	} else if (name === "mn" || name === "mtext") {
+		rawText = textContent(baseElement);
+		intrinsicDefault = "normal";
+	} else if (name === "mo") {
+		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);
+	if (codePoint === void 0) return;
+	return ctx.metrics.glyph(codePoint, ctx.sizePt)?.topAccentXPt;
+}
 function layoutUnderOverElement(element, kind, ctx) {
 	const children = elementChildren(element);
 	const baseElement = children[0];
@@ -175,9 +202,16 @@ function layoutUnderOverElement(element, kind, ctx) {
 	}
 	const base = layoutNode(baseElement, ctx);
 	const scriptCtx = scriptContext(ctx, false);
-	if (kind === "munder") return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), void 0, ctx);
-	if (kind === "mover") return layoutUnderOver(base, void 0, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), ctx);
-	return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), children[2] === void 0 ? void 0 : layoutNode(children[2], scriptCtx), ctx);
+	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
+	};
+	if (kind === "munder") return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), void 0, ctx, accentAttachment);
+	if (kind === "mover") return layoutUnderOver(base, void 0, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), ctx, accentAttachment);
+	return layoutUnderOver(base, children[1] === void 0 ? void 0 : layoutNode(children[1], scriptCtx), children[2] === void 0 ? void 0 : layoutNode(children[2], scriptCtx), ctx, accentAttachment);
 }
 function layoutFraction(element, ctx) {
 	const children = elementChildren(element);

package/dist/mathml/variant.cjs

@@ -824,7 +824,13 @@ const GREEK_VARIANTS = {
 			120538
 		],
 		nabla: 120513,
-		partial: 120539
+		partial: 120539,
+		epsilon: 120540,
+		theta: 120541,
+		kappa: 120542,
+		phi: 120543,
+		rho: 120544,
+		pi: 120545
 	},
 	italic: {
 		upper: [
@@ -880,7 +886,13 @@ const GREEK_VARIANTS = {
 			120596
 		],
 		nabla: 120571,
-		partial: 120597
+		partial: 120597,
+		epsilon: 120598,
+		theta: 120599,
+		kappa: 120600,
+		phi: 120601,
+		rho: 120602,
+		pi: 120603
 	},
 	"bold-italic": {
 		upper: [
@@ -936,7 +948,13 @@ const GREEK_VARIANTS = {
 			120654
 		],
 		nabla: 120629,
-		partial: 120655
+		partial: 120655,
+		epsilon: 120656,
+		theta: 120657,
+		kappa: 120658,
+		phi: 120659,
+		rho: 120660,
+		pi: 120661
 	},
 	"bold-sans-serif": {
 		upper: [
@@ -992,7 +1010,13 @@ const GREEK_VARIANTS = {
 			120712
 		],
 		nabla: 120687,
-		partial: 120713
+		partial: 120713,
+		epsilon: 120714,
+		theta: 120715,
+		kappa: 120716,
+		phi: 120717,
+		rho: 120718,
+		pi: 120719
 	},
 	"sans-serif-bold-italic": {
 		upper: [
@@ -1048,9 +1072,23 @@ const GREEK_VARIANTS = {
 			120770
 		],
 		nabla: 120745,
-		partial: 120771
+		partial: 120771,
+		epsilon: 120772,
+		theta: 120773,
+		kappa: 120774,
+		phi: 120775,
+		rho: 120776,
+		pi: 120777
 	}
 };
+const GREEK_SYMBOL_BASES = /* @__PURE__ */ new Map([
+	[1013, "epsilon"],
+	[977, "theta"],
+	[1008, "kappa"],
+	[981, "phi"],
+	[1009, "rho"],
+	[982, "pi"]
+]);
 const DIGIT_VARIANTS = {
 	bold: [
 		120782,
@@ -1124,6 +1162,11 @@ function mapMathVariant(codePoint, variant) {
 	if (greekLowerIndex !== -1) return GREEK_VARIANTS[variant]?.lower[greekLowerIndex] ?? codePoint;
 	if (codePoint === 8711) return GREEK_VARIANTS[variant]?.nabla ?? codePoint;
 	if (codePoint === 8706) return GREEK_VARIANTS[variant]?.partial ?? codePoint;
+	const symbolField = GREEK_SYMBOL_BASES.get(codePoint);
+	if (symbolField !== void 0) {
+		const entry = GREEK_VARIANTS[variant];
+		return entry === void 0 ? codePoint : entry[symbolField];
+	}
 	return codePoint;
 }
 function applyMathVariant(text, variant) {