document-cli 1.7.0 → 1.9.0

package/dist/{tui-BzdX4QQg.js → tui-D9SLI7oT.js}

@@ -1,6 +1,6 @@
 import { c as formatDocxExtrasLines, f as loadProvidedFonts, i as formatOdbReportLines, l as readInput, m as inferFormatFromExtension, n as describeOdbReport, o as formatMetadataLines, p as formatToExtension, r as formatOdbFormLines, t as describeOdbForm } from "./odb-structure-Du1w_hOU.js";
 import { readFile, writeFile } from "node:fs/promises";
-import { buildDocxPackage, buildOdtPackage, convertWordprocessingToLayout, createDocx, createFontMeasurer, createFontRegistry, createOdg, createOdp, createOds, createOdt, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, encodePackage, hsqldbCellDisplayText, markdownToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openOdg, openOdp, openOds, openOdt, openPptx, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, writePdf, xlsxToPdf } from "documents.js";
+import { buildDocxPackage, buildOdtPackage, bytesToBase64, convertWordprocessingToLayout, createDocx, createFontMeasurer, createFontRegistry, createOdg, createOdp, createOds, createOdt, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, encodePackage, hsqldbCellDisplayText, markdownToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openOdg, openOdp, openOds, openOdt, openPptx, parseXml, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, writePdf, xlsxToPdf } from "documents.js";
 import { basename, dirname, extname, join } from "node:path";
 import { cellReference, columnIndexToLetters, decodePackage as decodePackage$1, encodePackage as encodePackage$1 } from "odf.js";
 import { readdirSync } from "node:fs";
@@ -508,6 +508,11 @@ function drawingDocument(state) {
 	if (doc === void 0) return;
 	return doc.format === "odg" ? doc : void 0;
 }
+function vectorHostDocument(state) {
+	const doc = state.openDocument;
+	if (doc === void 0) return;
+	return doc.format === "odg" || doc.format === "odp" ? doc : void 0;
+}
 function markdownDocument(state) {
 	const doc = state.openDocument;
 	if (doc === void 0) return;
@@ -569,6 +574,31 @@ function setTextContainerText(container, text) {
 function setCellText(cell, text) {
 	setTextContainerText(cell, text);
 }
+function mutableMathMlNode(node) {
+	if (node.type === "element") return {
+		type: "element",
+		tag: node.tag,
+		attributes: [...node.attributes],
+		children: node.children.map(mutableMathMlNode)
+	};
+	if (node.type === "text") return {
+		type: "text",
+		value: node.value
+	};
+	if (node.type === "cdata" || node.type === "comment") return {
+		type: node.type,
+		value: ""
+	};
+	if (node.type === "declaration") return {
+		type: "declaration",
+		attributes: []
+	};
+	return {
+		type: "pi",
+		target: "",
+		content: ""
+	};
+}
 function appReducer(state, action) {
 	switch (action.type) {
 		case "PUSH_SCREEN": return {
@@ -715,6 +745,12 @@ function appReducer(state, action) {
 		case "SET_RUN_COLOR": return withRun(state, action.blockIndex, action.runIndex, (run) => {
 			run.color = action.color;
 		});
+		case "SET_RUN_FONT_FAMILY": return withRun(state, action.blockIndex, action.runIndex, (run) => {
+			run.fontFamily = action.fontFamily;
+		});
+		case "SET_RUN_FONT_SIZE": return withRun(state, action.blockIndex, action.runIndex, (run) => {
+			run.sizePt = action.sizePt;
+		});
 		case "APPEND_TABLE": {
 			const doc = wordprocessingDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
@@ -775,6 +811,47 @@ function appReducer(state, action) {
 				setTextContainerText(item, action.text);
 			});
 		}
+		case "ADD_LIST": {
+			const doc = wordprocessingDocument(state);
+			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc.format !== "odt") return wrongDocument(state, "an odt document (lists are an odt-only concept)");
+			return mutate(state, doc, () => {
+				doc.editor.body.appendList();
+			});
+		}
+		case "INSERT_PARAGRAPH_IMAGE": {
+			const doc = wordprocessingDocument(state);
+			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			const paragraph = paragraphAt(doc, action.blockIndex);
+			if (paragraph === void 0) return withStatus(state, "warning", `There is no paragraph at index ${action.blockIndex}`);
+			return mutate(state, doc, () => {
+				paragraph.insertImageAfter({
+					format: action.format,
+					bytes: action.bytes,
+					widthPt: action.widthPt,
+					heightPt: action.heightPt,
+					altText: action.altText
+				});
+			});
+		}
+		case "INSERT_DOCX_FORMULA": {
+			const doc = state.openDocument;
+			if (doc?.format !== "docx") return wrongDocument(state, "a docx document");
+			const paragraph = doc.editor.paragraphs()[action.blockIndex];
+			if (paragraph === void 0) return withStatus(state, "warning", `There is no paragraph at index ${action.blockIndex}`);
+			let written = true;
+			const nextState = mutate(state, doc, () => {
+				written = paragraph.appendOfficeMath(action.mathml).written;
+			});
+			return written ? nextState : withStatus(nextState, "warning", "The formula produced no OMML content and was not written");
+		}
+		case "INSERT_ODT_FORMULA": {
+			const doc = state.openDocument;
+			if (doc?.format !== "odt") return wrongDocument(state, "an odt document");
+			return mutate(state, doc, () => {
+				doc.editor.body.appendFormula({ mathml: action.mathml.map(mutableMathMlNode) }, action.frame);
+			});
+		}
 		case "ADD_SLIDE": {
 			const doc = presentationDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a pptx or odp document");
@@ -885,6 +962,23 @@ function appReducer(state, action) {
 		case "SET_CELL_VALUE": return withSheet(state, action.sheetIndex, (sheet) => {
 			sheet.cell(action.row, action.column).value = action.value;
 		});
+		case "SET_CELL_FORMULA": return withSheet(state, action.sheetIndex, (sheet) => {
+			sheet.cell(action.row, action.column).formula = action.formula;
+		});
+		case "ADD_SHEET_IMAGE": return withSheet(state, action.sheetIndex, (sheet) => {
+			sheet.addImage({
+				kind: "image",
+				format: action.format,
+				base64: bytesToBase64(action.bytes),
+				widthPt: action.widthPt,
+				heightPt: action.heightPt,
+				altText: action.altText,
+				anchorRow: action.anchorRow,
+				anchorColumn: action.anchorColumn,
+				offsetXPt: action.offsetXPt,
+				offsetYPt: action.offsetYPt
+			});
+		});
 		case "MERGE_CELLS": {
 			const doc = spreadsheetDocument(state);
 			if (doc === void 0) return wrongDocument(state, "an ods document");
@@ -908,23 +1002,64 @@ function appReducer(state, action) {
 		case "ADD_ELLIPSE":
 		case "ADD_LINE":
 		case "ADD_PATH": {
-			const doc = drawingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "an odg document");
-			const page = doc.editor.pages()[action.pageIndex];
-			if (page === void 0) return withStatus(state, "warning", `There is no page at index ${action.pageIndex}`);
+			const doc = vectorHostDocument(state);
+			if (doc === void 0) return wrongDocument(state, "an odg or odp document");
+			if (doc.format === "odg") {
+				const page = doc.editor.pages()[action.containerIndex];
+				if (page === void 0) return withStatus(state, "warning", `There is no page at index ${action.containerIndex}`);
+				return mutate(state, doc, () => {
+					switch (action.type) {
+						case "ADD_RECT":
+							page.addRect(action.init);
+							return;
+						case "ADD_ELLIPSE":
+							page.addEllipse(action.init);
+							return;
+						case "ADD_LINE":
+							page.addLine(action.init);
+							return;
+						case "ADD_PATH":
+							page.addPath(action.init);
+							return;
+					}
+				});
+			}
+			const slide = doc.editor.slides()[action.containerIndex];
+			if (slide === void 0) return withStatus(state, "warning", `There is no slide at index ${action.containerIndex}`);
 			return mutate(state, doc, () => {
 				switch (action.type) {
 					case "ADD_RECT":
-						page.addRect(action.init);
+						slide.addVector({
+							kind: "rect",
+							frame: action.init.frame,
+							fill: action.init.fill,
+							stroke: action.init.stroke
+						});
 						return;
 					case "ADD_ELLIPSE":
-						page.addEllipse(action.init);
+						slide.addVector({
+							kind: "ellipse",
+							frame: action.init.frame,
+							fill: action.init.fill,
+							stroke: action.init.stroke
+						});
 						return;
 					case "ADD_LINE":
-						page.addLine(action.init);
+						slide.addVector({
+							kind: "line",
+							from: action.init.from,
+							to: action.init.to,
+							stroke: action.init.stroke
+						});
 						return;
 					case "ADD_PATH":
-						page.addPath(action.init);
+						slide.addVector({
+							kind: "path",
+							frame: action.init.frame,
+							subpaths: [...action.init.subpaths],
+							fill: action.init.fill,
+							stroke: action.init.stroke
+						});
 						return;
 				}
 			});
@@ -1668,6 +1803,220 @@ function StatusLine() {
 	] });
 }
 //#endregion
+//#region src/tui/screens/shared/field-wizard.tsx
+function requireFieldValue(values, key) {
+	const value = values[key];
+	if (value === void 0) throw new Error(`Field wizard field '${key}' was never recorded before building the action.`);
+	return value;
+}
+function FieldWizard(props) {
+	const [stepIndex, setStepIndex] = useState(0);
+	const [collected, setCollected] = useState({});
+	const initialField = props.fields[0];
+	const [draft, setDraft] = useState(initialField === void 0 ? "" : initialField.defaultValue);
+	const field = props.fields[stepIndex];
+	if (field === void 0) throw new Error(`FieldWizard stepIndex ${stepIndex} is out of range for ${props.fields.length} fields -- onComplete always fires before stepIndex can advance past the last field, so this indicates a bug in that advance.`);
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		paddingX: 1,
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: field.label
+			}),
+			/* @__PURE__ */ jsx(TextField, {
+				value: draft,
+				isFocused: true,
+				onChange: setDraft,
+				onCancel: props.onCancel,
+				onSubmit: (value) => {
+					const recorded = {
+						...collected,
+						[field.key]: value
+					};
+					const nextIndex = stepIndex + 1;
+					const nextField = props.fields[nextIndex];
+					if (nextField === void 0) {
+						props.onComplete(recorded);
+						return;
+					}
+					setCollected(recorded);
+					setDraft(nextField.defaultValue);
+					setStepIndex(nextIndex);
+				}
+			}),
+			/* @__PURE__ */ jsxs(Text, {
+				dimColor: true,
+				children: [
+					"Step ",
+					stepIndex + 1,
+					" of ",
+					props.fields.length,
+					" -- Enter to continue, Esc to cancel"
+				]
+			})
+		]
+	});
+}
+//#endregion
+//#region src/tui/screens/shared/formula-presets.ts
+function element(tag, children = []) {
+	return {
+		type: "element",
+		tag,
+		attributes: [],
+		children
+	};
+}
+function text(value) {
+	return {
+		type: "text",
+		value
+	};
+}
+function mi(name) {
+	return element("mi", [text(name)]);
+}
+function mn(value) {
+	return element("mn", [text(value)]);
+}
+function mo(operator) {
+	return element("mo", [text(operator)]);
+}
+const FORMULA_PRESETS = [
+	{
+		label: "Fraction: x / 2",
+		mathml: [element("mfrac", [mi("x"), mn("2")])]
+	},
+	{
+		label: "Power: x^2",
+		mathml: [element("msup", [mi("x"), mn("2")])]
+	},
+	{
+		label: "Subscript: x_i",
+		mathml: [element("msub", [mi("x"), mi("i")])]
+	},
+	{
+		label: "Square root: sqrt(x)",
+		mathml: [element("msqrt", [mi("x")])]
+	},
+	{
+		label: "Summation: sum(i=1..n) i",
+		mathml: [element("munderover", [
+			mo("∑"),
+			element("mrow", [
+				mi("i"),
+				mo("="),
+				mn("1")
+			]),
+			mi("n")
+		])]
+	},
+	{
+		label: "Quadratic formula",
+		mathml: [element("mrow", [
+			mi("x"),
+			mo("="),
+			element("mfrac", [element("mrow", [
+				mo("-"),
+				mi("b"),
+				mo("±"),
+				element("msqrt", [element("mrow", [
+					element("msup", [mi("b"), mn("2")]),
+					mo("-"),
+					mn("4"),
+					mi("a"),
+					mi("c")
+				])])
+			]), element("mrow", [mn("2"), mi("a")])])
+		])]
+	}
+];
+//#endregion
+//#region src/tui/screens/shared/formula-picker.tsx
+const RAW_ENTRY_LABEL = "Raw MathML...";
+const PICKER_ROWS = [...FORMULA_PRESETS.map((preset) => ({
+	label: preset.label,
+	mathml: preset.mathml
+})), {
+	label: RAW_ENTRY_LABEL,
+	mathml: void 0
+}];
+function FormulaPicker(props) {
+	const [rawInput, setRawInput] = useState(void 0);
+	const { selectedIndex } = useNavigationInput({
+		itemCount: PICKER_ROWS.length,
+		isActive: props.isActive && rawInput === void 0,
+		onBack: props.onCancel,
+		onSelect: (index) => {
+			const row = PICKER_ROWS[index];
+			if (row === void 0) return;
+			if (row.mathml === void 0) {
+				setRawInput("");
+				return;
+			}
+			props.onMathml(row.mathml);
+		}
+	});
+	if (rawInput !== void 0) return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		paddingX: 1,
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Raw MathML (the children of the <math> root, e.g. <mfrac>...</mfrac>)"
+			}),
+			/* @__PURE__ */ jsx(TextField, {
+				value: rawInput,
+				isFocused: true,
+				onChange: setRawInput,
+				onCancel: () => {
+					setRawInput(void 0);
+				},
+				onSubmit: (value) => {
+					try {
+						const parsed = parseXml(value);
+						props.onMathml(parsed);
+					} catch (error) {
+						props.onInvalidRawMathml(describeError(error));
+					}
+					setRawInput(void 0);
+				}
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "Enter to insert, Esc to cancel"
+			})
+		]
+	});
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		paddingX: 1,
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Insert formula -- choose a preset or write raw MathML"
+			}),
+			/* @__PURE__ */ jsx(ListView, {
+				items: PICKER_ROWS,
+				selectedIndex,
+				reservedRows: PICKER_ROWS.length + 2,
+				renderItem: (row, isSelected) => /* @__PURE__ */ jsxs(Text, {
+					color: isSelected ? "cyan" : void 0,
+					children: [isSelected ? "> " : "  ", row.label]
+				})
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "Enter to choose, Esc to cancel"
+			})
+		]
+	});
+}
+//#endregion
 //#region src/tui/screens/shared/text.ts
 function truncatePreview(text, maxLength) {
 	const singleLine = text.replace(/\s+/gu, " ").trim();
@@ -1682,6 +2031,10 @@ function parseNonNegativeIntField(raw, fallback) {
 	const parsed = Number.parseInt(raw, 10);
 	return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
 }
+function parseNumberField(raw, fallback) {
+	const parsed = Number.parseFloat(raw);
+	return Number.isFinite(parsed) ? parsed : fallback;
+}
 //#endregion
 //#region src/tui/screens/shared/paragraph-family.tsx
 function paragraphFamilyDocument(openDocument) {
@@ -1747,6 +2100,36 @@ function listSummary(list, index) {
 }
 const DEFAULT_TABLE_ROWS$1 = 2;
 const DEFAULT_TABLE_COLUMNS$1 = 2;
+const FORMULA_FRAME_FIELDS = [
+	{
+		key: "xPt",
+		label: "X (pt)",
+		defaultValue: "40"
+	},
+	{
+		key: "yPt",
+		label: "Y (pt)",
+		defaultValue: "40"
+	},
+	{
+		key: "widthPt",
+		label: "Width (pt)",
+		defaultValue: "120"
+	},
+	{
+		key: "heightPt",
+		label: "Height (pt)",
+		defaultValue: "40"
+	}
+];
+function readFormulaFrame(values) {
+	return {
+		xPt: parseNumberField(requireFieldValue(values, "xPt"), 0),
+		yPt: parseNumberField(requireFieldValue(values, "yPt"), 0),
+		widthPt: parseNumberField(requireFieldValue(values, "widthPt"), 120),
+		heightPt: parseNumberField(requireFieldValue(values, "heightPt"), 40)
+	};
+}
 function ParagraphFamilyBodyList(props) {
 	const { adapter } = props;
 	const state = useAppState();
@@ -1797,6 +2180,9 @@ function ParagraphFamilyBodyList(props) {
 	const [wizardStartColumn, setWizardStartColumn] = useState(0);
 	const [wizardRowSpan, setWizardRowSpan] = useState(1);
 	const wizardOpen = tableWizard !== "closed";
+	const [formulaFlow, setFormulaFlow] = useState("closed");
+	const [pendingFormulaMathml, setPendingFormulaMathml] = useState(void 0);
+	const formulaFlowOpen = formulaFlow !== "closed";
 	const closeWizard = () => {
 		setTableWizard("closed");
 	};
@@ -1822,7 +2208,23 @@ function ParagraphFamilyBodyList(props) {
 			setWizardDraft(String(DEFAULT_TABLE_ROWS$1));
 			setTableWizard("rows");
 		}
-	}, { isActive: !anyOverlayOpen(state) && !wizardOpen });
+	}, { isActive: !anyOverlayOpen(state) && !wizardOpen && !formulaFlowOpen });
+	useInput((input) => {
+		if (input === "L" && adapter.lists !== void 0) {
+			const newIndex = adapter.lists().length;
+			dispatch({ type: "ADD_LIST" });
+			dispatch({
+				type: "PUSH_SCREEN",
+				screen: {
+					kind: "listEditor",
+					blockIndex: newIndex
+				}
+			});
+		}
+	}, { isActive: !anyOverlayOpen(state) && !wizardOpen && !formulaFlowOpen });
+	useInput((input) => {
+		if (input === "m" && adapter.formatLabel === "odt") setFormulaFlow("picking");
+	}, { isActive: !anyOverlayOpen(state) && !wizardOpen && !formulaFlowOpen });
 	useInput((input, key) => {
 		if (key.escape) {
 			closeWizard();
@@ -1870,7 +2272,7 @@ function ParagraphFamilyBodyList(props) {
 	};
 	const { selectedIndex } = usePersistedSelection(selectionKeyFor({ kind: "bodyList" }), {
 		itemCount: selectableRowIndices.length,
-		isActive: !anyOverlayOpen(state) && !wizardOpen,
+		isActive: !anyOverlayOpen(state) && !wizardOpen && !formulaFlowOpen,
 		onBack: () => {
 			dispatch({ type: "POP_SCREEN" });
 		},
@@ -2037,9 +2439,47 @@ function ParagraphFamilyBodyList(props) {
 				onSubmit: submitWizardMergeColSpan,
 				onCancel: closeWizard
 			})] }) : void 0,
-			/* @__PURE__ */ jsx(Text, {
+			formulaFlow === "picking" ? /* @__PURE__ */ jsx(FormulaPicker, {
+				isActive: !anyOverlayOpen(state),
+				onCancel: () => {
+					setFormulaFlow("closed");
+				},
+				onMathml: (mathml) => {
+					setPendingFormulaMathml(mathml);
+					setFormulaFlow("frame");
+				},
+				onInvalidRawMathml: (message) => {
+					dispatch({
+						type: "SET_STATUS",
+						severity: "warning",
+						text: `Could not parse MathML: ${message}`
+					});
+				}
+			}) : void 0,
+			formulaFlow === "frame" ? /* @__PURE__ */ jsx(FieldWizard, {
+				fields: FORMULA_FRAME_FIELDS,
+				onCancel: () => {
+					setFormulaFlow("closed");
+					setPendingFormulaMathml(void 0);
+				},
+				onComplete: (values) => {
+					if (pendingFormulaMathml !== void 0) dispatch({
+						type: "INSERT_ODT_FORMULA",
+						mathml: pendingFormulaMathml,
+						frame: readFormulaFrame(values)
+					});
+					setFormulaFlow("closed");
+					setPendingFormulaMathml(void 0);
+				}
+			}) : void 0,
+			/* @__PURE__ */ jsxs(Text, {
 				dimColor: true,
-				children: "Enter to open, a to append a paragraph, T to append a table, Esc back"
+				children: [
+					"Enter to open, a to append a paragraph, T to append a table",
+					adapter.lists !== void 0 ? ", L to add a list" : "",
+					adapter.formatLabel === "odt" ? ", m to insert a formula" : "",
+					", Esc back"
+				]
 			})
 		]
 	});
@@ -2059,6 +2499,67 @@ function isValidHexColorInput(input) {
 }
 //#endregion
 //#region src/tui/screens/editors/docx/paragraph-detail.tsx
+const DEFAULT_RUN_SIZE_PT = 12;
+const IMAGE_FIELDS = [
+	{
+		key: "path",
+		label: "Image file path (.png/.jpg/.jpeg)",
+		defaultValue: ""
+	},
+	{
+		key: "widthPt",
+		label: "Width (pt)",
+		defaultValue: "100"
+	},
+	{
+		key: "heightPt",
+		label: "Height (pt)",
+		defaultValue: "60"
+	},
+	{
+		key: "altText",
+		label: "Alt text, blank for none",
+		defaultValue: ""
+	}
+];
+function inferImageFormat$1(path) {
+	const extension = path.slice(path.lastIndexOf(".") + 1).toLowerCase();
+	if (extension === "png") return "png";
+	if (extension === "jpg" || extension === "jpeg") return "jpeg";
+}
+async function applyInsertImage(blockIndex, values, dispatch) {
+	const path = requireFieldValue(values, "path");
+	const format = inferImageFormat$1(path);
+	if (format === void 0) {
+		dispatch({
+			type: "SET_STATUS",
+			severity: "warning",
+			text: `${path} is not a .png or .jpg/.jpeg file -- image not inserted`
+		});
+		return;
+	}
+	try {
+		const bytes = new Uint8Array(await readInput(path));
+		const widthPt = parseNumberField(requireFieldValue(values, "widthPt"), 100);
+		const heightPt = parseNumberField(requireFieldValue(values, "heightPt"), 60);
+		const altTextRaw = requireFieldValue(values, "altText").trim();
+		dispatch({
+			type: "INSERT_PARAGRAPH_IMAGE",
+			blockIndex,
+			format,
+			bytes,
+			widthPt,
+			heightPt,
+			altText: altTextRaw.length === 0 ? void 0 : altTextRaw
+		});
+	} catch (error) {
+		dispatch({
+			type: "SET_STATUS",
+			severity: "error",
+			text: `Could not read ${path}: ${describeError(error)}`
+		});
+	}
+}
 function ParagraphRunsView(props) {
 	if (props.runs.length === 0) return /* @__PURE__ */ jsx(Text, {
 		dimColor: true,
@@ -2078,6 +2579,10 @@ function ParagraphDetailScreen() {
 	const dispatch = useAppDispatch();
 	const [runIndex, setRunIndex] = useState(0);
 	const [colorInput, setColorInput] = useState(void 0);
+	const [fontFamilyInput, setFontFamilyInput] = useState(void 0);
+	const [fontSizeInput, setFontSizeInput] = useState(void 0);
+	const [imageWizardOpen, setImageWizardOpen] = useState(false);
+	const [formulaPickerOpen, setFormulaPickerOpen] = useState(false);
 	const screen = currentScreen(state);
 	const doc = paragraphFamilyDocument(state.openDocument);
 	const paragraph = screen.kind === "paragraphDetail" && doc !== void 0 ? liveParagraphAt(doc, screen.blockIndex) : void 0;
@@ -2140,6 +2645,14 @@ function ParagraphDetailScreen() {
 			});
 			return;
 		}
+		if (input === "I") {
+			setImageWizardOpen(true);
+			return;
+		}
+		if (input === "m" && doc?.format === "docx") {
+			setFormulaPickerOpen(true);
+			return;
+		}
 		if (selectedRun === void 0) return;
 		if (input === "b") {
 			dispatch({
@@ -2165,8 +2678,16 @@ function ParagraphDetailScreen() {
 			});
 			return;
 		}
-		if (input === "c") setColorInput(selectedRun.color === void 0 ? "" : layoutColorToHex(selectedRun.color).slice(1));
-	}, { isActive: !anyOverlayOpen(state) && colorInput === void 0 });
+		if (input === "c") {
+			setColorInput(selectedRun.color === void 0 ? "" : layoutColorToHex(selectedRun.color).slice(1));
+			return;
+		}
+		if (input === "f") {
+			setFontFamilyInput(selectedRun.fontFamily ?? "");
+			return;
+		}
+		if (input === "s") setFontSizeInput(selectedRun.sizePt === void 0 ? "" : String(selectedRun.sizePt));
+	}, { isActive: !anyOverlayOpen(state) && colorInput === void 0 && fontFamilyInput === void 0 && fontSizeInput === void 0 && !imageWizardOpen && !formulaPickerOpen });
 	if (screen.kind !== "paragraphDetail") return /* @__PURE__ */ jsx(Text, {
 		color: "red",
 		children: "ParagraphDetailScreen rendered outside a paragraphDetail screen."
@@ -2224,9 +2745,99 @@ function ParagraphDetailScreen() {
 					setColorInput(void 0);
 				}
 			})] }),
-			/* @__PURE__ */ jsx(Text, {
+			fontFamilyInput === void 0 ? void 0 : /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Font family: "
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: fontFamilyInput,
+				isFocused: true,
+				placeholder: "e.g. Calibri",
+				onChange: setFontFamilyInput,
+				onSubmit: (value) => {
+					const trimmed = value.trim();
+					if (trimmed.length === 0) dispatch({
+						type: "SET_STATUS",
+						severity: "warning",
+						text: "A font family name cannot be blank"
+					});
+					else dispatch({
+						type: "SET_RUN_FONT_FAMILY",
+						blockIndex,
+						runIndex: clampedRunIndex,
+						fontFamily: trimmed
+					});
+					setFontFamilyInput(void 0);
+				},
+				onCancel: () => {
+					setFontFamilyInput(void 0);
+				}
+			})] }),
+			fontSizeInput === void 0 ? void 0 : /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Font size (pt): "
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: fontSizeInput,
+				isFocused: true,
+				placeholder: "e.g. 12",
+				onChange: setFontSizeInput,
+				onSubmit: (value) => {
+					const sizePt = parseNumberField(value, selectedRun?.sizePt ?? DEFAULT_RUN_SIZE_PT);
+					if (sizePt <= 0) dispatch({
+						type: "SET_STATUS",
+						severity: "warning",
+						text: `"${value}" is not a positive font size`
+					});
+					else dispatch({
+						type: "SET_RUN_FONT_SIZE",
+						blockIndex,
+						runIndex: clampedRunIndex,
+						sizePt
+					});
+					setFontSizeInput(void 0);
+				},
+				onCancel: () => {
+					setFontSizeInput(void 0);
+				}
+			})] }),
+			imageWizardOpen ? /* @__PURE__ */ jsx(FieldWizard, {
+				fields: IMAGE_FIELDS,
+				onCancel: () => {
+					setImageWizardOpen(false);
+				},
+				onComplete: (values) => {
+					applyInsertImage(blockIndex, values, dispatch).then(() => {
+						setImageWizardOpen(false);
+					});
+				}
+			}) : void 0,
+			formulaPickerOpen ? /* @__PURE__ */ jsx(FormulaPicker, {
+				isActive: !anyOverlayOpen(state),
+				onCancel: () => {
+					setFormulaPickerOpen(false);
+				},
+				onMathml: (mathml) => {
+					dispatch({
+						type: "INSERT_DOCX_FORMULA",
+						blockIndex,
+						mathml
+					});
+					setFormulaPickerOpen(false);
+				},
+				onInvalidRawMathml: (message) => {
+					dispatch({
+						type: "SET_STATUS",
+						severity: "warning",
+						text: `Could not parse MathML: ${message}`
+					});
+				}
+			}) : void 0,
+			/* @__PURE__ */ jsxs(Text, {
 				dimColor: true,
-				children: "<- / -> move, Enter edit text, b/i/u toggle, c colour, a append run, Esc back"
+				children: [
+					"<- / -> move, Enter edit text, b/i/u toggle, c colour, f font, s size, a append run, I image",
+					doc.format === "docx" ? ", m formula" : "",
+					", Esc back"
+				]
 			})
 		]
 	});
@@ -3292,6 +3903,64 @@ function OdbTableRowsScreen() {
 	});
 }
 //#endregion
+//#region src/tui/screens/shared/vector-fields.ts
+function parseColorField(raw) {
+	const trimmed = raw.trim();
+	if (trimmed.length === 0) return;
+	const [r, g, b] = trimmed.split(/\s+/).map((part) => Number.parseFloat(part));
+	if (r === void 0 || g === void 0 || b === void 0 || ![
+		r,
+		g,
+		b
+	].every((value) => Number.isFinite(value))) return;
+	return {
+		r,
+		g,
+		b
+	};
+}
+function parseStrokeField(raw) {
+	const trimmed = raw.trim();
+	if (trimmed.length === 0) return;
+	const [r, g, b, widthPt] = trimmed.split(/\s+/).map((part) => Number.parseFloat(part));
+	if (r === void 0 || g === void 0 || b === void 0 || widthPt === void 0 || ![
+		r,
+		g,
+		b,
+		widthPt
+	].every((value) => Number.isFinite(value))) return;
+	return {
+		color: {
+			r,
+			g,
+			b
+		},
+		widthPt
+	};
+}
+function defaultTriangleSubpaths(widthPt, heightPt) {
+	return [{
+		start: {
+			xPt: 0,
+			yPt: heightPt
+		},
+		segments: [{
+			kind: "line",
+			to: {
+				xPt: widthPt / 2,
+				yPt: 0
+			}
+		}, {
+			kind: "line",
+			to: {
+				xPt: widthPt,
+				yPt: heightPt
+			}
+		}],
+		closed: true
+	}];
+}
+//#endregion
 //#region src/tui/screens/editors/odg/shared.ts
 function requireOdgDocument(state) {
 	const doc = state.openDocument;
@@ -3350,85 +4019,20 @@ function formatFrame(box) {
 	return `${formatPt(box.xPt)},${formatPt(box.yPt)} ${formatPt(box.widthPt)}x${formatPt(box.heightPt)}pt`;
 }
 function formatPoint$1(point) {
-	return `${formatPt(point.xPt)},${formatPt(point.yPt)}`;
-}
-function formatColor$1(color) {
-	return `rgb(${color.r.toFixed(2)}, ${color.g.toFixed(2)}, ${color.b.toFixed(2)})`;
-}
-function describeVectorGeometry(vector) {
-	if (vector.kind === "line") return `${formatPoint$1(vector.from)} -> ${formatPoint$1(vector.to)}`;
-	return formatFrame(vector.frame);
-}
-function describeFillStroke(vector) {
-	const parts = [];
-	if (vector.kind !== "line" && vector.fill !== void 0) parts.push(`fill ${formatColor$1(vector.fill)}`);
-	if (vector.stroke !== void 0) parts.push(`stroke ${formatColor$1(vector.stroke.color)} ${formatPt(vector.stroke.widthPt)}pt`);
-	return parts.length === 0 ? "no fill or stroke" : parts.join(", ");
-}
-function parseNumberField(raw, fallback) {
-	const parsed = Number.parseFloat(raw);
-	return Number.isFinite(parsed) ? parsed : fallback;
-}
-function parseColorField(raw) {
-	const trimmed = raw.trim();
-	if (trimmed.length === 0) return;
-	const [r, g, b] = trimmed.split(/\s+/).map((part) => Number.parseFloat(part));
-	if (r === void 0 || g === void 0 || b === void 0 || ![
-		r,
-		g,
-		b
-	].every((value) => Number.isFinite(value))) return;
-	return {
-		r,
-		g,
-		b
-	};
-}
-function parseStrokeField(raw) {
-	const trimmed = raw.trim();
-	if (trimmed.length === 0) return;
-	const [r, g, b, widthPt] = trimmed.split(/\s+/).map((part) => Number.parseFloat(part));
-	if (r === void 0 || g === void 0 || b === void 0 || widthPt === void 0 || ![
-		r,
-		g,
-		b,
-		widthPt
-	].every((value) => Number.isFinite(value))) return;
-	return {
-		color: {
-			r,
-			g,
-			b
-		},
-		widthPt
-	};
+	return `${formatPt(point.xPt)},${formatPt(point.yPt)}`;
 }
-function defaultTriangleSubpaths(widthPt, heightPt) {
-	return [{
-		start: {
-			xPt: 0,
-			yPt: heightPt
-		},
-		segments: [{
-			kind: "line",
-			to: {
-				xPt: widthPt / 2,
-				yPt: 0
-			}
-		}, {
-			kind: "line",
-			to: {
-				xPt: widthPt,
-				yPt: heightPt
-			}
-		}],
-		closed: true
-	}];
+function formatColor$1(color) {
+	return `rgb(${color.r.toFixed(2)}, ${color.g.toFixed(2)}, ${color.b.toFixed(2)})`;
 }
-function requireFieldValue(values, key) {
-	const value = values[key];
-	if (value === void 0) throw new Error(`Add-item field '${key}' was never recorded before building the action.`);
-	return value;
+function describeVectorGeometry(vector) {
+	if (vector.kind === "line") return `${formatPoint$1(vector.from)} -> ${formatPoint$1(vector.to)}`;
+	return formatFrame(vector.frame);
+}
+function describeFillStroke(vector) {
+	const parts = [];
+	if (vector.kind !== "line" && vector.fill !== void 0) parts.push(`fill ${formatColor$1(vector.fill)}`);
+	if (vector.stroke !== void 0) parts.push(`stroke ${formatColor$1(vector.stroke.color)} ${formatPt(vector.stroke.widthPt)}pt`);
+	return parts.length === 0 ? "no fill or stroke" : parts.join(", ");
 }
 //#endregion
 //#region src/tui/screens/editors/odg/page-list.tsx
@@ -3633,7 +4237,7 @@ async function applyAddKind(kind, pageIndex, doc, values, dispatch) {
 		case "rect":
 			dispatch({
 				type: "ADD_RECT",
-				pageIndex,
+				containerIndex: pageIndex,
 				init: {
 					frame: readFrame(values),
 					fill: parseColorField(requireFieldValue(values, "fill")),
@@ -3645,7 +4249,7 @@ async function applyAddKind(kind, pageIndex, doc, values, dispatch) {
 		case "ellipse":
 			dispatch({
 				type: "ADD_ELLIPSE",
-				pageIndex,
+				containerIndex: pageIndex,
 				init: {
 					frame: readFrame(values),
 					fill: parseColorField(requireFieldValue(values, "fill")),
@@ -3657,7 +4261,7 @@ async function applyAddKind(kind, pageIndex, doc, values, dispatch) {
 		case "line":
 			dispatch({
 				type: "ADD_LINE",
-				pageIndex,
+				containerIndex: pageIndex,
 				init: {
 					from: {
 						xPt: parseNumberField(requireFieldValue(values, "fromXPt"), 0),
@@ -3683,7 +4287,7 @@ async function applyAddKind(kind, pageIndex, doc, values, dispatch) {
 			const frame = readFrame(values);
 			dispatch({
 				type: "ADD_PATH",
-				pageIndex,
+				containerIndex: pageIndex,
 				init: {
 					frame,
 					subpaths: defaultTriangleSubpaths(frame.widthPt, frame.heightPt),
@@ -3736,56 +4340,6 @@ async function applyAddKind(kind, pageIndex, doc, values, dispatch) {
 		}
 	}
 }
-function FieldWizard(props) {
-	const [stepIndex, setStepIndex] = useState(0);
-	const [collected, setCollected] = useState({});
-	const initialField = props.fields[0];
-	const [draft, setDraft] = useState(initialField === void 0 ? "" : initialField.defaultValue);
-	const field = props.fields[stepIndex];
-	if (field === void 0) throw new Error(`FieldWizard stepIndex ${stepIndex} is out of range for ${props.fields.length} fields -- onComplete always fires before stepIndex can advance past the last field, so this indicates a bug in that advance.`);
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		borderStyle: "round",
-		paddingX: 1,
-		children: [
-			/* @__PURE__ */ jsx(Text, {
-				bold: true,
-				children: field.label
-			}),
-			/* @__PURE__ */ jsx(TextField, {
-				value: draft,
-				isFocused: true,
-				onChange: setDraft,
-				onCancel: props.onCancel,
-				onSubmit: (value) => {
-					const recorded = {
-						...collected,
-						[field.key]: value
-					};
-					const nextIndex = stepIndex + 1;
-					const nextField = props.fields[nextIndex];
-					if (nextField === void 0) {
-						props.onComplete(recorded);
-						return;
-					}
-					setCollected(recorded);
-					setDraft(nextField.defaultValue);
-					setStepIndex(nextIndex);
-				}
-			}),
-			/* @__PURE__ */ jsxs(Text, {
-				dimColor: true,
-				children: [
-					"Step ",
-					stepIndex + 1,
-					" of ",
-					props.fields.length,
-					" -- Enter to continue, Esc to cancel"
-				]
-			})
-		]
-	});
-}
 function AddItemFlow(props) {
 	const dispatch = useAppDispatch();
 	const [kind, setKind] = useState(void 0);
@@ -4665,17 +5219,149 @@ function summarizeSlideTables(doc, slideIndex) {
 }
 //#endregion
 //#region src/tui/screens/editors/pptx/slide-detail.tsx
-const IMAGE_EXTENSION_TO_FORMAT = {
+const IMAGE_EXTENSION_TO_FORMAT$1 = {
 	png: "png",
 	jpg: "jpeg",
 	jpeg: "jpeg"
 };
 const DEFAULT_TABLE_ROWS = 2;
 const DEFAULT_TABLE_COLUMNS = 2;
+const VECTOR_GEOMETRY_FIELDS = [
+	{
+		key: "xPt",
+		label: "X (pt)",
+		defaultValue: "40"
+	},
+	{
+		key: "yPt",
+		label: "Y (pt)",
+		defaultValue: "40"
+	},
+	{
+		key: "widthPt",
+		label: "Width (pt)",
+		defaultValue: "160"
+	},
+	{
+		key: "heightPt",
+		label: "Height (pt)",
+		defaultValue: "100"
+	}
+];
+const VECTOR_FILL_FIELD = {
+	key: "fill",
+	label: "Fill \"r g b\" (0-1 each), blank for none",
+	defaultValue: "0.8 0.8 0.8"
+};
+const VECTOR_STROKE_FIELD = {
+	key: "stroke",
+	label: "Stroke \"r g b widthPt\" (0-1 colour, pt width), blank for none",
+	defaultValue: "0 0 0 1"
+};
+const VECTOR_LINE_FIELDS = [
+	{
+		key: "fromXPt",
+		label: "From X (pt)",
+		defaultValue: "40"
+	},
+	{
+		key: "fromYPt",
+		label: "From Y (pt)",
+		defaultValue: "40"
+	},
+	{
+		key: "toXPt",
+		label: "To X (pt)",
+		defaultValue: "200"
+	},
+	{
+		key: "toYPt",
+		label: "To Y (pt)",
+		defaultValue: "40"
+	},
+	VECTOR_STROKE_FIELD
+];
+function fieldsForVectorKind(kind) {
+	switch (kind) {
+		case "rect":
+		case "ellipse":
+		case "path": return [
+			...VECTOR_GEOMETRY_FIELDS,
+			VECTOR_FILL_FIELD,
+			VECTOR_STROKE_FIELD
+		];
+		case "line": return VECTOR_LINE_FIELDS;
+	}
+}
+function readVectorFrame(values) {
+	return {
+		xPt: parseNumberField(requireFieldValue(values, "xPt"), 0),
+		yPt: parseNumberField(requireFieldValue(values, "yPt"), 0),
+		widthPt: parseNumberField(requireFieldValue(values, "widthPt"), 160),
+		heightPt: parseNumberField(requireFieldValue(values, "heightPt"), 100)
+	};
+}
+function buildVectorAction(kind, slideIndex, values) {
+	switch (kind) {
+		case "rect": return {
+			type: "ADD_RECT",
+			containerIndex: slideIndex,
+			init: {
+				frame: readVectorFrame(values),
+				fill: parseColorField(requireFieldValue(values, "fill")),
+				stroke: parseStrokeField(requireFieldValue(values, "stroke"))
+			}
+		};
+		case "ellipse": return {
+			type: "ADD_ELLIPSE",
+			containerIndex: slideIndex,
+			init: {
+				frame: readVectorFrame(values),
+				fill: parseColorField(requireFieldValue(values, "fill")),
+				stroke: parseStrokeField(requireFieldValue(values, "stroke"))
+			}
+		};
+		case "line": return {
+			type: "ADD_LINE",
+			containerIndex: slideIndex,
+			init: {
+				from: {
+					xPt: parseNumberField(requireFieldValue(values, "fromXPt"), 0),
+					yPt: parseNumberField(requireFieldValue(values, "fromYPt"), 0)
+				},
+				to: {
+					xPt: parseNumberField(requireFieldValue(values, "toXPt"), 100),
+					yPt: parseNumberField(requireFieldValue(values, "toYPt"), 0)
+				},
+				stroke: parseStrokeField(requireFieldValue(values, "stroke")) ?? {
+					color: {
+						r: 0,
+						g: 0,
+						b: 0
+					},
+					widthPt: 1
+				}
+			}
+		};
+		case "path": {
+			const frame = readVectorFrame(values);
+			return {
+				type: "ADD_PATH",
+				containerIndex: slideIndex,
+				init: {
+					frame,
+					subpaths: defaultTriangleSubpaths(frame.widthPt, frame.heightPt),
+					fill: parseColorField(requireFieldValue(values, "fill")),
+					stroke: parseStrokeField(requireFieldValue(values, "stroke"))
+				}
+			};
+		}
+	}
+}
 function imageFormatFromPath(path) {
 	const dotIndex = path.lastIndexOf(".");
 	if (dotIndex < 0) return;
-	return IMAGE_EXTENSION_TO_FORMAT[path.slice(dotIndex + 1).toLowerCase()];
+	return IMAGE_EXTENSION_TO_FORMAT$1[path.slice(dotIndex + 1).toLowerCase()];
 }
 async function readImageForShape(path) {
 	const format = imageFormatFromPath(path);
@@ -4716,6 +5402,7 @@ function SlideDetailScreen(props) {
 	const [draft, setDraft] = useState("");
 	const [imageError, setImageError] = useState(void 0);
 	const [tableRows, setTableRows] = useState(DEFAULT_TABLE_ROWS);
+	const [vectorKind, setVectorKind] = useState(void 0);
 	const formIsOpen = addMode !== "closed";
 	const { selectedIndex } = useNavigationInput({
 		itemCount: selectableRowIndices.length,
@@ -4776,6 +5463,27 @@ function SlideDetailScreen(props) {
 		if (input === "b") {
 			setDraft(String(DEFAULT_TABLE_ROWS));
 			setAddMode("tableRows");
+			return;
+		}
+		if (doc.format !== "odp") return;
+		if (input === "r") {
+			setVectorKind("rect");
+			setAddMode("vector");
+			return;
+		}
+		if (input === "e") {
+			setVectorKind("ellipse");
+			setAddMode("vector");
+			return;
+		}
+		if (input === "n") {
+			setVectorKind("line");
+			setAddMode("vector");
+			return;
+		}
+		if (input === "p") {
+			setVectorKind("path");
+			setAddMode("vector");
 		}
 	}, { isActive: !overlayOpen && addMode === "chooseKind" });
 	useInput((input) => {
@@ -4889,9 +5597,25 @@ function SlideDetailScreen(props) {
 					});
 				}
 			}),
-			addMode === "chooseKind" ? /* @__PURE__ */ jsx(Text, {
+			addMode === "chooseKind" ? /* @__PURE__ */ jsxs(Text, {
 				color: "cyan",
-				children: "Add shape: t textbox, i image, b table, Esc cancel"
+				children: [
+					"Add shape: t textbox, i image, b table",
+					doc.format === "odp" ? ", r rect, e ellipse, n line, p path" : "",
+					", Esc cancel"
+				]
+			}) : void 0,
+			addMode === "vector" && vectorKind !== void 0 ? /* @__PURE__ */ jsx(FieldWizard, {
+				fields: fieldsForVectorKind(vectorKind),
+				onCancel: () => {
+					setAddMode("closed");
+					setVectorKind(void 0);
+				},
+				onComplete: (values) => {
+					dispatch(buildVectorAction(vectorKind, slideIndex, values));
+					setAddMode("closed");
+					setVectorKind(void 0);
+				}
 			}) : void 0,
 			addMode === "textbox" ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
 				color: "cyan",
@@ -5714,8 +6438,90 @@ const RESERVED_LETTERS = /* @__PURE__ */ new Set([
 	"l",
 	"p",
 	"t",
-	"m"
+	"m",
+	"f",
+	"i"
 ]);
+const IMAGE_EXTENSION_TO_FORMAT = {
+	png: "png",
+	jpg: "jpeg",
+	jpeg: "jpeg"
+};
+function inferSheetImageFormat(path) {
+	const extension = path.slice(path.lastIndexOf(".") + 1).toLowerCase();
+	return IMAGE_EXTENSION_TO_FORMAT[extension];
+}
+const SHEET_IMAGE_FIELDS = [
+	{
+		key: "path",
+		label: "Image file path (.png/.jpg/.jpeg)",
+		defaultValue: ""
+	},
+	{
+		key: "widthPt",
+		label: "Width (pt)",
+		defaultValue: "100"
+	},
+	{
+		key: "heightPt",
+		label: "Height (pt)",
+		defaultValue: "60"
+	},
+	{
+		key: "offsetXPt",
+		label: "Offset X from anchor cell (pt)",
+		defaultValue: "0"
+	},
+	{
+		key: "offsetYPt",
+		label: "Offset Y from anchor cell (pt)",
+		defaultValue: "0"
+	},
+	{
+		key: "altText",
+		label: "Alt text, blank for none",
+		defaultValue: ""
+	}
+];
+async function applyAddSheetImage(sheetIndex, anchorRow, anchorColumn, values, dispatch) {
+	const path = requireFieldValue(values, "path");
+	const format = inferSheetImageFormat(path);
+	if (format === void 0) {
+		dispatch({
+			type: "SET_STATUS",
+			severity: "warning",
+			text: `${path} is not a .png or .jpg/.jpeg file -- image not added`
+		});
+		return;
+	}
+	try {
+		const bytes = new Uint8Array(await readInput(path));
+		const widthPt = parseNumberField(requireFieldValue(values, "widthPt"), 100);
+		const heightPt = parseNumberField(requireFieldValue(values, "heightPt"), 60);
+		const offsetXPt = parseNumberField(requireFieldValue(values, "offsetXPt"), 0);
+		const offsetYPt = parseNumberField(requireFieldValue(values, "offsetYPt"), 0);
+		const altTextRaw = requireFieldValue(values, "altText").trim();
+		dispatch({
+			type: "ADD_SHEET_IMAGE",
+			sheetIndex,
+			anchorRow,
+			anchorColumn,
+			offsetXPt,
+			offsetYPt,
+			format,
+			bytes,
+			widthPt,
+			heightPt,
+			altText: altTextRaw.length === 0 ? void 0 : altTextRaw
+		});
+	} catch (error) {
+		dispatch({
+			type: "SET_STATUS",
+			severity: "error",
+			text: `Could not read ${path}: ${describeError(error)}`
+		});
+	}
+}
 function windowStart(cursor, total, viewport) {
 	const maxStart = Math.max(0, total - viewport);
 	return Math.min(Math.max(cursor - Math.floor(viewport / 2), 0), maxStart);
@@ -5738,6 +6544,9 @@ function OdsSpreadsheetGridScreen() {
 	const [viewMode, setViewMode] = useState("grid");
 	const [editSession, setEditSession] = useState(void 0);
 	const [mergeAnchor, setMergeAnchor] = useState(void 0);
+	const [formulaEditing, setFormulaEditing] = useState(false);
+	const [formulaDraft, setFormulaDraft] = useState("");
+	const [imageWizardOpen, setImageWizardOpen] = useState(false);
 	const { columns: terminalColumns, rows: terminalRows } = useWindowSize();
 	const sheet = resolveSheet(doc.editor, sheetIndex);
 	const { rowCount, columnCount } = sheetExtent(sheet);
@@ -5746,6 +6555,7 @@ function OdsSpreadsheetGridScreen() {
 	const clampedColumn = Math.min(cursorColumn, columnCount - 1);
 	const overlayOpen = anyOverlayOpen(state);
 	const editing = editSession !== void 0;
+	const editingAnything = editing || formulaEditing || imageWizardOpen;
 	function moveCursor(deltaRow, deltaColumn) {
 		setCursorRow((row) => Math.min(Math.max(row + deltaRow, 0), rowCount - 1));
 		setCursorColumn((column) => Math.min(Math.max(column + deltaColumn, 0), columnCount - 1));
@@ -5783,7 +6593,7 @@ function OdsSpreadsheetGridScreen() {
 				sheetIndex
 			}
 		});
-	}, { isActive: !overlayOpen && !editing });
+	}, { isActive: !overlayOpen && !editingAnything });
 	useInput((input, key) => {
 		if (key.upArrow || input === "k") {
 			moveCursor(-1, 0);
@@ -5833,6 +6643,16 @@ function OdsSpreadsheetGridScreen() {
 			else commitMerge(mergeAnchor);
 			return;
 		}
+		if (input === "f") {
+			const cell = cells.get(cellKey(clampedRow, clampedColumn));
+			setFormulaDraft(cell?.formula ?? "");
+			setFormulaEditing(true);
+			return;
+		}
+		if (input === "i") {
+			setImageWizardOpen(true);
+			return;
+		}
 		if (key.return) {
 			if (mergeAnchor !== void 0) {
 				commitMerge(mergeAnchor);
@@ -5844,7 +6664,7 @@ function OdsSpreadsheetGridScreen() {
 			return;
 		}
 		if (input.length === 1 && !key.ctrl && !key.meta && !RESERVED_LETTERS.has(input)) beginEdit(input, inferKind(input));
-	}, { isActive: !overlayOpen && !editing && viewMode === "grid" });
+	}, { isActive: !overlayOpen && !editingAnything && viewMode === "grid" });
 	const compactRows = sheet === void 0 ? [] : sheet.cells.filter((cell) => cell.value.kind !== "empty").map((cell) => ({
 		row: cell.row,
 		column: cell.column,
@@ -5962,9 +6782,43 @@ function OdsSpreadsheetGridScreen() {
 					setEditSession(void 0);
 				}
 			}),
+			formulaEditing ? /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsxs(Text, {
+				color: "cyan",
+				children: [cursorAddress, " formula: "]
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: formulaDraft,
+				isFocused: !overlayOpen,
+				placeholder: "e.g. of:=[.A1]+[.A2]",
+				onChange: setFormulaDraft,
+				onSubmit: (value) => {
+					const trimmed = value.trim();
+					dispatch({
+						type: "SET_CELL_FORMULA",
+						sheetIndex,
+						row: clampedRow,
+						column: clampedColumn,
+						formula: trimmed.length === 0 ? void 0 : trimmed
+					});
+					setFormulaEditing(false);
+				},
+				onCancel: () => {
+					setFormulaEditing(false);
+				}
+			})] }) : void 0,
+			imageWizardOpen ? /* @__PURE__ */ jsx(FieldWizard, {
+				fields: SHEET_IMAGE_FIELDS,
+				onCancel: () => {
+					setImageWizardOpen(false);
+				},
+				onComplete: (values) => {
+					applyAddSheetImage(sheetIndex, clampedRow, clampedColumn, values, dispatch).then(() => {
+						setImageWizardOpen(false);
+					});
+				}
+			}) : void 0,
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: mergeAnchor === void 0 ? `hjkl/arrows move, Enter/type to edit, m to anchor a merge, p print settings, t ${viewMode === "grid" ? "compact list" : "grid"} view, Esc back` : "hjkl/arrows to the opposite corner, m/Enter to merge, Esc to cancel"
+				children: mergeAnchor === void 0 ? `hjkl/arrows move, Enter/type to edit, m to anchor a merge, p print settings, t ${viewMode === "grid" ? "compact list" : "grid"} view, f formula, i image, Esc back` : "hjkl/arrows to the opposite corner, m/Enter to merge, Esc to cancel"
 			})
 		]
 	});