reamkit 1.2.0 → 1.3.0

package/dist/esm/layout/styled-layout.js

@@ -36,6 +36,11 @@ var DEFAULT_BORDER_SIZE_EIGHTH = 4;
 var FOOTNOTE_RULE_PT = .75;
 var FOOTNOTE_RULE_GAP_ABOVE = 4;
 var FOOTNOTE_SEPARATOR_HEIGHT = 10;
+var FLOAT_TEXT_GAP = 6;
+var MIN_WRAP_WIDTH = 36;
+function isOutOfFlowFloat(f) {
+	return f !== void 0 && f.wrap !== "topAndBottom";
+}
 var FOOTNOTE_RULE_WIDTH = 144;
 function assignNoteNumbers(body) {
 	const footnotes = /* @__PURE__ */ new Map();
@@ -224,8 +229,9 @@ function layoutStyledDocument(body, options) {
 		for (const note of tailNotes.sort((a, b) => a.n - b.n)) for (const el of substituteNoteNumber(note.content, note.n)) blocks.push(layoutBodyElement(el, options, fontResources, imageResources, lastCtx.contentWidth, lastCtx.pageContentHeight));
 	}
 	const bookmarks = /* @__PURE__ */ new Map();
+	const reflowParagraph = (paragraph, width, widths) => layoutParagraphBlock(paragraph, options, fontResources, imageResources, width, widths);
 	return {
-		pages: paginateSections(blocks, sectionCtxs, structBuilder, options.language ?? "en-US", notePlan, bookmarks),
+		pages: paginateSections(blocks, sectionCtxs, structBuilder, options.language ?? "en-US", notePlan, bookmarks, reflowParagraph),
 		resources: options.resources ?? new ResourceStore(),
 		fontResources,
 		imageResources,
@@ -832,14 +838,14 @@ function collectFontResources(body, headersFooters, options) {
 	}
 	return out;
 }
-function layoutParagraphBlock(paragraph, options, fontResources, imageResources, contentWidth) {
+function layoutParagraphBlock(paragraph, options, fontResources, imageResources, contentWidth, lineWidths) {
 	const baseResolved = resolveParagraphProperties(paragraph.properties, options.styles);
 	const baseDir = paragraphBaseDirection(paragraph, baseResolved);
 	const resolved = baseDir === "rtl" && baseResolved.alignment === "left" ? {
 		...baseResolved,
 		alignment: "right"
 	} : baseResolved;
-	const lines = wrap(tokenizeParagraph(paragraph, options, fontResources, imageResources, contentWidth, baseDir), paragraphMaxWidth(resolved, contentWidth, true), paragraphMaxWidth(resolved, contentWidth, false), resolved, options.hyphenator);
+	const lines = wrap(tokenizeParagraph(paragraph, options, fontResources, imageResources, contentWidth, baseDir), paragraphMaxWidth(resolved, contentWidth, true), paragraphMaxWidth(resolved, contentWidth, false), resolved, options.hyphenator, lineWidths);
 	let heightPt = 0;
 	for (const line of lines) heightPt += computeLineHeight(line, resolved);
 	const numbering = paragraph.properties.numbering;
@@ -855,7 +861,8 @@ function layoutParagraphBlock(paragraph, options, fontResources, imageResources,
 			level: numbering.ilvl
 		} } : {},
 		...paragraph.runs.some((r) => r.pageBreak) ? { pageBreakAfter: true } : {},
-		...paragraph.bookmarks && paragraph.bookmarks.length > 0 ? { bookmarks: paragraph.bookmarks } : {}
+		...paragraph.bookmarks && paragraph.bookmarks.length > 0 ? { bookmarks: paragraph.bookmarks } : {},
+		source: paragraph
 	};
 }
 function resolveMathItems(items, fontFor) {
@@ -987,6 +994,7 @@ function tokenizePlansLtr(plans) {
 			...plan.run.href !== void 0 ? { href: plan.run.href } : {},
 			...plan.run.footnoteRef !== void 0 ? { footnoteRef: plan.run.footnoteRef } : {},
 			...plan.run.anchor !== void 0 ? { anchor: plan.run.anchor } : {},
+			...plan.run.listMarker ? { listMarker: true } : {},
 			resolvedRun: plan.resolvedRun,
 			font: plan.font,
 			fontSizePt: plan.fontSizePt,
@@ -1040,6 +1048,7 @@ function tokenizePlansBidi(plans, realLevels) {
 				...plan.run.href !== void 0 ? { href: plan.run.href } : {},
 				...plan.run.footnoteRef !== void 0 ? { footnoteRef: plan.run.footnoteRef } : {},
 				...plan.run.anchor !== void 0 ? { anchor: plan.run.anchor } : {},
+				...plan.run.listMarker ? { listMarker: true } : {},
 				resolvedRun: plan.resolvedRun,
 				font: plan.font,
 				fontSizePt: plan.fontSizePt,
@@ -1230,18 +1239,22 @@ function lineFromRange(entries, start, breakIdx, availableWidthPt, isFirst, reso
 		mathDescentPt: mathDescent
 	};
 }
-function wrap(tokens, firstLineWidth, otherWidth, resolved, hyphenator) {
+function wrap(tokens, firstLineWidth, otherWidth, resolved, hyphenator, lineWidths) {
 	if (tokens.length === 0) return [];
+	const widths = lineWidths ?? [firstLineWidth, otherWidth];
 	const entries = paragraphItemStream(tokens, hyphenator);
-	const { breaks } = breakLines(entries.map((e) => e.item), [firstLineWidth, otherWidth]);
+	const { breaks } = breakLines(entries.map((e) => e.item), widths);
 	const lines = [];
 	let start = 0;
 	let isFirst = true;
+	let lineIdx = 0;
 	for (const breakIdx of breaks) {
-		const line = lineFromRange(entries, start, breakIdx, isFirst ? firstLineWidth : otherWidth, isFirst, resolved);
+		const width = lineIdx < widths.length ? widths[lineIdx] : widths[widths.length - 1];
+		const line = lineFromRange(entries, start, breakIdx, width, isFirst, resolved);
 		if (line) lines.push(line);
 		start = breakIdx + 1;
 		isFirst = false;
+		lineIdx++;
 	}
 	if (lines.length > 0) lines[lines.length - 1].isLastInParagraph = true;
 	return lines;
@@ -1533,7 +1546,7 @@ function createFigure(builder, alt, fallback) {
 	node.alt = alt && alt.trim().length > 0 ? alt : fallback;
 	return node.id;
 }
-function listItemParagraphNode(builder, stack, list) {
+function listItemParagraphNode(builder, stack, list, wantLbl) {
 	const lvl = list.level;
 	while (stack.length > 0) {
 		const t = stack[stack.length - 1];
@@ -1553,64 +1566,124 @@ function listItemParagraphNode(builder, stack, list) {
 		stack.push(frame);
 	}
 	const li = builder.create("LI", frame.listNode);
+	const lblId = wantLbl ? builder.create("Lbl", li).id : void 0;
 	const lbody = builder.create("LBody", li);
 	frame.lbody = lbody;
-	return builder.create("P", lbody).id;
+	return {
+		pId: builder.create("P", lbody).id,
+		...lblId !== void 0 ? { lblId } : {}
+	};
 }
-function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", notes, bookmarkPositions) {
-	if (sectionCtxs.length === 0) return [];
-	const pages = [];
-	let ctx = sectionCtxs[0];
-	let secIdx = 0;
-	let pageInSection = 0;
-	let globalPageIdx = 0;
-	let current = [];
-	let pendingPageBreak = false;
-	let cursorY = ctx.pageHeight - ctx.marginTop;
-	let colIdx = 0;
-	let colStartLen = 0;
-	const colLeft = () => ctx.marginLeft + (ctx.columns?.[colIdx]?.xOffsetPt ?? 0);
-	const colWidth = () => ctx.columns?.[colIdx]?.widthPt ?? ctx.contentWidth;
-	const colHasContent = () => current.length > colStartLen;
-	const advanceColumn = () => {
-		if (ctx.columns && colIdx + 1 < ctx.columns.length) {
-			colIdx++;
-			colStartLen = current.length;
-			cursorY = ctx.pageHeight - ctx.marginTop;
-		} else flushPage();
+var PageAssembler = class {
+	constructor(sectionCtxs, builder, notes, bookmarkPositions) {
+		this.sectionCtxs = sectionCtxs;
+		this.builder = builder;
+		this.notes = notes;
+		this.bookmarkPositions = bookmarkPositions;
+		this.ctx = sectionCtxs[0];
+		this.cursorY = this.ctx.pageHeight - this.ctx.marginTop;
+	}
+	pages = [];
+	ctx;
+	secIdx = 0;
+	pageInSection = 0;
+	globalPageIdx = 0;
+	current = [];
+	pendingPageBreak = false;
+	cursorY;
+	colIdx = 0;
+	colStartLen = 0;
+	colLeft = () => this.ctx.marginLeft + (this.ctx.columns?.[this.colIdx]?.xOffsetPt ?? 0);
+	colWidth = () => this.ctx.columns?.[this.colIdx]?.widthPt ?? this.ctx.contentWidth;
+	colHasContent = () => this.current.length > this.colStartLen;
+	advanceColumn = () => {
+		if (this.ctx.columns && this.colIdx + 1 < this.ctx.columns.length) {
+			this.colIdx++;
+			this.colStartLen = this.current.length;
+			this.cursorY = this.ctx.pageHeight - this.ctx.marginTop;
+		} else this.flushPage();
 	};
-	let floatsBehind = [];
-	let floatsFront = [];
-	const floatX = (f, widthPt) => {
+	floatsBehind = [];
+	floatsFront = [];
+	exclusions = [];
+	floatX = (f, widthPt) => {
 		const h = f.posH;
-		if (!h) return colLeft();
-		const base = h.relativeFrom === "page" ? 0 : h.relativeFrom === "column" ? colLeft() : ctx.marginLeft;
-		const span = h.relativeFrom === "page" ? ctx.pageWidth : h.relativeFrom === "column" ? colWidth() : ctx.contentWidth;
+		if (!h) return this.colLeft();
+		const base = h.relativeFrom === "page" ? 0 : h.relativeFrom === "column" ? this.colLeft() : this.ctx.marginLeft;
+		const span = h.relativeFrom === "page" ? this.ctx.pageWidth : h.relativeFrom === "column" ? this.colWidth() : this.ctx.contentWidth;
 		if (h.align === "center") return base + (span - widthPt) / 2;
 		if (h.align === "right") return base + span - widthPt;
 		return base + (h.offsetPt ?? 0);
 	};
-	const floatTopYUp = (f) => {
+	floatTopYUp = (f) => {
 		const v = f.posV;
-		if (!v) return cursorY;
-		if (v.relativeFrom === "page") return ctx.pageHeight - (v.offsetPt ?? 0);
-		if (v.relativeFrom === "margin") return ctx.pageHeight - ctx.marginTop - (v.offsetPt ?? 0);
-		return cursorY - (v.offsetPt ?? 0);
+		if (!v) return this.cursorY;
+		if (v.relativeFrom === "page") return this.ctx.pageHeight - (v.offsetPt ?? 0);
+		if (v.relativeFrom === "margin") return this.ctx.pageHeight - this.ctx.marginTop - (v.offsetPt ?? 0);
+		return this.cursorY - (v.offsetPt ?? 0);
+	};
+	listStack = [];
+	pageNotes = [];
+	noteReserve = 0;
+	placedNotes = /* @__PURE__ */ new Set();
+	bottomLimit = () => this.ctx.marginBottom + this.noteReserve;
+	exclusionAt = (yTop, h) => {
+		const cl = this.colLeft();
+		const cr = cl + this.colWidth();
+		for (const e of this.exclusions) {
+			if (yTop - h >= e.topYUp || yTop <= e.bottomYUp) continue;
+			if (e.x1 <= cl || e.x0 >= cr) continue;
+			return e;
+		}
+	};
+	lineGeometryAt = (yTop, h) => {
+		const full = this.colWidth();
+		const e = this.exclusionAt(yTop, h);
+		if (!e) return {
+			width: full,
+			xOffset: 0
+		};
+		const cl = this.colLeft();
+		const leftRoom = e.x0 - FLOAT_TEXT_GAP - cl;
+		const rightRoom = cl + full - (e.x1 + FLOAT_TEXT_GAP);
+		if (rightRoom >= leftRoom) {
+			const w = Math.max(MIN_WRAP_WIDTH, rightRoom);
+			return {
+				width: w,
+				xOffset: full - w
+			};
+		}
+		return {
+			width: Math.max(MIN_WRAP_WIDTH, leftRoom),
+			xOffset: 0
+		};
+	};
+	lineWidthsFor = (block, startY) => {
+		if (this.exclusions.length === 0 || block.lines.length === 0) return void 0;
+		const h0 = computeLineHeight(block.lines[0], block.resolved);
+		if (h0 <= 0) return void 0;
+		const widths = [];
+		let narrowed = false;
+		let y = startY;
+		for (let i = 0; i < 200; i++) {
+			const g = this.lineGeometryAt(y, h0);
+			widths.push(g.width);
+			if (g.width < this.colWidth()) narrowed = true;
+			else if (i > 0) break;
+			y -= h0;
+			if (y < this.bottomLimit()) break;
+		}
+		return narrowed ? widths : void 0;
 	};
-	const listStack = [];
-	let pageNotes = [];
-	let noteReserve = 0;
-	const placedNotes = /* @__PURE__ */ new Set();
-	const bottomLimit = () => ctx.marginBottom + noteReserve;
-	const lineFootnotes = (line) => {
-		if (!notes) return [];
+	lineFootnotes = (line) => {
+		if (!this.notes) return [];
 		const out = [];
 		for (const tok of line.tokens) {
 			if (tok.kind !== "text" || tok.footnoteRef === void 0) continue;
 			const id = tok.footnoteRef;
-			if (placedNotes.has(id) || out.some((o) => o.id === id)) continue;
-			const laid = notes.layout(ctx, id);
-			const n = notes.numbers.get(id);
+			if (this.placedNotes.has(id) || out.some((o) => o.id === id)) continue;
+			const laid = this.notes.layout(this.ctx, id);
+			const n = this.notes.numbers.get(id);
 			if (!laid || n === void 0) continue;
 			out.push({
 				id,
@@ -1621,108 +1694,125 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 		}
 		return out;
 	};
-	const renderNotesBand = () => {
-		if (pageNotes.length === 0) return [];
+	renderNotesBand = () => {
+		if (this.pageNotes.length === 0) return [];
 		const out = [];
-		const top = ctx.marginBottom + noteReserve;
+		const top = this.ctx.marginBottom + this.noteReserve;
 		out.push({
 			type: "fill",
-			x: pt(ctx.marginLeft),
-			y: pt(ctx.pageHeight - (top - FOOTNOTE_RULE_GAP_ABOVE)),
+			x: pt(this.ctx.marginLeft),
+			y: pt(this.ctx.pageHeight - (top - FOOTNOTE_RULE_GAP_ABOVE)),
 			width: pt(FOOTNOTE_RULE_WIDTH),
 			height: pt(FOOTNOTE_RULE_PT),
 			fillColorHex: "000000"
 		});
 		let cursor = top - FOOTNOTE_SEPARATOR_HEIGHT;
-		for (const note of pageNotes.sort((a, b) => a.n - b.n)) {
+		for (const note of this.pageNotes.sort((a, b) => a.n - b.n)) {
 			let structId;
-			if (builder) {
-				const noteNode = builder.create("Note", builder.root);
-				structId = builder.create("P", noteNode).id;
+			if (this.builder) {
+				const noteNode = this.builder.create("Note", this.builder.root);
+				structId = this.builder.create("P", noteNode).id;
 			}
-			out.push(...drawBlocksSequentially(note.blocks, ctx.marginLeft, cursor, ctx.pageHeight, structId));
+			out.push(...drawBlocksSequentially(note.blocks, this.ctx.marginLeft, cursor, this.ctx.pageHeight, structId));
 			cursor -= note.heightPt;
 		}
 		return out;
 	};
-	const dynBands = [];
-	const flushPage = (force = false) => {
-		if (current.length === 0 && !force) return;
-		const band = bandForPage(pageInSection, globalPageIdx, ctx.titlePg, ctx.evenAndOddHeaders);
-		const header = pickBand(ctx.headerSet, band);
-		const footer = pickBand(ctx.footerSet, band);
-		if (header.renderDynamic) dynBands.push({
-			pageIdx: pages.length,
-			pageNumber: globalPageIdx + 1,
+	dynBands = [];
+	flushPage = (force = false) => {
+		if (this.current.length === 0 && !force) return;
+		const band = bandForPage(this.pageInSection, this.globalPageIdx, this.ctx.titlePg, this.ctx.evenAndOddHeaders);
+		const header = pickBand(this.ctx.headerSet, band);
+		const footer = pickBand(this.ctx.footerSet, band);
+		if (header.renderDynamic) this.dynBands.push({
+			pageIdx: this.pages.length,
+			pageNumber: this.globalPageIdx + 1,
 			position: "header",
 			render: header.renderDynamic
 		});
-		if (footer.renderDynamic) dynBands.push({
-			pageIdx: pages.length,
-			pageNumber: globalPageIdx + 1,
+		if (footer.renderDynamic) this.dynBands.push({
+			pageIdx: this.pages.length,
+			pageNumber: this.globalPageIdx + 1,
 			position: "footer",
 			render: footer.renderDynamic
 		});
-		pages.push({
+		this.pages.push({
 			commands: [
 				...header.commands,
-				...floatsBehind,
-				...current,
-				...floatsFront,
-				...renderNotesBand(),
+				...this.floatsBehind,
+				...this.current,
+				...this.floatsFront,
+				...this.renderNotesBand(),
 				...footer.commands
 			],
-			width: pt(ctx.pageWidth),
-			height: pt(ctx.pageHeight)
+			width: pt(this.ctx.pageWidth),
+			height: pt(this.ctx.pageHeight)
 		});
-		current = [];
-		floatsBehind = [];
-		floatsFront = [];
-		pageNotes = [];
-		noteReserve = 0;
-		colIdx = 0;
-		colStartLen = 0;
-		pageInSection++;
-		globalPageIdx++;
-		cursorY = ctx.pageHeight - ctx.marginTop;
+		this.current = [];
+		this.floatsBehind = [];
+		this.floatsFront = [];
+		this.exclusions = [];
+		this.pageNotes = [];
+		this.noteReserve = 0;
+		this.colIdx = 0;
+		this.colStartLen = 0;
+		this.pageInSection++;
+		this.globalPageIdx++;
+		this.cursorY = this.ctx.pageHeight - this.ctx.marginTop;
 	};
+};
+function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", notes, bookmarkPositions, reflowParagraph) {
+	if (sectionCtxs.length === 0) return [];
+	const asm = new PageAssembler(sectionCtxs, builder, notes, bookmarkPositions);
 	for (let blockIdx = 0; blockIdx < blocks.length; blockIdx++) {
-		while (secIdx < sectionCtxs.length - 1 && blockIdx >= ctx.endIndex) {
-			flushPage();
-			secIdx++;
-			ctx = sectionCtxs[secIdx];
-			pageInSection = 0;
-			cursorY = ctx.pageHeight - ctx.marginTop;
+		while (asm.secIdx < sectionCtxs.length - 1 && blockIdx >= asm.ctx.endIndex) {
+			asm.flushPage();
+			asm.secIdx++;
+			asm.ctx = sectionCtxs[asm.secIdx];
+			asm.pageInSection = 0;
+			asm.cursorY = asm.ctx.pageHeight - asm.ctx.marginTop;
 		}
 		const block = blocks[blockIdx];
-		if (pendingPageBreak) {
-			pendingPageBreak = false;
-			if (current.length > 0) flushPage();
+		if (asm.pendingPageBreak) {
+			asm.pendingPageBreak = false;
+			if (asm.current.length > 0) asm.flushPage();
 		}
-		if (builder && !(block.kind === "paragraph" && block.list)) listStack.length = 0;
+		if (builder && !(block.kind === "paragraph" && block.list)) asm.listStack.length = 0;
 		if (block.kind === "paragraph") {
-			if (block.resolved.pageBreakBefore && current.length > 0) flushPage();
-			cursorY -= block.spacingBeforePt;
+			if (block.resolved.pageBreakBefore && asm.current.length > 0) asm.flushPage();
+			asm.cursorY -= block.spacingBeforePt;
+			let pb = block;
+			if (reflowParagraph && pb.source && asm.exclusions.length > 0) {
+				const widths = asm.lineWidthsFor(block, asm.cursorY);
+				if (widths) pb = reflowParagraph(pb.source, asm.colWidth(), widths);
+			}
 			let structId;
+			let markerLblId;
+			const firstLine = pb.lines[0];
+			const splitMarker = builder !== void 0 && pb.list !== void 0 && firstLine !== void 0 && pb.resolved.alignment === "left" && pb.resolved.bidi !== true && !firstLine.tokens.some((t) => t.bidiLevel % 2 === 1) && firstLine.tokens.some((t) => t.kind === "text" && t.listMarker) && firstLine.tokens.some((t) => !(t.kind === "text" && t.listMarker));
 			if (builder) {
-				structId = block.list ? listItemParagraphNode(builder, listStack, block.list) : builder.create(paragraphStructType(block.resolved), builder.root).id;
-				const lang = dominantParagraphLang(block.lines);
+				if (pb.list) {
+					const nodes = listItemParagraphNode(builder, asm.listStack, pb.list, splitMarker);
+					structId = nodes.pId;
+					markerLblId = nodes.lblId;
+				} else structId = builder.create(paragraphStructType(pb.resolved), builder.root).id;
+				const lang = dominantParagraphLang(pb.lines);
 				if (lang && lang !== defaultLang) builder.node(structId).lang = lang;
 			}
 			let firstLineOfBlock = true;
-			for (const line of block.lines) {
-				const h = computeLineHeight(line, block.resolved);
-				let newNotes = lineFootnotes(line);
-				const addedReserve = (sub) => sub.reduce((sum, x) => sum + x.heightPt, 0) + (pageNotes.length === 0 && sub.length > 0 ? FOOTNOTE_SEPARATOR_HEIGHT : 0);
-				if (cursorY - h < bottomLimit() + addedReserve(newNotes) && colHasContent()) {
-					advanceColumn();
-					newNotes = lineFootnotes(line);
+			for (const line of pb.lines) {
+				const h = computeLineHeight(line, pb.resolved);
+				let newNotes = asm.lineFootnotes(line);
+				const addedReserve = (sub) => sub.reduce((sum, x) => sum + x.heightPt, 0) + (asm.pageNotes.length === 0 && sub.length > 0 ? FOOTNOTE_SEPARATOR_HEIGHT : 0);
+				if (asm.cursorY - h < asm.bottomLimit() + addedReserve(newNotes) && asm.colHasContent()) {
+					asm.advanceColumn();
+					newNotes = asm.lineFootnotes(line);
 				}
 				if (newNotes.length > 0) {
-					noteReserve += addedReserve(newNotes);
+					asm.noteReserve += addedReserve(newNotes);
 					for (const x of newNotes) {
-						placedNotes.add(x.id);
-						pageNotes.push({
+						asm.placedNotes.add(x.id);
+						asm.pageNotes.push({
 							n: x.n,
 							blocks: x.blocks,
 							heightPt: x.heightPt
@@ -1731,51 +1821,93 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 				}
 				if (firstLineOfBlock) {
 					firstLineOfBlock = false;
-					if (block.bookmarks && bookmarkPositions) {
-						for (const bookmarkName of block.bookmarks) if (!bookmarkPositions.has(bookmarkName)) bookmarkPositions.set(bookmarkName, {
-							pageIdx: pages.length,
-							yTopPt: cursorY
+					if (pb.bookmarks && asm.bookmarkPositions) {
+						for (const bookmarkName of pb.bookmarks) if (!asm.bookmarkPositions.has(bookmarkName)) asm.bookmarkPositions.set(bookmarkName, {
+							pageIdx: asm.pages.length,
+							yTopPt: asm.cursorY
 						});
 					}
 				}
-				cursorY -= h;
-				const indentLeft = block.resolved.indentLeft + (line.firstLine ? block.resolved.indentFirstLine : 0);
-				const offset = alignmentOffset(block.resolved.alignment, line.contentWidthPt, line.availableWidthPt);
-				current.push({
+				asm.cursorY -= h;
+				const indentLeft = pb.resolved.indentLeft + (line.firstLine ? pb.resolved.indentFirstLine : 0);
+				const offset = alignmentOffset(pb.resolved.alignment, line.contentWidthPt, line.availableWidthPt);
+				const baselineY = pt(asm.ctx.pageHeight - (asm.cursorY + lineDescent(line)));
+				const exclusionShift = asm.exclusions.length > 0 ? asm.lineGeometryAt(asm.cursorY + h, h).xOffset : 0;
+				const originX = asm.colLeft() + indentLeft + offset + exclusionShift;
+				if (markerLblId !== void 0 && line === firstLine) {
+					let k = 0;
+					let markerWidth = 0;
+					while (k < line.tokens.length) {
+						const t = line.tokens[k];
+						if (t.kind !== "text" || !t.listMarker) break;
+						markerWidth += t.widthPt;
+						k++;
+					}
+					asm.current.push({
+						type: "line",
+						line: {
+							...line,
+							tokens: line.tokens.slice(0, k),
+							isLastInParagraph: false
+						},
+						originX: pt(originX),
+						baselineY,
+						structId: markerLblId
+					});
+					asm.current.push({
+						type: "line",
+						line: {
+							...line,
+							tokens: line.tokens.slice(k)
+						},
+						originX: pt(originX + markerWidth),
+						baselineY,
+						...structId !== void 0 ? { structId } : {}
+					});
+				} else asm.current.push({
 					type: "line",
 					line,
-					originX: pt(colLeft() + indentLeft + offset),
-					baselineY: pt(ctx.pageHeight - (cursorY + lineDescent(line))),
+					originX: pt(originX),
+					baselineY,
 					...structId !== void 0 ? { structId } : {}
 				});
 			}
-			cursorY -= block.spacingAfterPt;
-			if (block.pageBreakAfter) pendingPageBreak = true;
+			asm.cursorY -= pb.spacingAfterPt;
+			if (pb.pageBreakAfter) asm.pendingPageBreak = true;
 		} else if (block.kind === "image") {
 			const figId = builder ? createFigure(builder, block.altText, "Image") : void 0;
 			const emitImageAt = (x, topYUp, sink) => {
 				sink.push({
 					type: "image",
 					x: pt(x),
-					y: pt(ctx.pageHeight - topYUp),
+					y: pt(asm.ctx.pageHeight - topYUp),
 					width: pt(block.widthPt),
 					height: pt(block.heightPt),
 					imageResourceName: block.resourceName,
 					...figId !== void 0 ? { structId: figId } : {}
 				});
 			};
-			if (block.float?.wrap === "none") emitImageAt(floatX(block.float, block.widthPt), floatTopYUp(block.float), block.float.behind ? floatsBehind : floatsFront);
-			else {
-				cursorY -= block.spacingBeforePt;
-				if (cursorY - block.heightPt < bottomLimit() && colHasContent()) advanceColumn();
-				cursorY -= block.heightPt;
-				emitImageAt(colLeft(), cursorY + block.heightPt, current);
-				cursorY -= block.spacingAfterPt;
+			if (isOutOfFlowFloat(block.float)) {
+				const fx = asm.floatX(block.float, block.widthPt);
+				const fy = asm.floatTopYUp(block.float);
+				emitImageAt(fx, fy, block.float.behind ? asm.floatsBehind : asm.floatsFront);
+				if (block.float.wrap !== "none") asm.exclusions.push({
+					x0: fx,
+					x1: fx + block.widthPt,
+					topYUp: fy,
+					bottomYUp: fy - block.heightPt
+				});
+			} else {
+				asm.cursorY -= block.spacingBeforePt;
+				if (asm.cursorY - block.heightPt < asm.bottomLimit() && asm.colHasContent()) asm.advanceColumn();
+				asm.cursorY -= block.heightPt;
+				emitImageAt(asm.colLeft(), asm.cursorY + block.heightPt, asm.current);
+				asm.cursorY -= block.spacingAfterPt;
 			}
 		} else if (block.kind === "shape") {
 			const figId = builder ? createFigure(builder, block.altText, "Shape") : void 0;
 			const emitShapeAt = (x, bottomYUp, sink) => {
-				const transform = flipTransform(buildShapeTransform(x, bottomYUp, block.widthPt, block.heightPt, block.rotation60k, block.flipH, block.flipV), ctx.pageHeight);
+				const transform = flipTransform(buildShapeTransform(x, bottomYUp, block.widthPt, block.heightPt, block.rotation60k, block.flipH, block.flipV), asm.ctx.pageHeight);
 				sink.push({
 					type: "shape",
 					shape: {
@@ -1802,20 +1934,29 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 							type: "line",
 							line,
 							originX: pt(x + block.insetLeftPt + lineOffset),
-							baselineY: pt(ctx.pageHeight - (textY + lineDescent(line))),
+							baselineY: pt(asm.ctx.pageHeight - (textY + lineDescent(line))),
 							...figId !== void 0 ? { structId: figId } : {}
 						});
 					}
 				}
 			};
-			if (block.float?.wrap === "none") emitShapeAt(floatX(block.float, block.widthPt), floatTopYUp(block.float) - block.heightPt, block.float.behind ? floatsBehind : floatsFront);
-			else {
-				cursorY -= block.spacingBeforePt;
-				if (cursorY - block.heightPt < bottomLimit() && colHasContent()) advanceColumn();
-				cursorY -= block.heightPt;
-				const offset = alignmentOffset(block.resolvedAlignment, block.widthPt, colWidth());
-				emitShapeAt(colLeft() + offset, cursorY, current);
-				cursorY -= block.spacingAfterPt;
+			if (isOutOfFlowFloat(block.float)) {
+				const fx = asm.floatX(block.float, block.widthPt);
+				const fy = asm.floatTopYUp(block.float);
+				emitShapeAt(fx, fy - block.heightPt, block.float.behind ? asm.floatsBehind : asm.floatsFront);
+				if (block.float.wrap !== "none") asm.exclusions.push({
+					x0: fx,
+					x1: fx + block.widthPt,
+					topYUp: fy,
+					bottomYUp: fy - block.heightPt
+				});
+			} else {
+				asm.cursorY -= block.spacingBeforePt;
+				if (asm.cursorY - block.heightPt < asm.bottomLimit() && asm.colHasContent()) asm.advanceColumn();
+				asm.cursorY -= block.heightPt;
+				const offset = alignmentOffset(block.resolvedAlignment, block.widthPt, asm.colWidth());
+				emitShapeAt(asm.colLeft() + offset, asm.cursorY, asm.current);
+				asm.cursorY -= block.spacingAfterPt;
 			}
 		} else if (block.kind === "chart") {
 			const figId = builder ? createFigure(builder, block.altText, "Chart") : void 0;
@@ -1834,7 +1975,7 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 							1,
 							x,
 							bottomYUp
-						], ctx.pageHeight)
+						], asm.ctx.pageHeight)
 					},
 					...fig
 				});
@@ -1842,18 +1983,27 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 					type: "line",
 					line: t.line,
 					originX: pt(x + t.x),
-					baselineY: pt(ctx.pageHeight - (bottomYUp + t.y)),
+					baselineY: pt(asm.ctx.pageHeight - (bottomYUp + t.y)),
 					...fig
 				});
 			};
-			if (block.float?.wrap === "none") emitChartAt(floatX(block.float, block.widthPt), floatTopYUp(block.float) - block.heightPt, block.float.behind ? floatsBehind : floatsFront);
-			else {
-				cursorY -= block.spacingBeforePt;
-				if (cursorY - block.heightPt < bottomLimit() && colHasContent()) advanceColumn();
-				cursorY -= block.heightPt;
-				const offset = alignmentOffset(block.resolvedAlignment, block.widthPt, colWidth());
-				emitChartAt(colLeft() + offset, cursorY, current);
-				cursorY -= block.spacingAfterPt;
+			if (isOutOfFlowFloat(block.float)) {
+				const fx = asm.floatX(block.float, block.widthPt);
+				const fy = asm.floatTopYUp(block.float);
+				emitChartAt(fx, fy - block.heightPt, block.float.behind ? asm.floatsBehind : asm.floatsFront);
+				if (block.float.wrap !== "none") asm.exclusions.push({
+					x0: fx,
+					x1: fx + block.widthPt,
+					topYUp: fy,
+					bottomYUp: fy - block.heightPt
+				});
+			} else {
+				asm.cursorY -= block.spacingBeforePt;
+				if (asm.cursorY - block.heightPt < asm.bottomLimit() && asm.colHasContent()) asm.advanceColumn();
+				asm.cursorY -= block.heightPt;
+				const offset = alignmentOffset(block.resolvedAlignment, block.widthPt, asm.colWidth());
+				emitChartAt(asm.colLeft() + offset, asm.cursorY, asm.current);
+				asm.cursorY -= block.spacingAfterPt;
 			}
 		} else {
 			const colCount = block.rows.reduce((max, r) => Math.max(max, r.cells.reduce((s, c) => Math.max(s, c.colStart + c.colSpan), 0)), 0);
@@ -1862,7 +2012,7 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 			else break;
 			const headerHeightPt = headerRows.reduce((s, r) => s + r.heightPt, 0);
 			const tableNode = builder ? builder.create("Table", builder.root) : void 0;
-			const tableX = colLeft() + block.xOffsetPt;
+			const tableX = asm.colLeft() + block.xOffsetPt;
 			for (let ri = 0; ri < block.rows.length; ri++) {
 				const row = block.rows[ri];
 				const isLeadingHeader = ri < headerRows.length;
@@ -1880,34 +2030,34 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 						return b.create("P", cellNode).id;
 					});
 				}
-				const chunks = row.heightPt > ctx.pageContentHeight ? splitRowIntoChunks(row, ctx.pageContentHeight) : [row];
+				const chunks = row.heightPt > asm.ctx.pageContentHeight ? splitRowIntoChunks(row, asm.ctx.pageContentHeight) : [row];
 				for (let ci = 0; ci < chunks.length; ci++) {
 					const chunk = chunks[ci];
-					const forcedBreak = ci === 0 && row.breakBefore && !isLeadingHeader && current.length > 0;
-					const overflow = cursorY - chunk.heightPt < bottomLimit() && colHasContent();
+					const forcedBreak = ci === 0 && row.breakBefore && !isLeadingHeader && asm.current.length > 0;
+					const overflow = asm.cursorY - chunk.heightPt < asm.bottomLimit() && asm.colHasContent();
 					if (forcedBreak || overflow) {
-						if (forcedBreak) flushPage();
-						else advanceColumn();
-						if (!isLeadingHeader && headerRows.length > 0 && cursorY - headerHeightPt - chunk.heightPt >= bottomLimit()) for (const hr of headerRows) {
-							emitRowChunk(current, hr, tableX, cursorY, ctx.pageHeight, colCount, void 0);
-							cursorY -= hr.heightPt;
+						if (forcedBreak) asm.flushPage();
+						else asm.advanceColumn();
+						if (!isLeadingHeader && headerRows.length > 0 && asm.cursorY - headerHeightPt - chunk.heightPt >= asm.bottomLimit()) for (const hr of headerRows) {
+							emitRowChunk(asm.current, hr, tableX, asm.cursorY, asm.ctx.pageHeight, colCount, void 0);
+							asm.cursorY -= hr.heightPt;
 						}
 					}
-					emitRowChunk(current, chunk, tableX, cursorY, ctx.pageHeight, colCount, cellStructIds);
-					cursorY -= chunk.heightPt;
+					emitRowChunk(asm.current, chunk, tableX, asm.cursorY, asm.ctx.pageHeight, colCount, cellStructIds);
+					asm.cursorY -= chunk.heightPt;
 				}
 			}
 		}
 	}
-	flushPage();
-	if (pages.length === 0) flushPage(true);
-	for (const d of dynBands) {
-		const cmds = d.render(d.pageNumber, pages.length);
-		const page = pages[d.pageIdx];
+	asm.flushPage();
+	if (asm.pages.length === 0) asm.flushPage(true);
+	for (const d of asm.dynBands) {
+		const cmds = d.render(d.pageNumber, asm.pages.length);
+		const page = asm.pages[d.pageIdx];
 		if (d.position === "header") page.commands.unshift(...cmds);
 		else page.commands.push(...cmds);
 	}
-	return pages;
+	return asm.pages;
 }
 function tableCellRowSpan(rows, startRowIdx, colStart) {
 	let span = 1;