js.documents 1.99.4 → 1.99.6

package/dist/layout/engine.cjs

@@ -5,7 +5,23 @@ const require_mathml_layout = require("../mathml/layout.cjs");
 const require_layout_text_layout = require("./text-layout.cjs");
 const require_layout_shared = require("./shared.cjs");
 let document_schema_js = require("document-schema.js");
+let markdown_codec = require("markdown-codec");
 //#region src/layout/engine.ts
+const LIST_INDENT_STEP_PT = 18;
+const BULLET_GLYPHS = [
+	"•",
+	"-",
+	"*"
+];
+function listMarkerText(list, counters) {
+	const info = (0, markdown_codec.parseListNumId)(list.numId);
+	if (info?.type === "ordered") {
+		const next = counters.get(list.numId) ?? info.start ?? 1;
+		counters.set(list.numId, next + 1);
+		return `${next}.`;
+	}
+	return BULLET_GLYPHS[list.level % BULLET_GLYPHS.length];
+}
 function newFlowState(section) {
 	return {
 		items: [],
@@ -24,12 +40,13 @@ function flushPage(state, section, pages) {
 function ensureRoom(state, section, pages, neededHeightPt, contentBottomYDown) {
 	if (state.items.length > 0 && state.cursorYDown + neededHeightPt > contentBottomYDown) flushPage(state, section, pages);
 }
-function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
 	if (state.items.length > 0) state.cursorYDown += paragraph.spacingBeforePt ?? 0;
-	const effectiveRuns = require_layout_shared.effectiveStyledRuns(paragraph.runs);
+	const effectiveRuns = require_layout_shared.effectiveStyledRuns(paragraph.runs, 1, require_layout_shared.headingStyleFor(paragraph.styleId));
 	const fallbackRun = effectiveRuns[0];
-	const paragraphLeftXDown = contentLeftXDown + (paragraph.indentLeftPt ?? 0);
-	const paragraphWidthPt = Math.max(0, contentWidthPt - (paragraph.indentLeftPt ?? 0));
+	const listIndentPt = paragraph.list !== void 0 ? (paragraph.list.level + 1) * LIST_INDENT_STEP_PT : 0;
+	const paragraphLeftXDown = contentLeftXDown + (paragraph.indentLeftPt ?? 0) + listIndentPt;
+	const paragraphWidthPt = Math.max(0, contentWidthPt - (paragraph.indentLeftPt ?? 0) - listIndentPt);
 	const lines = require_layout_text_layout.wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt);
 	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = require_layout_shared.lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
@@ -38,6 +55,16 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = require_layout_shared.alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? require_layout_shared.justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		if (lineIndex === 0 && paragraph.list !== void 0) state.items.push({
+			kind: "text",
+			text: listMarkerText(paragraph.list, listCounters),
+			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+			yPt: section.pageSize.heightPt - baselineYDown,
+			font: fallbackRun.font,
+			sizePt: fallbackRun.sizePt,
+			color: fallbackRun.color,
+			sourcePath: paragraph.sourcePath
+		});
 		line.fragments.forEach((fragment, fragmentIndex) => {
 			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0);
 			const yPt = section.pageSize.heightPt - baselineYDown;
@@ -71,12 +98,13 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	});
 	state.cursorYDown += paragraph.spacingAfterPt ?? 0;
 }
-function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, measurer, out) {
+function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, measurer, out, listCounters) {
 	let cursorYDown = startYDown + (paragraph.spacingBeforePt ?? 0);
-	const effectiveRuns = require_layout_shared.effectiveStyledRuns(paragraph.runs);
+	const effectiveRuns = require_layout_shared.effectiveStyledRuns(paragraph.runs, 1, require_layout_shared.headingStyleFor(paragraph.styleId));
 	const fallbackRun = effectiveRuns[0];
-	const paragraphLeftXDown = cellLeftXDown + (paragraph.indentLeftPt ?? 0);
-	const paragraphWidthPt = Math.max(0, cellWidthPt - (paragraph.indentLeftPt ?? 0));
+	const listIndentPt = paragraph.list !== void 0 ? (paragraph.list.level + 1) * LIST_INDENT_STEP_PT : 0;
+	const paragraphLeftXDown = cellLeftXDown + (paragraph.indentLeftPt ?? 0) + listIndentPt;
+	const paragraphWidthPt = Math.max(0, cellWidthPt - (paragraph.indentLeftPt ?? 0) - listIndentPt);
 	const lines = require_layout_text_layout.wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt);
 	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = require_layout_shared.lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
@@ -84,6 +112,16 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = require_layout_shared.alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? require_layout_shared.justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		if (lineIndex === 0 && paragraph.list !== void 0) out.push({
+			kind: "text",
+			text: listMarkerText(paragraph.list, listCounters),
+			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+			yPt: pageHeightPt - baselineYDown,
+			font: fallbackRun.font,
+			sizePt: fallbackRun.sizePt,
+			color: fallbackRun.color,
+			sourcePath: paragraph.sourcePath
+		});
 		line.fragments.forEach((fragment, fragmentIndex) => {
 			out.push({
 				kind: "text",
@@ -101,7 +139,7 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 	});
 	return cursorYDown + (paragraph.spacingAfterPt ?? 0);
 }
-function layoutTableFlow(table, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+function layoutTableFlow(table, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
 	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
 	for (const row of table.rows) {
@@ -133,7 +171,7 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 			}
 			if (cell.borders !== void 0) require_layout_shared.pushCellBorderLines(cell.borders, cellFrameYDown, section.pageSize.heightPt, cellSourcePath, state.items);
 			let cellCursorYDown = state.cursorYDown;
-			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, measurer, state.items);
+			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, measurer, state.items, listCounters);
 			cellXDown += cellWidthPt;
 			colIndex += span;
 		}
@@ -161,18 +199,18 @@ function layoutImageFlow(block, section, pages, state, contentLeftXDown, content
 	state.items.push(imageItem);
 	state.cursorYDown += block.heightPt;
 }
-function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
 	const formula = require_model_formula.formulaOfBlock(block);
 	if (formula === void 0) return;
 	layoutParagraphFlow({
 		kind: "paragraph",
 		runs: [{ text: require_model_formula.formulaPlaceholderText(formula) }]
-	}, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+	}, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
 }
-function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, mathMetricsAt, formulas) {
+function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, mathMetricsAt, formulas, listCounters) {
 	const formula = require_model_formula.formulaOfBlock(block);
 	if (formula === void 0 || formula.mathml.length === 0) {
-		layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+		layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
 		return;
 	}
 	const sizePt = require_layout_shared.formulaSizePtForFrame(formula.mathml, block.frame, mathMetricsAt);
@@ -197,24 +235,25 @@ function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, conte
 	});
 	state.cursorYDown += box.heightPt;
 }
-function paginateSection(section, measurer, images, pages, options, formulas) {
+function paginateSection(section, measurer, images, pages, options, formulas, listCounters) {
 	const contentLeftXDown = section.margins.leftPt;
 	const contentWidthPt = Math.max(0, section.pageSize.widthPt - section.margins.leftPt - section.margins.rightPt);
 	const contentBottomYDown = section.pageSize.heightPt - section.margins.bottomPt;
 	const state = newFlowState(section);
 	for (const block of section.blocks) if (block.kind === "pageBreak") {
 		if (state.items.length > 0) flushPage(state, section, pages);
-	} else if (block.kind === "paragraph") layoutParagraphFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
-	else if (block.kind === "table") layoutTableFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+	} else if (block.kind === "paragraph") layoutParagraphFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
+	else if (block.kind === "table") layoutTableFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
 	else if (block.kind === "image") layoutImageFlow(block, section, pages, state, contentLeftXDown, contentBottomYDown, images);
-	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options.mathMetricsAt, formulas);
+	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options.mathMetricsAt, formulas, listCounters);
 	flushPage(state, section, pages);
 }
 function convertWordprocessingToLayout(doc, options) {
 	const images = {};
 	const pages = [];
 	const formulas = [];
-	for (const section of doc.sections) paginateSection(section, options.measurer, images, pages, options, formulas);
+	const listCounters = /* @__PURE__ */ new Map();
+	for (const section of doc.sections) paginateSection(section, options.measurer, images, pages, options, formulas, listCounters);
 	return {
 		document: {
 			formatVersion: document_schema_js.LAYOUT_FORMAT_VERSION,

package/dist/layout/engine.js

@@ -2,9 +2,25 @@ import { flipY } from "../model/geometry.js";
 import { formulaOfBlock, formulaPlaceholderText } from "../model/formula.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { wrapRunsToWidth } from "./text-layout.js";
-import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, sumColumnWidthsPt } from "./shared.js";
+import { alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, sumColumnWidthsPt } from "./shared.js";
 import { COLOR_BLACK, LAYOUT_FORMAT_VERSION } from "document-schema.js";
+import { parseListNumId } from "markdown-codec";
 //#region src/layout/engine.ts
+const LIST_INDENT_STEP_PT = 18;
+const BULLET_GLYPHS = [
+	"•",
+	"-",
+	"*"
+];
+function listMarkerText(list, counters) {
+	const info = parseListNumId(list.numId);
+	if (info?.type === "ordered") {
+		const next = counters.get(list.numId) ?? info.start ?? 1;
+		counters.set(list.numId, next + 1);
+		return `${next}.`;
+	}
+	return BULLET_GLYPHS[list.level % BULLET_GLYPHS.length];
+}
 function newFlowState(section) {
 	return {
 		items: [],
@@ -23,12 +39,13 @@ function flushPage(state, section, pages) {
 function ensureRoom(state, section, pages, neededHeightPt, contentBottomYDown) {
 	if (state.items.length > 0 && state.cursorYDown + neededHeightPt > contentBottomYDown) flushPage(state, section, pages);
 }
-function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
 	if (state.items.length > 0) state.cursorYDown += paragraph.spacingBeforePt ?? 0;
-	const effectiveRuns = effectiveStyledRuns(paragraph.runs);
+	const effectiveRuns = effectiveStyledRuns(paragraph.runs, 1, headingStyleFor(paragraph.styleId));
 	const fallbackRun = effectiveRuns[0];
-	const paragraphLeftXDown = contentLeftXDown + (paragraph.indentLeftPt ?? 0);
-	const paragraphWidthPt = Math.max(0, contentWidthPt - (paragraph.indentLeftPt ?? 0));
+	const listIndentPt = paragraph.list !== void 0 ? (paragraph.list.level + 1) * LIST_INDENT_STEP_PT : 0;
+	const paragraphLeftXDown = contentLeftXDown + (paragraph.indentLeftPt ?? 0) + listIndentPt;
+	const paragraphWidthPt = Math.max(0, contentWidthPt - (paragraph.indentLeftPt ?? 0) - listIndentPt);
 	const lines = wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt);
 	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
@@ -37,6 +54,16 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		if (lineIndex === 0 && paragraph.list !== void 0) state.items.push({
+			kind: "text",
+			text: listMarkerText(paragraph.list, listCounters),
+			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+			yPt: section.pageSize.heightPt - baselineYDown,
+			font: fallbackRun.font,
+			sizePt: fallbackRun.sizePt,
+			color: fallbackRun.color,
+			sourcePath: paragraph.sourcePath
+		});
 		line.fragments.forEach((fragment, fragmentIndex) => {
 			const xPt = paragraphLeftXDown + firstLineIndentPt + alignOffsetPt + fragment.xOffsetPt + (justifyGapsPt?.[fragmentIndex] ?? 0);
 			const yPt = section.pageSize.heightPt - baselineYDown;
@@ -70,12 +97,13 @@ function layoutParagraphFlow(paragraph, section, pages, state, contentLeftXDown,
 	});
 	state.cursorYDown += paragraph.spacingAfterPt ?? 0;
 }
-function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, measurer, out) {
+function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown, pageHeightPt, measurer, out, listCounters) {
 	let cursorYDown = startYDown + (paragraph.spacingBeforePt ?? 0);
-	const effectiveRuns = effectiveStyledRuns(paragraph.runs);
+	const effectiveRuns = effectiveStyledRuns(paragraph.runs, 1, headingStyleFor(paragraph.styleId));
 	const fallbackRun = effectiveRuns[0];
-	const paragraphLeftXDown = cellLeftXDown + (paragraph.indentLeftPt ?? 0);
-	const paragraphWidthPt = Math.max(0, cellWidthPt - (paragraph.indentLeftPt ?? 0));
+	const listIndentPt = paragraph.list !== void 0 ? (paragraph.list.level + 1) * LIST_INDENT_STEP_PT : 0;
+	const paragraphLeftXDown = cellLeftXDown + (paragraph.indentLeftPt ?? 0) + listIndentPt;
+	const paragraphWidthPt = Math.max(0, cellWidthPt - (paragraph.indentLeftPt ?? 0) - listIndentPt);
 	const lines = wrapRunsToWidth(effectiveRuns, measurer, paragraphWidthPt);
 	lines.forEach((line, lineIndex) => {
 		const lineHeightPt = lineNaturalHeightPt(line, measurer, fallbackRun) * (paragraph.lineSpacing ?? 1);
@@ -83,6 +111,16 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 		const firstLineIndentPt = lineIndex === 0 ? paragraph.indentFirstLinePt ?? 0 : 0;
 		const alignOffsetPt = alignmentOffsetPt(paragraph.alignment, paragraphWidthPt, line.widthPt);
 		const justifyGapsPt = paragraph.alignment === "justify" && lineIndex < lines.length - 1 ? justifyLineGapsPt(line, paragraphWidthPt, measurer) : void 0;
+		if (lineIndex === 0 && paragraph.list !== void 0) out.push({
+			kind: "text",
+			text: listMarkerText(paragraph.list, listCounters),
+			xPt: paragraphLeftXDown - LIST_INDENT_STEP_PT,
+			yPt: pageHeightPt - baselineYDown,
+			font: fallbackRun.font,
+			sizePt: fallbackRun.sizePt,
+			color: fallbackRun.color,
+			sourcePath: paragraph.sourcePath
+		});
 		line.fragments.forEach((fragment, fragmentIndex) => {
 			out.push({
 				kind: "text",
@@ -100,7 +138,7 @@ function layoutParagraphInCell(paragraph, cellLeftXDown, cellWidthPt, startYDown
 	});
 	return cursorYDown + (paragraph.spacingAfterPt ?? 0);
 }
-function layoutTableFlow(table, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+function layoutTableFlow(table, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
 	const gridWidthPt = table.columnWidthsPt.reduce((sum, w) => sum + w, 0);
 	const scale = gridWidthPt > 0 ? contentWidthPt / gridWidthPt : 1;
 	for (const row of table.rows) {
@@ -132,7 +170,7 @@ function layoutTableFlow(table, section, pages, state, contentLeftXDown, content
 			}
 			if (cell.borders !== void 0) pushCellBorderLines(cell.borders, cellFrameYDown, section.pageSize.heightPt, cellSourcePath, state.items);
 			let cellCursorYDown = state.cursorYDown;
-			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, measurer, state.items);
+			for (const block of cell.blocks) if (block.kind === "paragraph") cellCursorYDown = layoutParagraphInCell(block, cellXDown, cellWidthPt, cellCursorYDown, section.pageSize.heightPt, measurer, state.items, listCounters);
 			cellXDown += cellWidthPt;
 			colIndex += span;
 		}
@@ -160,18 +198,18 @@ function layoutImageFlow(block, section, pages, state, contentLeftXDown, content
 	state.items.push(imageItem);
 	state.cursorYDown += block.heightPt;
 }
-function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer) {
+function layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters) {
 	const formula = formulaOfBlock(block);
 	if (formula === void 0) return;
 	layoutParagraphFlow({
 		kind: "paragraph",
 		runs: [{ text: formulaPlaceholderText(formula) }]
-	}, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+	}, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
 }
-function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, mathMetricsAt, formulas) {
+function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, mathMetricsAt, formulas, listCounters) {
 	const formula = formulaOfBlock(block);
 	if (formula === void 0 || formula.mathml.length === 0) {
-		layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+		layoutFormulaFallback(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
 		return;
 	}
 	const sizePt = formulaSizePtForFrame(formula.mathml, block.frame, mathMetricsAt);
@@ -196,24 +234,25 @@ function layoutFormulaFlow(block, section, pages, state, contentLeftXDown, conte
 	});
 	state.cursorYDown += box.heightPt;
 }
-function paginateSection(section, measurer, images, pages, options, formulas) {
+function paginateSection(section, measurer, images, pages, options, formulas, listCounters) {
 	const contentLeftXDown = section.margins.leftPt;
 	const contentWidthPt = Math.max(0, section.pageSize.widthPt - section.margins.leftPt - section.margins.rightPt);
 	const contentBottomYDown = section.pageSize.heightPt - section.margins.bottomPt;
 	const state = newFlowState(section);
 	for (const block of section.blocks) if (block.kind === "pageBreak") {
 		if (state.items.length > 0) flushPage(state, section, pages);
-	} else if (block.kind === "paragraph") layoutParagraphFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
-	else if (block.kind === "table") layoutTableFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer);
+	} else if (block.kind === "paragraph") layoutParagraphFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
+	else if (block.kind === "table") layoutTableFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, listCounters);
 	else if (block.kind === "image") layoutImageFlow(block, section, pages, state, contentLeftXDown, contentBottomYDown, images);
-	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options.mathMetricsAt, formulas);
+	else if (block.kind === "embeddedObject" && block.objectKind === "formula") layoutFormulaFlow(block, section, pages, state, contentLeftXDown, contentWidthPt, contentBottomYDown, measurer, options.mathMetricsAt, formulas, listCounters);
 	flushPage(state, section, pages);
 }
 function convertWordprocessingToLayout(doc, options) {
 	const images = {};
 	const pages = [];
 	const formulas = [];
-	for (const section of doc.sections) paginateSection(section, options.measurer, images, pages, options, formulas);
+	const listCounters = /* @__PURE__ */ new Map();
+	for (const section of doc.sections) paginateSection(section, options.measurer, images, pages, options, formulas, listCounters);
 	return {
 		document: {
 			formatVersion: LAYOUT_FORMAT_VERSION,

package/dist/layout/shared.cjs

@@ -20,26 +20,59 @@ function formulaSizePtForFrame(mathml, frame, mathMetricsAt) {
 	return Math.max(MIN_FORMULA_SIZE_PT, REFERENCE_FORMULA_SIZE_PT * Math.min(heightScale, widthScale));
 }
 const FALLBACK_ROW_HEIGHT_PT = 20;
-function runFont(run) {
+const HEADING_STYLES = {
+	1: {
+		bold: true,
+		sizePt: 28
+	},
+	2: {
+		bold: true,
+		sizePt: 22
+	},
+	3: {
+		bold: true,
+		sizePt: 18
+	},
+	4: {
+		bold: true,
+		sizePt: 14
+	},
+	5: {
+		bold: true,
+		sizePt: 12
+	},
+	6: {
+		bold: true,
+		sizePt: 11
+	}
+};
+function headingStyleFor(styleId) {
+	if (styleId === void 0) return void 0;
+	const match = /^Heading([1-6])$/.exec(styleId);
+	if (match === null) return void 0;
+	return HEADING_STYLES[Number(match[1])];
+}
+function runFont(run, headingBold) {
+	const bold = run.bold ?? headingBold ?? false;
 	return {
 		family: run.fontFamily ?? document_schema_js.DEFAULT_LAYOUT_FONT.family,
-		weight: run.bold === true ? "bold" : "normal",
+		weight: bold ? "bold" : "normal",
 		style: run.italic === true ? "italic" : "normal"
 	};
 }
-function toStyledRuns(runs, fontScale = 1) {
+function toStyledRuns(runs, fontScale = 1, headingStyle) {
 	return runs.map((run) => ({
 		text: run.text,
-		font: runFont(run),
-		sizePt: (run.sizePt ?? 18) * fontScale,
+		font: runFont(run, headingStyle?.bold),
+		sizePt: (run.sizePt ?? headingStyle?.sizePt ?? 18) * fontScale,
 		color: run.color ?? document_schema_js.COLOR_BLACK,
 		underline: run.underline,
 		hyperlink: run.hyperlink,
 		sourcePath: run.sourcePath
 	}));
 }
-function effectiveStyledRuns(runs, fontScale = 1) {
-	const styled = toStyledRuns(runs, fontScale);
+function effectiveStyledRuns(runs, fontScale = 1, headingStyle) {
+	const styled = toStyledRuns(runs, fontScale, headingStyle);
 	return styled.length > 0 ? styled : [{
 		text: "",
 		font: document_schema_js.DEFAULT_LAYOUT_FONT,
@@ -150,7 +183,7 @@ function estimateRowHeightPt(row, measurer, columnWidthsPt, scale) {
 		const cellWidthPt = sumColumnWidthsPt(columnWidthsPt, colIndex, span) * scale;
 		for (const block of cell.blocks) {
 			if (block.kind !== "paragraph") continue;
-			const runs = effectiveStyledRuns(block.runs);
+			const runs = effectiveStyledRuns(block.runs, 1, headingStyleFor(block.styleId));
 			const lines = require_layout_text_layout.wrapRunsToWidth(runs, measurer, cellWidthPt);
 			for (const line of lines) max = Math.max(max, lineNaturalHeightPt(line, measurer, runs[0]));
 		}
@@ -164,6 +197,7 @@ exports.alignmentOffsetPt = alignmentOffsetPt;
 exports.effectiveStyledRuns = effectiveStyledRuns;
 exports.estimateRowHeightPt = estimateRowHeightPt;
 exports.formulaSizePtForFrame = formulaSizePtForFrame;
+exports.headingStyleFor = headingStyleFor;
 exports.justifyLineGapsPt = justifyLineGapsPt;
 exports.lineNaturalHeightPt = lineNaturalHeightPt;
 exports.pushCellBorderLines = pushCellBorderLines;

package/dist/layout/shared.d.cts

@@ -2,9 +2,19 @@ import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, Cont
 //#region src/layout/shared.d.ts
 declare const NOMINAL_TEXT_SIZE_PT = 18;
 declare function formulaSizePtForFrame(mathml: readonly MathMlNode[], frame: Box, mathMetricsAt: (sizePt: number) => MathFontMetrics): number;
-declare function runFont(run: ContentRun): LayoutFont;
-declare function toStyledRuns(runs: readonly ContentRun[], fontScale?: number): StyledRun[];
-declare function effectiveStyledRuns(runs: readonly ContentRun[], fontScale?: number): StyledRun[];
+declare function headingStyleFor(styleId: string | undefined): {
+  bold: boolean;
+  sizePt: number;
+} | undefined;
+declare function runFont(run: ContentRun, headingBold?: boolean): LayoutFont;
+declare function toStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
+  bold: boolean;
+  sizePt: number;
+}): StyledRun[];
+declare function effectiveStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
+  bold: boolean;
+  sizePt: number;
+}): StyledRun[];
 declare function lineNaturalHeightPt(line: WrappedLine, measurer: TextMeasurer, fallback: StyledRun): number;
 declare function alignmentOffsetPt(alignment: Alignment | undefined, contentWidthPt: number, lineWidthPt: number): number;
 declare function justifyLineGapsPt(line: WrappedLine, targetWidthPt: number, measurer: TextMeasurer): readonly number[];
@@ -13,4 +23,4 @@ declare function registerImage(block: ContentImageBlock, images: Record<string,
 declare function sumColumnWidthsPt(columnWidthsPt: readonly number[], startIndex: number, span: number): number;
 declare function estimateRowHeightPt(row: ContentTableRow, measurer: TextMeasurer, columnWidthsPt: readonly number[], scale: number): number;
 //#endregion
-export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };
+export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };

package/dist/layout/shared.d.ts

@@ -2,9 +2,19 @@ import { Alignment, Box, ContentCellBorders, ContentImageBlock, ContentRun, Cont
 //#region src/layout/shared.d.ts
 declare const NOMINAL_TEXT_SIZE_PT = 18;
 declare function formulaSizePtForFrame(mathml: readonly MathMlNode[], frame: Box, mathMetricsAt: (sizePt: number) => MathFontMetrics): number;
-declare function runFont(run: ContentRun): LayoutFont;
-declare function toStyledRuns(runs: readonly ContentRun[], fontScale?: number): StyledRun[];
-declare function effectiveStyledRuns(runs: readonly ContentRun[], fontScale?: number): StyledRun[];
+declare function headingStyleFor(styleId: string | undefined): {
+  bold: boolean;
+  sizePt: number;
+} | undefined;
+declare function runFont(run: ContentRun, headingBold?: boolean): LayoutFont;
+declare function toStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
+  bold: boolean;
+  sizePt: number;
+}): StyledRun[];
+declare function effectiveStyledRuns(runs: readonly ContentRun[], fontScale?: number, headingStyle?: {
+  bold: boolean;
+  sizePt: number;
+}): StyledRun[];
 declare function lineNaturalHeightPt(line: WrappedLine, measurer: TextMeasurer, fallback: StyledRun): number;
 declare function alignmentOffsetPt(alignment: Alignment | undefined, contentWidthPt: number, lineWidthPt: number): number;
 declare function justifyLineGapsPt(line: WrappedLine, targetWidthPt: number, measurer: TextMeasurer): readonly number[];
@@ -13,4 +23,4 @@ declare function registerImage(block: ContentImageBlock, images: Record<string,
 declare function sumColumnWidthsPt(columnWidthsPt: readonly number[], startIndex: number, span: number): number;
 declare function estimateRowHeightPt(row: ContentTableRow, measurer: TextMeasurer, columnWidthsPt: readonly number[], scale: number): number;
 //#endregion
-export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };
+export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };

package/dist/layout/shared.js

@@ -19,26 +19,59 @@ function formulaSizePtForFrame(mathml, frame, mathMetricsAt) {
 	return Math.max(MIN_FORMULA_SIZE_PT, REFERENCE_FORMULA_SIZE_PT * Math.min(heightScale, widthScale));
 }
 const FALLBACK_ROW_HEIGHT_PT = 20;
-function runFont(run) {
+const HEADING_STYLES = {
+	1: {
+		bold: true,
+		sizePt: 28
+	},
+	2: {
+		bold: true,
+		sizePt: 22
+	},
+	3: {
+		bold: true,
+		sizePt: 18
+	},
+	4: {
+		bold: true,
+		sizePt: 14
+	},
+	5: {
+		bold: true,
+		sizePt: 12
+	},
+	6: {
+		bold: true,
+		sizePt: 11
+	}
+};
+function headingStyleFor(styleId) {
+	if (styleId === void 0) return void 0;
+	const match = /^Heading([1-6])$/.exec(styleId);
+	if (match === null) return void 0;
+	return HEADING_STYLES[Number(match[1])];
+}
+function runFont(run, headingBold) {
+	const bold = run.bold ?? headingBold ?? false;
 	return {
 		family: run.fontFamily ?? DEFAULT_LAYOUT_FONT.family,
-		weight: run.bold === true ? "bold" : "normal",
+		weight: bold ? "bold" : "normal",
 		style: run.italic === true ? "italic" : "normal"
 	};
 }
-function toStyledRuns(runs, fontScale = 1) {
+function toStyledRuns(runs, fontScale = 1, headingStyle) {
 	return runs.map((run) => ({
 		text: run.text,
-		font: runFont(run),
-		sizePt: (run.sizePt ?? 18) * fontScale,
+		font: runFont(run, headingStyle?.bold),
+		sizePt: (run.sizePt ?? headingStyle?.sizePt ?? 18) * fontScale,
 		color: run.color ?? COLOR_BLACK,
 		underline: run.underline,
 		hyperlink: run.hyperlink,
 		sourcePath: run.sourcePath
 	}));
 }
-function effectiveStyledRuns(runs, fontScale = 1) {
-	const styled = toStyledRuns(runs, fontScale);
+function effectiveStyledRuns(runs, fontScale = 1, headingStyle) {
+	const styled = toStyledRuns(runs, fontScale, headingStyle);
 	return styled.length > 0 ? styled : [{
 		text: "",
 		font: DEFAULT_LAYOUT_FONT,
@@ -149,7 +182,7 @@ function estimateRowHeightPt(row, measurer, columnWidthsPt, scale) {
 		const cellWidthPt = sumColumnWidthsPt(columnWidthsPt, colIndex, span) * scale;
 		for (const block of cell.blocks) {
 			if (block.kind !== "paragraph") continue;
-			const runs = effectiveStyledRuns(block.runs);
+			const runs = effectiveStyledRuns(block.runs, 1, headingStyleFor(block.styleId));
 			const lines = wrapRunsToWidth(runs, measurer, cellWidthPt);
 			for (const line of lines) max = Math.max(max, lineNaturalHeightPt(line, measurer, runs[0]));
 		}
@@ -158,4 +191,4 @@ function estimateRowHeightPt(row, measurer, columnWidthsPt, scale) {
 	return max;
 }
 //#endregion
-export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };
+export { NOMINAL_TEXT_SIZE_PT, alignmentOffsetPt, effectiveStyledRuns, estimateRowHeightPt, formulaSizePtForFrame, headingStyleFor, justifyLineGapsPt, lineNaturalHeightPt, pushCellBorderLines, registerImage, runFont, sumColumnWidthsPt, toStyledRuns };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "1.99.4",
+  "version": "1.99.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": {