document-cli 1.10.0 → 1.11.1

package/dist/{tui-BVeYd0ry.js → tui-Bw_z7xq6.js}

@@ -1,8 +1,8 @@
-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 { 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-CS2Eybob.js";
 import { readFile, writeFile } from "node:fs/promises";
-import { buildDocxPackage, buildOdtPackage, bytesToBase64, convertWordprocessingToLayout, createDocx, createFontMeasurer, createFontRegistry, createOdg, createOdp, createOds, createOdt, createPdf, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, encodePackage, hsqldbCellDisplayText, markdownToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openOdg, openOdp, openOds, openOdt, openPdf, openPptx, parseXml, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, writePdf, xlsxToPdf } from "documents.js";
+import { bytesToBase64, createDocx, createOdg, createOdp, createOds, createOdt, createPdf, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, hsqldbCellDisplayText, markdownToPdf, odbReportToDocx, odbReportToOdt, odbReportToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openMarkdown, openOdg, openOdp, openOds, openOdt, openPdf, openPptx, parseXml, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, 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 { cellReference, columnIndexToLetters, decodePackage as decodePackage$1 } from "odf.js";
 import { readdirSync } from "node:fs";
 import { Box, Text, render, useApp, useInput, useWindowSize } from "ink";
 import { createContext, useContext, useEffect, useReducer, useState } from "react";
@@ -39,7 +39,7 @@ async function exportToPdf(openDocument, destinationPath, options) {
 	if (openDocument.format === "odb" || openDocument.format === "pdf") throw new Error(`A ${openDocument.format} document has no export-to-PDF path -- ${openDocument.format === "pdf" ? "save it directly instead" : "it is a read-only source with nothing to convert"}`);
 	const pdfOptions = toPdfOptions(options, await loadProvidedFonts(options.fontFiles ?? [], { signal: options.signal }));
 	if (openDocument.format === "markdown") {
-		const pdfBytes = markdownToPdf(encodeMarkdownText(openDocument.source), pdfOptions);
+		const pdfBytes = markdownToPdf(encodeMarkdownText(openDocument.editor.toMarkdownText()), pdfOptions);
 		await writeFile(destinationPath, pdfBytes);
 		return;
 	}
@@ -75,7 +75,7 @@ function detectFormat(path) {
 //#endregion
 //#region src/tui/format/open-document.ts
 const ODB_EXTENSION = ".odb";
-async function openDocumentAtPath(path) {
+async function openDocumentAtPath(path, options = {}) {
 	const bytes = new Uint8Array(await readFile(path));
 	if (path.toLowerCase().endsWith(ODB_EXTENSION)) {
 		const pkg = decodePackage$1(bytes);
@@ -129,11 +129,20 @@ async function openDocumentAtPath(path) {
 				path
 			};
 		}
-		case "markdown": return {
-			format,
-			source: decodeMarkdownText(bytes),
-			path
-		};
+		case "markdown": {
+			const text = decodeMarkdownText(bytes);
+			return {
+				format,
+				editor: openMarkdown(text, { sink: (diagnostic) => {
+					options.onDiagnostic?.({
+						severity: diagnostic.severity,
+						message: diagnostic.message
+					});
+				} }),
+				originalText: text,
+				path
+			};
+		}
 		case "xlsx": return {
 			format,
 			layout: readPdf(xlsxToPdf(bytes)),
@@ -189,7 +198,7 @@ function createNewDocument(format) {
 async function saveDocumentTo(openDocument, path) {
 	if (openDocument.format === "odb" || openDocument.format === "xlsx") throw new Error(`A ${openDocument.format} document is opened read-only and cannot be written back`);
 	if (openDocument.format === "markdown") {
-		await writeFile(path, encodeMarkdownText(openDocument.source));
+		await writeFile(path, encodeMarkdownText(openDocument.editor.toMarkdownText()));
 		return;
 	}
 	await writeFile(path, openDocument.editor.toBytes());
@@ -233,7 +242,7 @@ function selectionKeyFor(screen) {
 		case "pdfPageList":
 		case "exportOptions":
 		case "saveAsPrompt":
-		case "markdownLineList":
+		case "viewSource":
 		case "metadata": return screen.kind;
 		case "filePicker": return `filePicker:${screen.purpose}:${screen.cwd}`;
 		case "paragraphDetail":
@@ -256,19 +265,18 @@ function selectionKeyFor(screen) {
 		case "odbFormDetail": return `odbFormDetail:${screen.formName}`;
 		case "odbReportDetail": return `odbReportDetail:${screen.reportName}`;
 		case "odbReportRender": return `odbReportRender:${screen.reportName}`;
-		case "markdownLineEditor": return `markdownLineEditor:${screen.lineIndex}`;
 	}
 }
 function rootScreenForFormat(format) {
 	switch (format) {
 		case "docx":
-		case "odt": return { kind: "bodyList" };
+		case "odt":
+		case "markdown": return { kind: "bodyList" };
 		case "pptx":
 		case "odp": return { kind: "slideList" };
 		case "ods": return { kind: "sheetList" };
 		case "odg": return { kind: "pageList" };
 		case "odb": return { kind: "odbTableList" };
-		case "markdown": return { kind: "markdownLineList" };
 		case "pdf":
 		case "xlsx": return { kind: "pdfPageList" };
 	}
@@ -397,7 +405,8 @@ function documentWithPath(doc, path) {
 		};
 		case "markdown": return {
 			format: "markdown",
-			source: doc.source,
+			editor: doc.editor,
+			originalText: doc.originalText,
 			path
 		};
 		case "xlsx": return {
@@ -451,8 +460,11 @@ function reopenEditable(doc, bytes) {
 		}
 	}
 }
+function toUndoSnapshot(doc) {
+	return doc.format === "markdown" ? encodeMarkdownText(doc.editor.toMarkdownText()) : doc.editor.toBytes();
+}
 function mutate(state, doc, apply) {
-	const snapshot = doc.editor.toBytes();
+	const snapshot = toUndoSnapshot(doc);
 	apply();
 	return {
 		...state,
@@ -492,22 +504,15 @@ function mergePptxTableCells(table, startRow, startColumn, rowSpan, colSpan) {
 		}
 	}
 }
-function mutateMarkdown(state, doc, source) {
-	const snapshot = encodeMarkdownText(doc.source);
-	return {
-		...state,
-		openDocument: {
-			...doc,
-			source
-		},
-		hasUnsavedChanges: true,
-		undoStack: pushSnapshot(state.undoStack, snapshot)
-	};
-}
 function wrongDocument(state, expected) {
 	return withStatus(state, "warning", `That action needs ${expected}; the open document is ${state.openDocument === void 0 ? "no document" : state.openDocument.format}`);
 }
 function wordprocessingDocument(state) {
+	const doc = state.openDocument;
+	if (doc === void 0) return;
+	return doc.format === "docx" || doc.format === "odt" || doc.format === "markdown" ? doc : void 0;
+}
+function styledWordprocessingDocument(state) {
 	const doc = state.openDocument;
 	if (doc === void 0) return;
 	return doc.format === "docx" || doc.format === "odt" ? doc : void 0;
@@ -571,17 +576,15 @@ function vectorHostDocument(state) {
 	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;
-	return doc.format === "markdown" ? doc : void 0;
-}
 function paragraphAt(doc, blockIndex) {
 	return doc.editor.paragraphs()[blockIndex];
 }
 function tableAt(doc, tableIndex) {
 	return doc.editor.tables()[tableIndex];
 }
+function tableCellAt(table, row, column) {
+	return table.rows()[row]?.cells()[column];
+}
 function shapeAt(doc, containerIndex, shapeIndex) {
 	if (doc.format === "odg") return doc.editor.pages()[containerIndex]?.shapes()[shapeIndex];
 	return doc.editor.slides()[containerIndex]?.shapes()[shapeIndex];
@@ -591,7 +594,7 @@ function sheetAt(doc, sheetIndex) {
 }
 function withRun(state, blockIndex, runIndex, apply) {
 	const doc = wordprocessingDocument(state);
-	if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+	if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
 	const paragraph = paragraphAt(doc, blockIndex);
 	if (paragraph === void 0) return withStatus(state, "warning", `There is no paragraph at index ${blockIndex}`);
 	const run = paragraph.runs()[runIndex];
@@ -600,6 +603,17 @@ function withRun(state, blockIndex, runIndex, apply) {
 		apply(run);
 	});
 }
+function withStyledRun(state, blockIndex, runIndex, apply) {
+	const doc = styledWordprocessingDocument(state);
+	if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+	const paragraph = doc.editor.paragraphs()[blockIndex];
+	if (paragraph === void 0) return withStatus(state, "warning", `There is no paragraph at index ${blockIndex}`);
+	const run = paragraph.runs()[runIndex];
+	if (run === void 0) return withStatus(state, "warning", `Paragraph ${blockIndex} has no run at index ${runIndex}`);
+	return mutate(state, doc, () => {
+		apply(run);
+	});
+}
 function withShape(state, containerIndex, shapeIndex, apply) {
 	const doc = shapeHostDocument(state);
 	if (doc === void 0) return wrongDocument(state, "a pptx, odp or odg document");
@@ -761,8 +775,15 @@ function appReducer(state, action) {
 		};
 		case "APPEND_PARAGRAPH": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
 			return mutate(state, doc, () => {
+				if (doc.format === "markdown") {
+					doc.editor.body.appendParagraph({
+						text: action.text,
+						styleId: action.styleId
+					});
+					return;
+				}
 				doc.editor.body.appendParagraph({
 					text: action.text,
 					styleId: action.styleId,
@@ -771,9 +792,9 @@ function appReducer(state, action) {
 			});
 		}
 		case "SET_PARAGRAPH_ALIGNMENT": {
-			const doc = wordprocessingDocument(state);
+			const doc = styledWordprocessingDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
-			const paragraph = paragraphAt(doc, action.blockIndex);
+			const paragraph = doc.editor.paragraphs()[action.blockIndex];
 			if (paragraph === void 0) return withStatus(state, "warning", `There is no paragraph at index ${action.blockIndex}`);
 			return mutate(state, doc, () => {
 				paragraph.alignment = action.alignment;
@@ -781,7 +802,7 @@ function appReducer(state, action) {
 		}
 		case "APPEND_RUN": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown 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, () => {
@@ -797,50 +818,60 @@ function appReducer(state, action) {
 		case "TOGGLE_RUN_ITALIC": return withRun(state, action.blockIndex, action.runIndex, (run) => {
 			run.italic = !run.italic;
 		});
-		case "TOGGLE_RUN_UNDERLINE": return withRun(state, action.blockIndex, action.runIndex, (run) => {
+		case "TOGGLE_RUN_UNDERLINE": return withStyledRun(state, action.blockIndex, action.runIndex, (run) => {
 			run.underline = !run.underline;
 		});
-		case "SET_RUN_COLOR": return withRun(state, action.blockIndex, action.runIndex, (run) => {
+		case "SET_RUN_COLOR": return withStyledRun(state, action.blockIndex, action.runIndex, (run) => {
 			run.color = action.color;
 		});
-		case "SET_RUN_FONT_FAMILY": return withRun(state, action.blockIndex, action.runIndex, (run) => {
+		case "SET_RUN_FONT_FAMILY": return withStyledRun(state, action.blockIndex, action.runIndex, (run) => {
 			run.fontFamily = action.fontFamily;
 		});
-		case "SET_RUN_FONT_SIZE": return withRun(state, action.blockIndex, action.runIndex, (run) => {
+		case "SET_RUN_FONT_SIZE": return withStyledRun(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");
-			return mutateGuarded(state, doc, () => {
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
+			let mergeUnsupported = false;
+			const nextState = mutateGuarded(state, doc, () => {
 				const table = doc.editor.body.appendTable({
 					rows: action.rows,
 					columns: action.columns
 				});
-				if (action.merge !== void 0) table.mergeCells(action.merge.startRow, action.merge.startColumn, action.merge.rowSpan, action.merge.colSpan);
+				if (action.merge === void 0) return;
+				if (!("mergeCells" in table)) {
+					mergeUnsupported = true;
+					return;
+				}
+				table.mergeCells(action.merge.startRow, action.merge.startColumn, action.merge.rowSpan, action.merge.colSpan);
 			});
+			return mergeUnsupported ? withStatus(nextState, "warning", "Markdown tables do not support merged cells -- the table was created without merging") : nextState;
 		}
 		case "MERGE_TABLE_CELLS": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
 			const table = tableAt(doc, action.tableIndex);
 			if (table === void 0) return withStatus(state, "warning", `There is no table at index ${action.tableIndex}`);
+			if (!("mergeCells" in table)) return withStatus(state, "warning", "Markdown tables do not support merged cells");
 			return mutateGuarded(state, doc, () => {
 				table.mergeCells(action.startRow, action.startColumn, action.rowSpan, action.colSpan);
 			});
 		}
 		case "SET_TABLE_CELL_TEXT": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
 			const table = tableAt(doc, action.tableIndex);
 			if (table === void 0) return withStatus(state, "warning", `There is no table at index ${action.tableIndex}`);
+			const cell = tableCellAt(table, action.row, action.column);
+			if (cell === void 0) return withStatus(state, "warning", `There is no cell at row ${action.row}, column ${action.column} of table ${action.tableIndex}`);
 			return mutate(state, doc, () => {
-				setCellText(table.cell(action.row, action.column), action.text);
+				setCellText(cell, action.text);
 			});
 		}
 		case "ADD_LIST_ITEM": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
 			if (doc.format === "odt") {
 				const list = doc.editor.lists()[action.blockIndex];
 				if (list === void 0) return withStatus(state, "warning", `There is no list at index ${action.blockIndex}`);
@@ -859,7 +890,7 @@ function appReducer(state, action) {
 		}
 		case "SET_LIST_ITEM_TEXT": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown document");
 			if (doc.format !== "odt") return wrongDocument(state, "an odt document (lists are an odt-only concept)");
 			const list = doc.editor.lists()[action.blockIndex];
 			if (list === void 0) return withStatus(state, "warning", `There is no list at index ${action.blockIndex}`);
@@ -871,16 +902,16 @@ function appReducer(state, action) {
 		}
 		case "ADD_LIST": {
 			const doc = wordprocessingDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
+			if (doc === void 0) return wrongDocument(state, "a docx, odt or markdown 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);
+			const doc = styledWordprocessingDocument(state);
 			if (doc === void 0) return wrongDocument(state, "a docx or odt document");
-			const paragraph = paragraphAt(doc, action.blockIndex);
+			const paragraph = doc.editor.paragraphs()[action.blockIndex];
 			if (paragraph === void 0) return withStatus(state, "warning", `There is no paragraph at index ${action.blockIndex}`);
 			return mutate(state, doc, () => {
 				paragraph.insertImageAfter({
@@ -1259,11 +1290,6 @@ function appReducer(state, action) {
 			item.widthPt = action.widthPt;
 			item.heightPt = action.heightPt;
 		});
-		case "SET_MARKDOWN_SOURCE": {
-			const doc = markdownDocument(state);
-			if (doc === void 0) return wrongDocument(state, "a markdown document");
-			return mutateMarkdown(state, doc, action.source);
-		}
 		case "APPEND_DIAGNOSTIC": return {
 			...state,
 			diagnostics: [...state.diagnostics, action.diagnostic]
@@ -1297,7 +1323,7 @@ function appReducer(state, action) {
 			if (snapshot === void 0) return withStatus(state, "info", "There is nothing to undo");
 			const restored = doc.format === "markdown" ? {
 				...doc,
-				source: decodeMarkdownText(snapshot)
+				editor: openMarkdown(decodeMarkdownText(snapshot))
 			} : reopenEditable(doc, snapshot);
 			return withStatus({
 				...state,
@@ -1413,6 +1439,11 @@ const COMMANDS = [
 		usage: ":undo",
 		description: "Undo the last change"
 	},
+	{
+		name: "view-source",
+		usage: ":view-source",
+		description: "Compare a markdown document as opened vs. as it will save now"
+	},
 	{
 		name: "help",
 		usage: ":help",
@@ -1531,7 +1562,12 @@ async function runCommand(line, state, dispatch) {
 				dispatch({
 					type: "OPEN_FILE_SUCCESS",
 					path,
-					doc: await openDocumentAtPath(path)
+					doc: await openDocumentAtPath(path, { onDiagnostic: (diagnostic) => {
+						dispatch({
+							type: "APPEND_DIAGNOSTIC",
+							diagnostic
+						});
+					} })
 				});
 			} catch (error) {
 				dispatch({
@@ -1548,6 +1584,16 @@ async function runCommand(line, state, dispatch) {
 		case "undo":
 			dispatch({ type: "UNDO" });
 			return;
+		case "view-source":
+			if (doc?.format !== "markdown") {
+				warn(dispatch, ":view-source only applies to an open markdown document");
+				return;
+			}
+			dispatch({
+				type: "PUSH_SCREEN",
+				screen: { kind: "viewSource" }
+			});
+			return;
 		case "help":
 			dispatch({
 				type: "OPEN_OVERLAY",
@@ -2218,9 +2264,12 @@ function parseNumberField(raw, fallback) {
 }
 //#endregion
 //#region src/tui/screens/shared/paragraph-family.tsx
+function supportsRunStyleExtras(run) {
+	return "underline" in run;
+}
 function paragraphFamilyDocument(openDocument) {
 	if (openDocument === void 0) return;
-	return openDocument.format === "docx" || openDocument.format === "odt" ? openDocument : void 0;
+	return openDocument.format === "docx" || openDocument.format === "odt" || openDocument.format === "markdown" ? openDocument : void 0;
 }
 function liveParagraphAt(doc, blockIndex) {
 	return doc.editor.paragraphs()[blockIndex];
@@ -2746,14 +2795,17 @@ function ParagraphRunsView(props) {
 		dimColor: true,
 		children: "(no runs -- press 'a' to append one)"
 	});
-	return /* @__PURE__ */ jsx(Box, { children: props.runs.map((run, index) => /* @__PURE__ */ jsx(Text, {
-		bold: run.bold,
-		italic: run.italic,
-		underline: run.underline,
-		color: run.color === void 0 ? void 0 : layoutColorToHex(run.color),
-		inverse: index === props.selectedRunIndex,
-		children: run.text.length === 0 ? "<empty run>" : run.text
-	}, index)) });
+	return /* @__PURE__ */ jsx(Box, { children: props.runs.map((run, index) => {
+		const styled = supportsRunStyleExtras(run);
+		return /* @__PURE__ */ jsx(Text, {
+			bold: run.bold,
+			italic: run.italic,
+			underline: styled && run.underline,
+			color: styled && run.color !== void 0 ? layoutColorToHex(run.color) : void 0,
+			inverse: index === props.selectedRunIndex,
+			children: run.text.length === 0 ? "<empty run>" : run.text
+		}, index);
+	}) });
 }
 function ParagraphDetailScreen() {
 	const state = useAppState();
@@ -2826,7 +2878,7 @@ function ParagraphDetailScreen() {
 			});
 			return;
 		}
-		if (input === "I") {
+		if (input === "I" && doc?.format !== "markdown") {
 			setImageWizardOpen(true);
 			return;
 		}
@@ -2851,6 +2903,7 @@ function ParagraphDetailScreen() {
 			});
 			return;
 		}
+		if (!supportsRunStyleExtras(selectedRun)) return;
 		if (input === "u") {
 			dispatch({
 				type: "TOGGLE_RUN_UNDERLINE",
@@ -2875,7 +2928,7 @@ function ParagraphDetailScreen() {
 	});
 	if (doc === void 0) return /* @__PURE__ */ jsx(Text, {
 		color: "red",
-		children: "ParagraphDetailScreen requires an open docx or odt document."
+		children: "ParagraphDetailScreen requires an open docx, odt or markdown document."
 	});
 	if (paragraph === void 0) return /* @__PURE__ */ jsxs(Text, {
 		color: "red",
@@ -2962,7 +3015,7 @@ function ParagraphDetailScreen() {
 				placeholder: "e.g. 12",
 				onChange: setFontSizeInput,
 				onSubmit: (value) => {
-					const sizePt = parseNumberField(value, selectedRun?.sizePt ?? DEFAULT_RUN_SIZE_PT);
+					const sizePt = parseNumberField(value, selectedRun !== void 0 && supportsRunStyleExtras(selectedRun) ? selectedRun.sizePt ?? DEFAULT_RUN_SIZE_PT : DEFAULT_RUN_SIZE_PT);
 					if (sizePt <= 0) dispatch({
 						type: "SET_STATUS",
 						severity: "warning",
@@ -3015,7 +3068,12 @@ function ParagraphDetailScreen() {
 			/* @__PURE__ */ jsxs(Text, {
 				dimColor: true,
 				children: [
-					"<- / -> move, Enter edit text, b/i/u toggle, c colour, f font, s size, a append run, I image",
+					"<- / -> move, Enter edit text, b/i",
+					doc.format === "markdown" ? "" : "/u",
+					" toggle",
+					doc.format === "markdown" ? "" : ", c colour, f font, s size",
+					", a append run",
+					doc.format === "markdown" ? "" : ", I image",
 					doc.format === "docx" ? ", m formula" : "",
 					", Esc back"
 				]
@@ -3050,7 +3108,7 @@ function RunEditorScreen() {
 	});
 	if (doc === void 0) return /* @__PURE__ */ jsx(Text, {
 		color: "red",
-		children: "RunEditorScreen requires an open docx or odt document."
+		children: "RunEditorScreen requires an open docx, odt or markdown document."
 	});
 	const paragraph = liveParagraphAt(doc, screen.blockIndex);
 	if (paragraph === void 0) return /* @__PURE__ */ jsxs(Text, {
@@ -3209,7 +3267,7 @@ function TableViewScreen() {
 	});
 	if (doc === void 0) return /* @__PURE__ */ jsx(Text, {
 		color: "red",
-		children: "TableViewScreen requires an open docx or odt document."
+		children: "TableViewScreen requires an open docx, odt or markdown document."
 	});
 	if (table === void 0) return /* @__PURE__ */ jsxs(Text, {
 		color: "red",
@@ -3283,7 +3341,7 @@ function TableCellDetailScreen() {
 	});
 	if (doc === void 0) return /* @__PURE__ */ jsx(Text, {
 		color: "red",
-		children: "TableCellDetailScreen requires an open docx or odt document."
+		children: "TableCellDetailScreen requires an open docx, odt or markdown document."
 	});
 	if (cell === void 0) return /* @__PURE__ */ jsxs(Text, {
 		color: "red",
@@ -3430,123 +3488,67 @@ function DocxExtrasScreen() {
 	});
 }
 //#endregion
-//#region src/tui/screens/editors/markdown/shared.ts
-function requireMarkdownDocument(openDocument) {
-	if (openDocument?.format !== "markdown") throw new Error("A markdown editing screen rendered without an open markdown document; the app router only reaches this screen group from markdownLineList, which is only ever the root screen of an open markdown document.");
-	return openDocument;
-}
-//#endregion
-//#region src/tui/screens/editors/markdown/line-list.tsx
-function MarkdownLineListScreen() {
-	const state = useAppState();
-	const dispatch = useAppDispatch();
-	const doc = requireMarkdownDocument(state.openDocument);
-	const query = state.searchQuery.trim().toLowerCase();
-	const allLines = doc.source.split("\n").map((line, lineIndex) => ({
-		line,
-		lineIndex
-	}));
-	const lines = query === "" ? allLines : allLines.filter((entry) => entry.line.toLowerCase().includes(query));
-	const { selectedIndex } = useNavigationInput({
-		itemCount: lines.length,
-		onSelect: (index) => {
-			const entry = lines[index];
-			if (entry === void 0) return;
-			dispatch({
-				type: "PUSH_SCREEN",
-				screen: {
-					kind: "markdownLineEditor",
-					lineIndex: entry.lineIndex
-				}
-			});
-		},
-		onBack: () => {
-			dispatch({ type: "POP_SCREEN" });
-		},
-		isActive: !anyOverlayOpen(state)
-	});
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		children: [/* @__PURE__ */ jsxs(Text, {
-			bold: true,
-			children: [
-				"Lines (",
-				lines.length,
-				" of ",
-				allLines.length,
-				")"
-			]
-		}), /* @__PURE__ */ jsx(ListView, {
-			items: lines,
-			selectedIndex,
-			emptyMessage: query === "" ? "This document has no lines." : `No lines match "${state.searchQuery}".`,
-			renderItem: ({ line, lineIndex }, isSelected) => /* @__PURE__ */ jsxs(Text, {
-				color: isSelected ? "cyan" : void 0,
-				inverse: isSelected,
-				children: [
-					lineIndex + 1,
-					": ",
-					line === "" ? "(blank)" : line
-				]
-			})
-		})]
-	});
-}
-//#endregion
-//#region src/tui/screens/editors/markdown/line-editor.tsx
-function MarkdownLineEditorScreen() {
+//#region src/tui/screens/editors/markdown/view-source.tsx
+function MarkdownViewSourceScreen() {
 	const state = useAppState();
 	const dispatch = useAppDispatch();
 	const screen = currentScreen(state);
 	const doc = state.openDocument;
-	if (screen.kind !== "markdownLineEditor") return /* @__PURE__ */ jsx(Text, {
+	useInput((_input, key) => {
+		if (key.escape) dispatch({ type: "POP_SCREEN" });
+	}, { isActive: !anyOverlayOpen(state) && screen.kind === "viewSource" });
+	if (screen.kind !== "viewSource") return /* @__PURE__ */ jsx(Text, {
 		color: "red",
-		children: "MarkdownLineEditorScreen rendered outside a markdownLineEditor screen."
+		children: "MarkdownViewSourceScreen rendered outside a viewSource screen."
 	});
 	if (doc?.format !== "markdown") return /* @__PURE__ */ jsx(Text, {
 		color: "red",
-		children: "MarkdownLineEditorScreen requires an open markdown document."
-	});
-	const lines = doc.source.split("\n");
-	const line = lines[screen.lineIndex];
-	if (line === void 0) return /* @__PURE__ */ jsxs(Text, {
-		color: "red",
-		children: [
-			"There is no line at index ",
-			screen.lineIndex,
-			"."
-		]
+		children: "view-source requires an open markdown document."
 	});
+	const asItWillSaveNow = doc.editor.toMarkdownText();
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
-			/* @__PURE__ */ jsxs(Text, {
+			/* @__PURE__ */ jsx(Text, {
 				bold: true,
-				children: ["Edit line ", screen.lineIndex + 1]
+				children: "As opened"
 			}),
-			/* @__PURE__ */ jsx(RunTextEditor, {
-				initialText: line,
-				onCommit: (text) => {
-					const nextLines = [...lines];
-					nextLines[screen.lineIndex] = text;
-					dispatch({
-						type: "SET_MARKDOWN_SOURCE",
-						source: nextLines.join("\n")
-					});
-					dispatch({ type: "POP_SCREEN" });
-				},
-				onCancel: () => {
-					dispatch({ type: "POP_SCREEN" });
-				}
+			/* @__PURE__ */ jsx(Text, { children: doc.originalText ?? "(this document was created fresh, with no original text to compare against)" }),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "As it will save right now"
 			}),
+			/* @__PURE__ */ jsx(Text, { children: asItWillSaveNow }),
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: "Enter to commit, Esc to discard"
+				children: "Esc back"
 			})
 		]
 	});
 }
 //#endregion
+//#region src/tui/screens/editors/markdown/index.tsx
+function MarkdownBodyListScreen() {
+	const state = useAppState();
+	const dispatch = useAppDispatch();
+	const doc = state.openDocument;
+	if (doc?.format !== "markdown") return /* @__PURE__ */ jsxs(Text, {
+		color: "red",
+		children: [
+			"MarkdownBodyListScreen requires an open markdown document, found ",
+			doc === void 0 ? "no open document" : doc.format,
+			"."
+		]
+	});
+	const adapter = createParagraphFamilyAdapter({
+		formatLabel: "markdown",
+		paragraphs: () => doc.editor.paragraphs(),
+		tables: () => doc.editor.tables(),
+		dispatch
+	});
+	return /* @__PURE__ */ jsx(ParagraphFamilyBodyList, { adapter });
+}
+//#endregion
 //#region src/tui/screens/editors/odb/shared.ts
 function requireOdbDocument(openDocument) {
 	if (openDocument?.format !== "odb") throw new Error("An .odb browsing screen rendered without an open .odb document; the app router only reaches this screen group from odbTableList, which is only ever the root screen of an open .odb document.");
@@ -3806,40 +3808,13 @@ const REPORT_RENDER_TARGET_FORMATS = {
 function isReportRenderTargetFormat(format) {
 	return format !== void 0 && format in REPORT_RENDER_TARGET_FORMATS;
 }
-function renderReportBytes(content, format, fonts, options) {
-	if (format === "docx") return encodePackage(buildDocxPackage(content));
-	if (format === "odt") return encodePackage$1(buildOdtPackage(content));
-	if (content.kind !== "wordprocessing") throw new Error("readOdbReportContent returned a non-wordprocessing ContentDocument");
-	const registry = createFontRegistry({
-		fonts,
-		onSubstitution: (substitution) => {
-			const requested = `${substitution.requestedFamily}${substitution.requestedBold ? " bold" : ""}${substitution.requestedItalic ? " italic" : ""}`;
-			options.onDiagnostic({
-				severity: "info",
-				message: `No "${requested}" face available; drew it in "${substitution.resolvedFamily}"`
-			});
-		}
-	});
-	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(registry) });
-	return writePdf(layout, {
-		signal: options.signal,
-		onSubstitution: (substitution, context) => {
-			options.onDiagnostic({
-				severity: "info",
-				message: `Substituted "${substitution.to}" for "${substitution.from}"`,
-				pageIndex: context.pageIndex
-			});
-		},
-		formulas,
-		fonts: registry
-	});
-}
 async function renderOdbReportTo(doc, destinationPath, options) {
 	const format = detectFormat(destinationPath);
 	if (!isReportRenderTargetFormat(format)) throw new Error(`Cannot tell whether to render "${options.reportName}" as docx, odt, or pdf from '${destinationPath}' -- give the destination one of those three extensions`);
 	const fonts = await loadProvidedFonts(options.fontFiles ?? [], { signal: options.signal });
 	const pkg = decodePackage$1(new Uint8Array(await readFile(doc.path)));
-	const bytes = renderReportBytes(readOdbReportContent(pkg, { report: options.reportName }), format, fonts, options);
+	const content = readOdbReportContent(pkg, { report: options.reportName });
+	const bytes = format === "docx" ? odbReportToDocx(content) : format === "odt" ? odbReportToOdt(content) : odbReportToPdf(content, toPdfOptions(options, fonts));
 	await writeFile(destinationPath, bytes);
 }
 //#endregion
@@ -8545,7 +8520,12 @@ function FilePickerScreen() {
 	function openAtPath(path) {
 		(async () => {
 			try {
-				const doc = await openDocumentAtPath(path);
+				const doc = await openDocumentAtPath(path, { onDiagnostic: (diagnostic) => {
+					dispatch({
+						type: "APPEND_DIAGNOSTIC",
+						diagnostic
+					});
+				} });
 				dispatch({
 					type: "OPEN_FILE_SUCCESS",
 					path,
@@ -8896,7 +8876,7 @@ function metadataFor(doc) {
 		case "odp": return readOdpContent(doc.editor.toPackage()).metadata;
 		case "ods": return readOdsContent(doc.editor.toPackage()).metadata;
 		case "odg": return readOdgContent(doc.editor.toPackage()).metadata;
-		case "markdown": return readMarkdownContent(doc.source).metadata;
+		case "markdown": return readMarkdownContent(doc.editor.toMarkdownText()).metadata;
 		case "pdf":
 		case "xlsx": return doc.layout.metadata;
 		case "odb": throw new Error("A .odb database has no document-level metadata -- it is a table/form/report container, not a single document with its own title/author/etc.");
@@ -8961,7 +8941,9 @@ function ScreenBody({ screen }) {
 		case "launcher": return /* @__PURE__ */ jsx(LauncherScreen, {});
 		case "filePicker": return /* @__PURE__ */ jsx(FilePickerScreen, {});
 		case "newDocumentPicker": return /* @__PURE__ */ jsx(NewDocumentPickerScreen, {});
-		case "bodyList": return format === "odt" ? /* @__PURE__ */ jsx(OdtBodyListScreen, {}) : /* @__PURE__ */ jsx(DocxBodyListScreen, {});
+		case "bodyList":
+			if (format === "odt") return /* @__PURE__ */ jsx(OdtBodyListScreen, {});
+			return format === "markdown" ? /* @__PURE__ */ jsx(MarkdownBodyListScreen, {}) : /* @__PURE__ */ jsx(DocxBodyListScreen, {});
 		case "docxExtras": return /* @__PURE__ */ jsx(DocxExtrasScreen, {});
 		case "paragraphDetail": return /* @__PURE__ */ jsx(ParagraphDetailScreen, {});
 		case "runEditor": return /* @__PURE__ */ jsx(RunEditorScreen, {});
@@ -8987,8 +8969,7 @@ function ScreenBody({ screen }) {
 		case "odbReportList": return /* @__PURE__ */ jsx(OdbReportListScreen, {});
 		case "odbReportDetail": return /* @__PURE__ */ jsx(OdbReportDetailScreen, {});
 		case "odbReportRender": return /* @__PURE__ */ jsx(OdbReportRenderScreen, {});
-		case "markdownLineList": return /* @__PURE__ */ jsx(MarkdownLineListScreen, {});
-		case "markdownLineEditor": return /* @__PURE__ */ jsx(MarkdownLineEditorScreen, {});
+		case "viewSource": return /* @__PURE__ */ jsx(MarkdownViewSourceScreen, {});
 		case "pdfPageList": return /* @__PURE__ */ jsx(PdfPageListScreen, {});
 		case "pdfPageItems": return /* @__PURE__ */ jsx(PdfPageItemsScreen, {});
 		case "pdfItemDetail": return /* @__PURE__ */ jsx(PdfItemDetailScreen, {});
@@ -9034,7 +9015,12 @@ function AppShell({ startPath }) {
 		let cancelled = false;
 		(async () => {
 			try {
-				const doc = await openDocumentAtPath(startPath);
+				const doc = await openDocumentAtPath(startPath, { onDiagnostic: (diagnostic) => {
+					dispatch({
+						type: "APPEND_DIAGNOSTIC",
+						diagnostic
+					});
+				} });
 				if (!cancelled) dispatch({
 					type: "OPEN_FILE_SUCCESS",
 					path: startPath,