reamkit 1.31.0 → 1.32.0

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

@@ -3,6 +3,7 @@ import { scriptForCodepoint } from "../core/fonts/scripts.js";
 import { shapeText } from "../core/font/opentype-layout.js";
 import { hasSubstitutable, substituteLetters } from "../core/font/ligatures.js";
 import { createFontMeasure } from "../core/font/measure.js";
+import { pageItemBounds } from "./page-doc.js";
 import { halfPtToPt, pt } from "../core/ir/units.js";
 import { ResourceStore } from "../core/ir/resources.js";
 import { headingLevelOf } from "../core/outline.js";
@@ -1841,7 +1842,7 @@ function metafileDrawing(pic, widthPt, heightPt, options, fontResources, colorCh
 function layoutChartBlock(block, options, fontResources, contentWidth, maxHeight, imageResources) {
 	let widthPt = block.width;
 	let heightPt = block.height;
-	if (widthPt > contentWidth && widthPt > 0) {
+	if (widthPt > contentWidth && widthPt > 0 && !isOutOfFlowFloat(block.float)) {
 		const scale = contentWidth / widthPt;
 		widthPt = contentWidth;
 		heightPt *= scale;
@@ -1911,8 +1912,13 @@ function rectAtPath(x, y, w, h) {
 	return new PathBuilder().moveTo(x, y).lineTo(x + w, y).lineTo(x + w, y + h).lineTo(x, y + h).close().build();
 }
 var CF_ICON_SIZE_PT = 9;
+/** How far inside its cell Excel keeps a data bar, on every side — 2px. */
+var DATA_BAR_INSET_PT = 1.5;
 var CF_ICON_GUTTER_PT = 12;
 var CF_ICON_EMPTY_HEX = "BFBFBF";
+var NOTE_FLAG_PT = 4.5;
+var NOTE_FLAG_HEX = "FF0000";
+var NOTE_THREAD_HEX = "7030A0";
 var DROPDOWN_BUTTON_PT = 11;
 var DROPDOWN_FILL_HEX = "F0F0F0";
 var DROPDOWN_BORDER_HEX = "B0B0B0";
@@ -2138,8 +2144,10 @@ function collectImageResources(body, headersFooters, options) {
 			if (el.image.resource) seen.add(el.image.resource);
 		} else if (el.kind === "paragraph") {
 			for (const run of el.paragraph.runs) if (run.inlineImage?.resource) seen.add(run.inlineImage.resource);
-		} else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
-		else if (el.kind === "shape") {
+		} else if (el.kind === "table") {
+			for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+			visit(el.table.overlay?.drawings ?? []);
+		} else if (el.kind === "shape") {
 			const shapeImages = (sh) => {
 				if (sh.fill.imageResource) seen.add(sh.fill.imageResource);
 				if (sh.text) visit(sh.text.content);
@@ -2467,28 +2475,47 @@ function emitCellFloat(cf, ctx, frame) {
 	if (!float) return;
 	const x = floatXIn(frame, float, cf.block.widthPt);
 	const topYUp = floatTopYUpIn(frame, float, cf.block.heightPt);
-	const sink = ctx.sink(float.behind === true, float.zOrder);
-	if (cf.block.kind === "shape") emitShapeItems(cf.block, x, topYUp - cf.block.heightPt, sink, ctx.pageHeight, void 0);
-	else {
-		const ins = cf.block.drawInset;
-		sink.push({
-			type: "image",
-			x: pt(x + (ins?.dxPt ?? 0)),
-			y: pt(ctx.pageHeight - (topYUp - (ins?.dyTopPt ?? 0))),
-			width: pt(ins?.widthPt ?? cf.block.widthPt),
-			height: pt(ins?.heightPt ?? cf.block.heightPt),
-			imageResourceName: cf.block.resourceName,
-			...cf.block.crop ? { crop: cf.block.crop } : {},
-			...cf.block.wash ? { wash: cf.block.wash } : {},
-			...cf.block.alpha !== void 0 ? { alpha: cf.block.alpha } : {},
-			...cf.block.rotationDeg ? { rotationDeg: cf.block.rotationDeg } : {},
-			...cf.block.flipH ? { flipH: true } : {},
-			...cf.block.flipV ? { flipV: true } : {}
-		});
-		if (cf.block.outline) sink.push(...pictureOutlineItems(cf.block.outline, x + (ins?.dxPt ?? 0), ctx.pageHeight - (topYUp - (ins?.dyTopPt ?? 0)), ins?.widthPt ?? cf.block.widthPt, ins?.heightPt ?? cf.block.heightPt, void 0));
-	}
+	emitDrawing(cf.block, x, topYUp, ctx.sink(float.behind === true, float.zOrder), ctx.pageHeight, void 0);
 	if (float.wrap !== "none") ctx.exclude(float, x, topYUp, cf.block.widthPt, cf.block.heightPt);
 }
+/**
+* A drawing out of the flow — a picture, a shape or a chart — in the items it
+* paints, its top-left corner at `(x, topYUp)` in the y-up cursor frame.
+*
+* @param block      The drawing, laid out.
+* @param x          Its left edge on the page.
+* @param topYUp     Its top, y-up.
+* @param sink       Where its items go.
+* @param pageHeight The page's height, for the flip into the page frame.
+* @param figId      The tagged-PDF Figure its items belong to, if any.
+*/
+function emitDrawing(block, x, topYUp, sink, pageHeight, figId) {
+	if (block.kind === "shape") {
+		emitShapeItems(block, x, topYUp - block.heightPt, sink, pageHeight, figId);
+		return;
+	}
+	if (block.kind === "chart") {
+		sink.push(...chartPageItems(block, x, topYUp - block.heightPt, pageHeight, figId));
+		return;
+	}
+	const ins = block.drawInset;
+	sink.push({
+		type: "image",
+		x: pt(x + (ins?.dxPt ?? 0)),
+		y: pt(pageHeight - (topYUp - (ins?.dyTopPt ?? 0))),
+		width: pt(ins?.widthPt ?? block.widthPt),
+		height: pt(ins?.heightPt ?? block.heightPt),
+		imageResourceName: block.resourceName,
+		...block.crop ? { crop: block.crop } : {},
+		...block.wash ? { wash: block.wash } : {},
+		...block.alpha !== void 0 ? { alpha: block.alpha } : {},
+		...block.rotationDeg ? { rotationDeg: block.rotationDeg } : {},
+		...block.flipH ? { flipH: true } : {},
+		...block.flipV ? { flipV: true } : {},
+		...figId !== void 0 ? { structId: figId } : {}
+	});
+	if (block.outline) sink.push(...pictureOutlineItems(block.outline, x + (ins?.dxPt ?? 0), pageHeight - (topYUp - (ins?.dyTopPt ?? 0)), ins?.widthPt ?? block.widthPt, ins?.heightPt ?? block.heightPt, figId));
+}
 function emitShapeItems(sh, x, bottomYUp, sink, pageHeight, figId) {
 	const castsUnderPicture = sh.fillImageResourceName !== void 0 ? sh.shadow : void 0;
 	const shadowedFill = castsUnderPicture !== void 0;
@@ -3107,17 +3134,19 @@ function collectFontResources(body, headersFooters, options, imageResources) {
 				}
 				addRun(run, el.paragraph);
 			}
-		} else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) {
-			if (cell.properties.hashOnOverflow === true) for (const inner of cell.content) {
-				if (inner.kind !== "paragraph") continue;
-				for (const run of inner.paragraph.runs) addRun({
-					text: "#",
-					properties: run.properties
-				}, inner.paragraph);
+		} else if (el.kind === "table") {
+			for (const row of el.table.rows) for (const cell of row.cells) {
+				if (cell.properties.hashOnOverflow === true) for (const inner of cell.content) {
+					if (inner.kind !== "paragraph") continue;
+					for (const run of inner.paragraph.runs) addRun({
+						text: "#",
+						properties: run.properties
+					}, inner.paragraph);
+				}
+				visit(cell.content);
 			}
-			visit(cell.content);
-		}
-		else if (el.kind === "shape") {
+			visit(el.table.overlay?.drawings ?? []);
+		} else if (el.kind === "shape") {
 			const shapeText = (sh) => {
 				if (sh.text) visit(sh.text.content);
 				for (const child of sh.children ?? []) shapeText(child.shape);
@@ -4417,16 +4446,18 @@ function layoutTableBlock(table, options, fontResources, imageResources, content
 		}
 		aboveBordersByCol = nextAbove;
 		const rp = table.rows[r].properties;
-		rows.push(rp.isHeader || rp.pageBreakBefore ? {
+		rows.push(rp.isHeader || rp.pageBreakBefore || rp.sheetTopPt !== void 0 ? {
 			...rl,
 			...rp.isHeader ? { isHeader: true } : {},
-			...rp.pageBreakBefore ? { breakBefore: true } : {}
+			...rp.pageBreakBefore ? { breakBefore: true } : {},
+			...rp.sheetTopPt !== void 0 ? { sheetTopPt: rp.sheetTopPt } : {}
 		} : rl);
 	}
 	growRowsForMerges(rows);
 	const heightPt = rows.reduce((s, r) => s + r.heightPt, 0);
 	const totalWidthPt = columnWidthsPt.reduce((s, w) => s + w, 0);
 	const xOffsetPt = (table.properties.indentPt ?? 0) + tableXOffset(table.properties.alignment, contentWidth, totalWidthPt) - legacyTableOutdent(table, rows, options);
+	const overlay = table.overlay ? layoutOverlay(table.overlay, options, fontResources, imageResources, contentWidth) : void 0;
 	return {
 		kind: "table",
 		...table.properties.float ? { float: table.properties.float } : {},
@@ -4434,7 +4465,40 @@ function layoutTableBlock(table, options, fontResources, imageResources, content
 		heightPt,
 		totalWidthPt,
 		colCount,
-		xOffsetPt
+		xOffsetPt,
+		...overlay ? { overlay } : {}
+	};
+}
+/**
+* The drawings over a spreadsheet grid (TableOverlay), each laid out as the
+* float it is and placed by its corner in the sheet's own frame.
+*
+* @param overlay        The drawings and the part of the sheet the table prints.
+* @param options        The render options.
+* @param fontResources  The fonts the drawings' text is set in.
+* @param imageResources The pictures they show.
+* @param contentWidth   The width between the margins.
+* @returns The overlay laid out, or undefined when none of it draws.
+*/
+function layoutOverlay(overlay, options, fontResources, imageResources, contentWidth) {
+	const drawings = [];
+	for (const el of overlay.drawings) {
+		if (el.kind !== "image" && el.kind !== "shape" && el.kind !== "chart") continue;
+		const block = layoutBodyElement(el, options, fontResources, imageResources, contentWidth);
+		if (block.kind !== "image" && block.kind !== "shape" && block.kind !== "chart") continue;
+		drawings.push({
+			block,
+			xPt: block.float?.posH?.offsetPt ?? 0,
+			yPt: block.float?.posV?.offsetPt ?? 0
+		});
+	}
+	if (drawings.length === 0) return void 0;
+	return {
+		sheetLeftPt: overlay.sheetLeftPt,
+		widthPt: overlay.widthPt,
+		leftPt: overlay.leftPt,
+		mirrored: overlay.mirrored === true,
+		drawings
 	};
 }
 /**
@@ -4684,15 +4748,19 @@ function layoutTableRow(row, rowIdx, rowCount, colCount, tableProps, columnWidth
 		let widthPt = 0;
 		for (let k = 0; k < span && colIdx + k < columnWidthsPt.length; k++) widthPt += columnWidthsPt[colIdx + k];
 		const paintSpan = Math.min(span, Math.max(1, cell.properties.paintColumns ?? span));
+		const paintFrom = cell.properties.paintAtEnd === true ? span - paintSpan : 0;
 		let paintWidthPt = 0;
-		for (let k = 0; k < paintSpan && colIdx + k < columnWidthsPt.length; k++) paintWidthPt += columnWidthsPt[colIdx + k];
+		let paintOffsetPt = 0;
+		for (let k = 0; k < paintFrom + paintSpan && colIdx + k < columnWidthsPt.length; k++) if (k < paintFrom) paintOffsetPt += columnWidthsPt[colIdx + k];
+		else paintWidthPt += columnWidthsPt[colIdx + k];
 		columnXOffsets.push(cursorX);
 		const mergeRole = rowMergeRoles[cellIdx] ?? "standalone";
 		const leftNeighbor = cellIdx > 0 ? row.cells[cellIdx - 1].properties.borders : void 0;
 		const cellLayout = layoutTableCell(cell, tableProps, widthPt, options, fontResources, imageResources, rowIdx, colIdx, span, rowCount, colCount, mergeRole, leftNeighbor, aboveOfSpan(aboveBordersByCol, colIdx, span));
 		cells.push(paintWidthPt < widthPt ? {
 			...cellLayout,
-			paintWidthPt
+			paintWidthPt,
+			...paintOffsetPt > 0 ? { paintOffsetPt } : {}
 		} : cellLayout);
 		cursorX += widthPt;
 		colIdx += span;
@@ -4784,14 +4852,16 @@ function clipCellToHeight(cell, heightPt) {
 	let used = 0;
 	for (const line of cell.lines) {
 		const h = computeLineHeight(line, line.resolved);
-		if (kept.length > 0 && used + h > room) break;
+		const below = line.metricDescentPt ?? line.maxFontSizePt * .2;
+		if (kept.length > 0 && used + h - below > room) break;
 		kept.push(line);
 		used += h;
 	}
 	return {
 		...cell,
 		lines: kept,
-		contentHeightPt: used
+		contentHeightPt: used,
+		...used > room ? { clipped: true } : {}
 	};
 }
 /**
@@ -4900,6 +4970,13 @@ function layoutTableCell(cell, tableProps, widthPt, options, fontResources, imag
 	}
 	const colEnd = colStart + colSpan - 1;
 	const borders = resolveCellBorders(cell.properties.borders, tableProps.borders, rowIdx, colStart, colEnd, rowCount, colCount, mergeRole, leftNeighborBorders, aboveNeighborBorders);
+	const grid = tableProps.gridlines;
+	const ruled = grid && !cell.properties.shading?.colorHex ? {
+		...borders.top || mergeRole === "middle" || mergeRole === "end" ? {} : { top: grid },
+		...borders.left ? {} : { left: grid },
+		...borders.bottom || rowIdx !== rowCount - 1 || mergeRole === "start" || mergeRole === "middle" ? {} : { bottom: grid },
+		...borders.right || colEnd !== colCount - 1 ? {} : { right: grid }
+	} : void 0;
 	const alongPt = turned ? lines.reduce((a, l) => Math.max(a, l.contentWidthPt), 0) : 0;
 	const heightPt = turned ? alongPt : contentHeightPt;
 	const totalHeightPt = mergeRole === "middle" || mergeRole === "end" ? 0 : padTopPt + heightPt + padBottomPt;
@@ -4909,11 +4986,15 @@ function layoutTableCell(cell, tableProps, widthPt, options, fontResources, imag
 		padRightPt,
 		padBottomPt,
 		padLeftPt,
-		borders,
+		borders: ruled ? {
+			...ruled,
+			...borders
+		} : borders,
 		...cell.properties.shading?.colorHex ? { shadingColorHex: cell.properties.shading.colorHex } : {},
 		...cell.properties.dataBar ? { dataBar: cell.properties.dataBar } : {},
 		...cell.properties.icon ? { icon: cell.properties.icon } : {},
 		...cell.properties.sparkline ? { sparkline: cell.properties.sparkline } : {},
+		...cell.properties.noteFlag ? { noteFlag: cell.properties.noteFlag } : {},
 		lines,
 		...lineGaps.size > 0 ? { lineGaps } : {},
 		...nestedTables.length > 0 ? { nestedTables } : {},
@@ -5298,6 +5379,17 @@ var PageAssembler = class PageAssembler {
 	floatsBehind = [];
 	floatsFront = [];
 	/**
+	* The front floats as the page paints them: over its text, when the
+	* document's floats cover what is under them (StyledRenderOptions
+	* floatsOverText); in the ordinary passes, under it, otherwise.
+	*/
+	inFront(items) {
+		return this.ctx.options?.floatsOverText === true ? items.map((item) => ({
+			...item,
+			over: true
+		})) : items;
+	}
+	/**
 	* Side-wrapping floats (wrapSquare/tight/through): rectangles the body text
 	* must flow around. Page-scoped, like the float graphics.
 	*/
@@ -5575,7 +5667,7 @@ var PageAssembler = class PageAssembler {
 					behind: true
 				}))),
 				...onSheet(this.current),
-				...onSheet(PageAssembler.byZ(this.floatsFront)),
+				...onSheet(this.inFront(PageAssembler.byZ(this.floatsFront))),
 				...onSheet(this.renderNotesBand()),
 				...footer.commands
 			],
@@ -5791,6 +5883,105 @@ var PageAssembler = class PageAssembler {
 	};
 };
 /**
+* §20.5 — one spreadsheet table's drawings as its pages show them
+* (TableBlock.overlay). The table lays its rows down page by page, and each
+* stretch of sheet rows a page takes unbroken is a window onto the sheet:
+* every drawing over that stretch is drawn where it stands relative to those
+* rows and cut off at the window's edges. A chart across a page break so
+* prints in two pieces, one on each page, and a drawing in the title rows on
+* every page that repeats them — which is what Excel prints.
+*/
+var SheetView = class {
+	runs = [];
+	figures = /* @__PURE__ */ new Map();
+	/**
+	* @param overlay The table's drawings and the part of the sheet it prints.
+	* @param tableX  The table's left edge on the page.
+	* @param builder The tagged-PDF structure, when the document is tagged.
+	*/
+	constructor(overlay, tableX, builder) {
+		this.overlay = overlay;
+		this.tableX = tableX;
+		this.builder = builder;
+	}
+	/**
+	* A row, or a piece of one, laid down on the page in hand.
+	*
+	* @param sheetTop Where its top stands on the sheet; undefined for a row the sheet does not have.
+	* @param topYUp   Where its top stands on the page, y-up.
+	* @param heightPt How tall it was laid out.
+	*/
+	lay(sheetTop, topYUp, heightPt) {
+		if (sheetTop === void 0) return;
+		const last = this.runs[this.runs.length - 1];
+		if (last && Math.abs(last.bottomYUp - topYUp) < .01 && Math.abs(last.sheetBottom - sheetTop) < .5) {
+			last.sheetBottom = sheetTop + heightPt;
+			last.bottomYUp = topYUp - heightPt;
+			return;
+		}
+		this.runs.push({
+			sheetTop,
+			sheetBottom: sheetTop + heightPt,
+			topYUp,
+			bottomYUp: topYUp - heightPt
+		});
+	}
+	/**
+	* Draw what the page's rows show of the drawings, and start over for the
+	* next page.
+	*
+	* @param asm The page assembler, still on the page the rows were laid on.
+	*/
+	show(asm) {
+		const o = this.overlay;
+		const pageHeight = asm.ctx.pageHeight;
+		for (const run of this.runs) {
+			const window = {
+				x: pt(this.tableX + o.leftPt),
+				y: pt(pageHeight - run.topYUp),
+				width: pt(o.widthPt),
+				height: pt(run.topYUp - run.bottomYUp)
+			};
+			o.drawings.forEach((d, i) => {
+				const { block } = d;
+				if (d.yPt > run.sheetBottom || d.yPt + block.heightPt < run.sheetTop) return;
+				const left = d.xPt - o.sheetLeftPt;
+				if (left > o.widthPt || left + block.widthPt < 0) return;
+				const x = this.tableX + o.leftPt + (o.mirrored ? o.widthPt - left - block.widthPt : left);
+				const items = [];
+				emitDrawing(block, x, run.topYUp - (d.yPt - run.sheetTop), items, pageHeight, void 0);
+				const shown = items.filter((item) => {
+					const box = pageItemBounds(item);
+					return box.x1 >= window.x && box.x0 <= window.x + window.width && box.y1 >= window.y && box.y0 <= window.y + window.height;
+				});
+				if (shown.length === 0) return;
+				const figId = this.figure(i, block);
+				seenThrough(PageAssembler.zSink(asm.floatsFront, block.float?.zOrder), window).push(...figId === void 0 ? shown : shown.map((item) => ({
+					...item,
+					structId: figId
+				})));
+			});
+		}
+		this.runs = [];
+	}
+	/** The tagged-PDF Figure a drawing is, made once however many pages show it. */
+	figure(i, block) {
+		if (!this.builder) return void 0;
+		let id = this.figures.get(i);
+		if (id === void 0) {
+			const role = block.kind === "chart" ? block.figureRole ?? "Chart" : block.kind === "image" ? "Image" : "Shape";
+			id = createFigure(this.builder, block.altText, role);
+			this.figures.set(i, id);
+		}
+		return id;
+	}
+};
+/** A sink that marks each item it takes as seen through `window` (PageItemBase.window). */
+var seenThrough = (target, window) => ({ push: (...items) => target.push(...items.map((item) => ({
+	...item,
+	window
+}))) });
+/**
 * §17.3.1.14/15 — the height a paragraph needs in one column: all of its lines
 * where it keeps them together, and where it keeps with the next, the whole of
 * every paragraph in the chain it heads and as much of the block after as has
@@ -6143,6 +6334,7 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 			const headerHeightPt = headerRows.reduce((s, r) => s + r.heightPt, 0);
 			const tableNode = builder ? builder.create("Table", builder.root) : void 0;
 			const tableX = asm.colLeft() + block.xOffsetPt;
+			const sheetView = block.overlay ? new SheetView(block.overlay, tableX, builder) : void 0;
 			for (let ri = 0; ri < block.rows.length; ri++) {
 				const row = block.rows[ri];
 				const isLeadingHeader = ri < headerRows.length;
@@ -6163,20 +6355,25 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 				const room = asm.cursorY - asm.bottomLimit();
 				const page = asm.ctx.pageContentHeight;
 				const chunks = !row.cantSplit && row.heightPt > room && asm.colHasContent() && room > 0 ? splitRowIntoChunks(row, room, page) : row.heightPt > page ? splitRowIntoChunks(row, page) : [row];
+				let chunkOffsetPt = 0;
 				for (let ci = 0; ci < chunks.length; ci++) {
 					const chunk = chunks[ci];
-					const forcedBreak = ci === 0 && row.breakBefore && !isLeadingHeader && asm.pageHasContent();
+					const forcedBreak = ci === 0 && row.breakBefore && (ri === 0 || !isLeadingHeader) && asm.pageHasContent();
 					const overflow = asm.cursorY - chunk.heightPt < asm.bottomLimit() && asm.colHasContent();
 					if (forcedBreak || overflow) {
+						sheetView?.show(asm);
 						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);
+							sheetView?.lay(hr.sheetTopPt, asm.cursorY, hr.heightPt);
 							asm.cursorY -= hr.heightPt;
 						}
 					}
 					const mergedHeights = chunks.length === 1 && row.cells.some((c) => c.mergeRole === "start") ? row.cells.map((c) => c.mergeRole === "start" ? mergedBoxHeightPt(block.rows, ri, c.colStart, asm.cursorY - asm.bottomLimit()) : void 0) : void 0;
 					emitRowChunk(asm.current, chunk, tableX, asm.cursorY, asm.ctx.pageHeight, colCount, cellStructIds, mergedHeights, cellAnchorCtx(asm));
+					sheetView?.lay(row.sheetTopPt !== void 0 ? row.sheetTopPt + chunkOffsetPt : void 0, asm.cursorY, chunk.heightPt);
+					chunkOffsetPt += chunk.heightPt;
 					asm.cursorY -= chunk.heightPt;
 					if (ci === chunks.length - 1 && ri < block.rows.length - 1) {
 						const next = block.rows[ri + 1];
@@ -6187,6 +6384,7 @@ function paginateSections(blocks, sectionCtxs, builder, defaultLang = "en-US", n
 					}
 				}
 			}
+			sheetView?.show(asm);
 		}
 	}
 	asm.flushPage();
@@ -6267,7 +6465,7 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 			}
 			out.push({
 				type: "fill",
-				x: pt(marginLeft + (row.columnXOffsets[i] ?? 0)),
+				x: pt(marginLeft + (row.columnXOffsets[i] ?? 0) + (cell.paintOffsetPt ?? 0)),
 				y: pt(pageHeight - rowBottom - row.heightPt - FILL_SEAM_PT),
 				width: pt(width),
 				height: pt(row.heightPt + FILL_SEAM_PT),
@@ -6282,16 +6480,19 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 		const structId = cellStructIds?.[i];
 		if (cell.dataBar && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
 			const start = Math.max(0, Math.min(1, cell.dataBar.startFraction ?? 0));
-			const barWidth = cell.widthPt * Math.max(0, Math.min(1, cell.dataBar.fraction));
+			const inner = Math.max(0, cell.widthPt - 2 * DATA_BAR_INSET_PT);
+			const barWidth = inner * Math.max(0, Math.min(1, cell.dataBar.fraction));
 			if (barWidth > 0) {
-				const barX = cellX + cell.widthPt * start;
-				const barBottomYUp = rowBottom;
+				const barX = cellX + DATA_BAR_INSET_PT + inner * start;
+				const boxHeightPt = Math.max(row.heightPt, mergedHeights?.[i] ?? row.heightPt);
+				const barHeightPt = Math.max(0, boxHeightPt - 2 * DATA_BAR_INSET_PT);
+				const barBottomYUp = rowBottom + row.heightPt - boxHeightPt + DATA_BAR_INSET_PT;
 				out.push({
 					type: "shape",
 					shape: {
-						paths: [rectAtPath(0, 0, barWidth, row.heightPt)],
+						paths: [rectAtPath(0, 0, barWidth, barHeightPt)],
 						fillColorHex: cell.dataBar.colorHex,
-						fillGradient: {
+						...cell.dataBar.solid ? {} : { fillGradient: {
 							kind: "linear",
 							angle: cell.dataBar.negative ? 180 : 0,
 							stops: [{
@@ -6301,7 +6502,7 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 								offset: 1,
 								colorHex: "FFFFFF"
 							}]
-						},
+						} },
 						transform: flipTransform([
 							1,
 							0,
@@ -6358,6 +6559,28 @@ function emitRowChunk(out, row, marginLeft, cursorY, pageHeight, colCount, cellS
 				});
 			}
 		}
+		if (cell.noteFlag && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
+			const left = cell.paintOffsetPt ?? 0;
+			const right = left + (cell.paintWidthPt ?? cell.widthPt);
+			const side = Math.min(NOTE_FLAG_PT, row.heightPt, right - left);
+			const top = row.heightPt;
+			const corner = cell.noteFlag.atLeft ? new PathBuilder().moveTo(left, top).lineTo(left + side, top).lineTo(left, top - side) : new PathBuilder().moveTo(right - side, top).lineTo(right, top).lineTo(right, top - side);
+			out.push({
+				type: "shape",
+				shape: {
+					paths: [corner.close().build()],
+					fillColorHex: cell.noteFlag.kind === "thread" ? NOTE_THREAD_HEX : NOTE_FLAG_HEX,
+					transform: flipTransform([
+						1,
+						0,
+						0,
+						1,
+						cellX,
+						rowBottom
+					], pageHeight)
+				}
+			});
+		}
 		if (cell.sparkline && cell.sparkline.values.length > 0 && cell.mergeRole !== "middle" && cell.mergeRole !== "end") {
 			const inset = 1.5;
 			const sw = cell.widthPt - 2 * inset;
@@ -6609,7 +6832,7 @@ function emitCellBorders(out, cell, cellX, cellY, rowHeight, pageHeight, rowIdx,
 		out.push({
 			type: "border",
 			side,
-			x: pt(cellX),
+			x: pt(side === "left" ? cellX : cellX + (cell.paintOffsetPt ?? 0)),
 			y: pt(pageHeight - cellY - rowHeight + lowered),
 			width: pt(cell.paintWidthPt ?? cell.widthPt),
 			height: pt(rowHeight - lowered - raised),

package/dist/esm/layout/turned-section.js

@@ -13,12 +13,24 @@ var QUARTER_60K = 90 * 6e4;
 * @returns The same item on the sheet, turned a quarter clockwise.
 */
 function turnOntoSheet(item, sheetWidth) {
-	const box = (x, y, w, h) => ({
+	const turned = turnItem(item, sheetWidth);
+	const w = item.window;
+	return w ? {
+		...turned,
+		window: turnBox(w.x, w.y, w.width, w.height, sheetWidth)
+	} : turned;
+}
+/** A top-left-frame box of the frame, as it stands on the sheet once turned a quarter clockwise. */
+function turnBox(x, y, w, h, sheetWidth) {
+	return {
 		x: pt(sheetWidth - y - h),
 		y: pt(x),
 		width: pt(h),
 		height: pt(w)
-	});
+	};
+}
+function turnItem(item, sheetWidth) {
+	const box = (x, y, w, h) => turnBox(x, y, w, h, sheetWidth);
 	switch (item.type) {
 		case "line": {
 			const quarter = withinTurn((item.rotationDeg ?? 0) - 90);

package/dist/esm/markdown/markdown-writer.js

@@ -32,6 +32,7 @@ function writeMarkdown(flow, options = {}) {
 		anchors: referencedAnchors(flow.body),
 		notes: noteNumbers(flow),
 		mediaNames: /* @__PURE__ */ new Map(),
+		drawn: /* @__PURE__ */ new Set(),
 		...flow.numbering ? { numbering: flow.numbering } : {}
 	};
 	if (flow.headersFooters && flow.headersFooters.size > 0) lose(ctx, "dropped", FEATURES.headersFooters, "markdown has no pages to band headers onto");
@@ -98,8 +99,14 @@ function emitBlock(out, el, ctx) {
 		return;
 	}
 	ctx.list.length = 0;
-	if (el.kind === "table") emitTable(out, el.table, ctx);
-	else if (el.kind === "image") {
+	if (el.kind === "table") {
+		emitTable(out, el.table, ctx);
+		for (const drawing of el.table.overlay?.drawings ?? []) {
+			if (ctx.drawn.has(drawing)) continue;
+			ctx.drawn.add(drawing);
+			emitBlock(out, drawing, ctx);
+		}
+	} else if (el.kind === "image") {
 		const img = pictureMarkdown(el.image.resource, el.image.altText, ctx);
 		if (img.length > 0) out.push(img);
 	} else if (el.kind === "chart") lose(ctx, "dropped", FEATURES.charts, "markdown cannot draw a chart");
@@ -275,8 +282,10 @@ function noteNumbers(flow) {
 			add(r.endnoteRef, endnotes, flow.endnotes);
 			add(r.commentRef, comments, flow.comments);
 		}
-		else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
-		else if (el.kind === "shape") visitShape(el.shape);
+		else if (el.kind === "table") {
+			for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+			visit(el.table.overlay?.drawings ?? []);
+		} else if (el.kind === "shape") visitShape(el.shape);
 	};
 	visit(flow.body);
 	return {
@@ -370,8 +379,10 @@ function referencedAnchors(body) {
 	const visit = (els) => {
 		for (const el of els) if (el.kind === "paragraph") {
 			for (const r of el.paragraph.runs) if (r.anchor !== void 0) out.add(r.anchor);
-		} else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
-		else if (el.kind === "shape") visitShape(el.shape);
+		} else if (el.kind === "table") {
+			for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+			visit(el.table.overlay?.drawings ?? []);
+		} else if (el.kind === "shape") visitShape(el.shape);
 	};
 	visit(body);
 	return out;