@stll/folio-core 0.66.1 → 0.66.2

package/dist/i18n/messages/hi.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "DOCX सहेजा नहीं जा सका",
 	"editSessionTakenOver": "किसी अन्य टैब, विंडो या डिवाइस ने इस दस्तावेज़ को संपादन के लिए खोला, इसलिए यह सत्र बंद कर दिया गया। सहेजे नहीं गए स्थानीय परिवर्तन सुरक्षित हैं — जारी रखने के लिए दस्तावेज़ फिर से खोलें।",
 	"editor": {
+		"accessibleName": "दस्तावेज़ संपादक",
 		"editing": "संपादन",
 		"editingDescription": "दस्तावेज़ को सीधे संपादित करें",
 		"outlineDepthAll": "सभी स्तर",

package/dist/i18n/messages/hu.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "A DOCX nem menthető",
 	"editSessionTakenOver": "Ezt a szerkesztési munkamenetet máshol vették át.",
 	"editor": {
+		"accessibleName": "Dokumentumszerkesztő",
 		"editing": "Szerkesztés",
 		"editingDescription": "A dokumentum közvetlen szerkesztése",
 		"outlineDepthAll": "Minden szint",

package/dist/i18n/messages/lt.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "Nepavyko išsaugoti DOCX",
 	"editSessionTakenOver": "Ši redagavimo sesija buvo perimta kitur.",
 	"editor": {
+		"accessibleName": "Dokumentų redaktorius",
 		"editing": "Redagavimas",
 		"editingDescription": "Redaguokite dokumentą tiesiogiai",
 		"outlineDepthAll": "Visi lygiai",

package/dist/i18n/messages/lv.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "Neizdevās saglabāt DOCX",
 	"editSessionTakenOver": "Šo rediģēšanas sesiju pārņēma citur.",
 	"editor": {
+		"accessibleName": "Dokumentu redaktors",
 		"editing": "Rediģēšana",
 		"editingDescription": "Rediģējiet dokumentu tieši",
 		"outlineDepthAll": "Visi līmeņi",

package/dist/i18n/messages/messages.gen.d.ts

@@ -335,6 +335,7 @@ type Messages = {
     "editSaveFailedTitle": "Could not save DOCX";
     "editSessionTakenOver": "Another tab, window, or device opened this document for editing, so this session was released. Unsaved local changes are preserved — reopen the doc to continue.";
     "editor": {
+      "accessibleName": "Document editor";
       "editing": "Editing";
       "editingDescription": "Edit the document directly";
       "outlineDepthAll": "All levels";

package/dist/i18n/messages/pl.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "Nie udało się zapisać pliku DOCX",
 	"editSessionTakenOver": "Ta sesja edycji została przejęta gdzie indziej.",
 	"editor": {
+		"accessibleName": "Edytor dokumentów",
 		"editing": "Edytowanie",
 		"editingDescription": "Edytuj dokument bezpośrednio",
 		"outlineDepthAll": "Wszystkie poziomy",

package/dist/i18n/messages/pt-BR.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "Não foi possível salvar DOCX",
 	"editSessionTakenOver": "Esta sessão de edição foi assumida em outro lugar.",
 	"editor": {
+		"accessibleName": "Editor de documentos",
 		"editing": "Editando",
 		"editingDescription": "Edite o documento diretamente",
 		"outlineDepthAll": "Todos os níveis",

package/dist/i18n/messages/sk.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "DOCX sa nepodarilo uložiť",
 	"editSessionTakenOver": "Túto reláciu úprav prevzalo iné okno.",
 	"editor": {
+		"accessibleName": "Editor dokumentov",
 		"editing": "Úpravy",
 		"editingDescription": "Upravujte dokument priamo",
 		"outlineDepthAll": "Všetky úrovne",

package/dist/i18n/messages/tr.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "DOCX kaydedilemedi",
 	"editSessionTakenOver": "Başka bir sekme, pencere veya cihaz bu belgeyi düzenlemek için açtığından bu oturum sonlandırıldı. Kaydedilmemiş yerel değişiklikler korunur; devam etmek için belgeyi yeniden açın.",
 	"editor": {
+		"accessibleName": "Belge düzenleyici",
 		"editing": "Düzenleme",
 		"editingDescription": "Belgeyi doğrudan düzenleyin",
 		"outlineDepthAll": "Tüm düzeyler",

package/dist/i18n/messages/zh-CN.gen.js

@@ -335,6 +335,7 @@ const messages = { "folio": {
 	"editSaveFailedTitle": "无法保存 DOCX",
 	"editSessionTakenOver": "另一个标签页、窗口或设备已打开此文档进行编辑，因此本会话已释放。未保存的本地更改会保留，请重新打开文档以继续。",
 	"editor": {
+		"accessibleName": "文档编辑器",
 		"editing": "编辑",
 		"editingDescription": "直接编辑文档",
 		"outlineDepthAll": "所有级别",

package/dist/internal/wholeStoryRevisionResolution.d.ts

@@ -11,7 +11,7 @@ type ResolveWholeStoryOptions = {
   styleResolver: RunStyleResolver | null;
   numbering: NumberingMap | null;
 };
-export declare const resolveWholeStory: ({ doc, mode, styleResolver, numbering }: ResolveWholeStoryOptions) => {
+export declare const resolveWholeStory: ({ doc: storyDoc, mode, styleResolver, numbering }: ResolveWholeStoryOptions) => {
   resolved: Node;
   mapping: Mapping;
   positionMap: StepMap;

package/dist/internal/wholeStoryRevisionResolution.js

@@ -13,7 +13,8 @@ import { createResolvedCommentPointCollector } from "../prosemirror/replacedAnno
 import { expandRunFormattingCarrier } from "../prosemirror/runFormattingInlineCarriers.js";
 import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
 import { paragraphRunStyleContext } from "../prosemirror/runStyleFormatting.js";
-import { runParagraphsIntoTables, runsIntoFollowingTable } from "../prosemirror/tableRunIn.js";
+import { sectionRecordCopyPositions } from "../prosemirror/sectionCarrier.js";
+import { paragraphBeforeRemovedBlock, runParagraphsIntoTables, runsIntoFollowingTable } from "../prosemirror/tableRunIn.js";
 import { paragraphContentOf } from "../prosemirror/zeroWidthAnchors.js";
 import { recordNodeResolution } from "./revisionResolutionEdits.js";
 import { resolveInlineRevisions } from "./revisionResolutionInline.js";
@@ -36,12 +37,13 @@ const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changed
 	const walk = ({ node, position, eligibleComments = true, previous }) => {
 		const childComments = eligibleComments && collector.visit(node, position, previous);
 		if (node.isText) return node;
-		if (!runsIntoTable && !node.isTextblock) {
-			for (let index = 0; index + 1 < node.childCount; index++) if (runsIntoFollowingTable({
+		if (!runsIntoTable && !node.isTextblock) for (let index = 0; index + 1 < node.childCount; index++) {
+			const options = {
 				parent: node,
 				index,
 				mode
-			})) {
+			};
+			if (runsIntoFollowingTable(options) || paragraphBeforeRemovedBlock(options)) {
 				runsIntoTable = true;
 				break;
 			}
@@ -400,7 +402,7 @@ const resolveStructure = ({ node, position, context }) => {
 				markWasAdded,
 				containerStillEndsWithParagraph: true,
 				followingTableCanReceiveRunIn: false,
-				removedSectionProperties: markWasAdded && properties !== void 0,
+				removedSectionProperties: markWasAdded && ownsSection(paragraph),
 				precedingSectionOwner: precedingSectionOwner(preceding, properties),
 				followingHasSectionProperties: ownsSection(chain.node)
 			});
@@ -612,17 +614,26 @@ const resolveStructure = ({ node, position, context }) => {
 	});
 	return final;
 };
-const resolveWholeStory = ({ doc, mode, styleResolver, numbering }) => {
+const resolveWholeStory = ({ doc: storyDoc, mode, styleResolver, numbering }) => {
+	const withoutCopies = new Transform(storyDoc);
+	for (const position of sectionRecordCopyPositions(storyDoc)) withoutCopies.setNodeAttribute(position, "_sectionProperties", null);
+	const doc = withoutCopies.doc;
 	const { runsIntoTable, ...direct } = resolveStoryRevisions({
 		doc,
 		mode,
 		styleResolver,
 		numbering
 	});
-	if (!runsIntoTable) return direct;
+	if (!runsIntoTable) return {
+		...direct,
+		steps: [...withoutCopies.steps, ...direct.steps]
+	};
 	const runIn = new Transform(doc);
 	const { targets, maps, transfers } = runParagraphsIntoTables(runIn, mode, styleResolver);
-	if (!runIn.docChanged) return direct;
+	if (!runIn.docChanged) return {
+		...direct,
+		steps: [...withoutCopies.steps, ...direct.steps]
+	};
 	const { runsIntoTable: _rerun, ...result } = resolveStoryRevisions({
 		doc: runIn.doc,
 		mode,
@@ -642,7 +653,11 @@ const resolveWholeStory = ({ doc, mode, styleResolver, numbering }) => {
 	const positionMap = composeRevisionResolutionMaps(runInMap, result.positionMap);
 	return {
 		...result,
-		steps: [...runIn.steps, ...result.steps],
+		steps: [
+			...withoutCopies.steps,
+			...runIn.steps,
+			...result.steps
+		],
 		positionMap,
 		mapping: new Mapping([positionMap]),
 		transfers: [...transfers, ...result.transfers]

package/dist/layout-bridge/convert/runMarkFormatting.js

@@ -56,6 +56,7 @@ const MARK_PAINT_DISPOSITIONS = {
 	deletion: "runFormatting",
 	inlineWrapper: "runFormatting",
 	characterStyle: "resolvedElsewhere",
+	hyphenElement: "notPainted",
 	runIdentity: "notPainted",
 	runPropertyChange: "notPainted"
 };

package/dist/markdown/renderRuns.js

@@ -148,17 +148,38 @@ function wrapFlanking(inner, mark, { before, after }) {
 	}
 	return units.slice(0, start).join("") + applyMarks(units.slice(start, end).join(""), start < end ? [mark] : []) + units.slice(end).join("");
 }
-/** Paragraph content that writes nothing to the line. */
-const SILENT_MARKERS = /* @__PURE__ */ new Set([
-	"bookmarkStart",
-	"bookmarkEnd",
-	"moveFromRangeStart",
-	"moveFromRangeEnd",
-	"moveToRangeStart",
-	"moveToRangeEnd"
-]);
-/** Comment range markers, which write nothing when comments are stripped. */
-const COMMENT_MARKERS = /* @__PURE__ */ new Set(["commentRangeStart", "commentRangeEnd"]);
+/**
+* Whether paragraph content puts nothing on the line in this render. Left out
+* of the content before runs group, so the runs on either side of it meet as
+* they do on the line: emphasis closed and reopened around nothing reads as
+* literal asterisks. Exhaustive, so new content decides here.
+*/
+const writesNothing = (ctx, item) => {
+	switch (item.type) {
+		case "bookmarkStart":
+		case "bookmarkEnd":
+		case "moveFromRangeStart":
+		case "moveFromRangeEnd":
+		case "moveToRangeStart":
+		case "moveToRangeEnd":
+		case "preservedInline": return true;
+		case "commentRangeStart":
+		case "commentRangeEnd":
+		case "commentReference": return ctx.opts.comments === "strip";
+		case "mathEquation": return !item.plainText;
+		case "inlineSdt":
+		case "inlineWrapper": return item.content.every((child) => writesNothing(ctx, child));
+		case "run":
+		case "hyperlink":
+		case "simpleField":
+		case "complexField":
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo": return false;
+		default: return item;
+	}
+};
 /** The first character `piece` puts on the line, inside the marks `outer` already opened. */
 const pieceStart = (piece, outer, order) => {
 	const first = piece.text.match(INLINE_UNIT)?.[0];
@@ -449,6 +470,40 @@ const cleanRevisionContent = (content) => content.flatMap((item) => {
 		default: return [item];
 	}
 });
+const COMMENT_MARKER_TYPES = /* @__PURE__ */ new Set([
+	"commentRangeStart",
+	"commentRangeEnd",
+	"commentReference"
+]);
+/**
+* A comment marker bounds its comment wherever it stands; a save may write it
+* inside the revision wrapper of the text it starts at, or beside it. Revision
+* wrappers are split around their comment markers, so either reads the same.
+*/
+const commentMarkersOutsideRevisions = (content) => content.flatMap((item) => {
+	switch (item.type) {
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo": break;
+		default: return [item];
+	}
+	const parts = [];
+	let held = [];
+	const flush = () => {
+		if (held.length > 0) parts.push({
+			...item,
+			content: held
+		});
+		held = [];
+	};
+	for (const child of commentMarkersOutsideRevisions(item.content)) if (COMMENT_MARKER_TYPES.has(child.type)) {
+		flush();
+		parts.push(child);
+	} else held.push(child);
+	flush();
+	return parts;
+});
 /**
 * Render the full inline content of a paragraph, tracking comment-range
 * boundaries to apply the configured wrapper.
@@ -459,7 +514,8 @@ function renderParagraphInline(ctx, pkg, content, paraId, edges = {
 }) {
 	let out = "";
 	const openComments = [];
-	const items = (ctx.opts.trackedChanges === "clean" ? cleanRevisionContent(content) : content).filter((item) => !SILENT_MARKERS.has(item.type) && !(ctx.opts.comments === "strip" && COMMENT_MARKERS.has(item.type)));
+	const hoistedContent = commentMarkersOutsideRevisions(content);
+	const items = (ctx.opts.trackedChanges === "clean" ? cleanRevisionContent(hoistedContent) : hoistedContent).filter((item) => !writesNothing(ctx, item));
 	const around = (index) => {
 		const next = items[index + 1];
 		return {

package/dist/prosemirror/commands/comments.js

@@ -29,6 +29,7 @@ import { getFolioNodeRevisionCarriers, nodePropertyRevisionSites } from "../revi
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting } from "../runPropertyChangeResolution.js";
 import { paragraphRunStyleContextAt } from "../runStyleFormatting.js";
+import { sectionRecordCopyPositions } from "../sectionCarrier.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 import { isTableCellRetainedInReviewView } from "../tableCellRevisionVisibility.js";
 import { markRowEmptiedInBatch, reconcileTableGridAfterColumnRemoval, removeRowsWithoutCellsAfterBatch, removeTableRow } from "../tableGridMutation.js";
@@ -391,6 +392,7 @@ function resolveChange(from, to, mode, revisionIds) {
 				if (node.type.spec["tableRole"] === "table" && runInCellPending(node)) pendingTables.push(position);
 				return !node.isTextblock;
 			});
+			if (pPrMarkOps.some(({ action }) => action !== "clear")) for (const position of sectionRecordCopyPositions(tr.doc)) tr.setNodeAttribute(position, "_sectionProperties", null);
 			const joinSeams = [];
 			for (const op of pPrMarkOps) {
 				const mappedPos = tr.mapping.map(op.paragraphPos);

package/dist/prosemirror/commands/resolveParagraphProperties.js

@@ -3,7 +3,8 @@ import { expectParagraphAttrs } from "../attrs/index.js";
 import { rejectedListRenderingPatch } from "../listRendering.js";
 import { effectiveParagraphNumbering, paragraphNumberingAttr, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
-import { resolveParagraphDefaultTextFormatting } from "../styles/paragraphStyleCascade.js";
+import { resolveParagraphInheritedRunFormatting } from "../runStyleFormatting.js";
+import { inheritableParagraphMarkFormatting, resolveParagraphDefaultTextFormatting } from "../styles/paragraphStyleCascade.js";
 import { listIndentationProvenancePatch } from "../styles/resolvedStyleAttrs.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties } from "./propertyChangeScope.js";
 // src/prosemirror/commands/resolveParagraphProperties.ts
@@ -70,7 +71,19 @@ const resolveParagraphChangeAttrs = ({ node, boundaryCovered, mode, revisionSet,
 				});
 				Object.assign(nextAttrs, indentation);
 				nextAttrs["_originalFormatting"] = restoredFormatting;
-				if (styleResolver) nextAttrs["defaultTextFormatting"] = resolveParagraphDefaultTextFormatting(rejection.previousFormatting?.styleId, restoredFormatting ?? void 0, styleResolver) ?? null;
+				if (styleResolver) {
+					const styleId = rejection.previousFormatting?.styleId;
+					nextAttrs["defaultTextFormatting"] = (node.content.size === 0 ? resolveParagraphDefaultTextFormatting(styleId, restoredFormatting ?? void 0, styleResolver) : resolveParagraphInheritedRunFormatting({
+						styleId,
+						tableRunFormatting: expectParagraphAttrs(node)._tableRunFormatting,
+						styleResolver,
+						paragraphMarkFormatting: inheritableParagraphMarkFormatting({
+							runProperties: restoredFormatting?.runProperties,
+							styleId,
+							styleResolver
+						})
+					}).inheritedFormatting) ?? null;
+				}
 			}
 		}
 	}

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -59,6 +59,7 @@ import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { textBoxHostParagraph } from "../textBoxHostParagraph.js";
 import { enclosingInsertionAncestors, inlineWrapperStackOf, trackedRevisionLayerOf } from "../trackedRevisionPath.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
+import { hyphenElementRunContent } from "./hyphenTextCarriers.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
 import { TaggedError, panic } from "better-result";
@@ -1659,13 +1660,13 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 		}));
 		const ownerId = runIdentityId(node);
 		const currentOwnerId = currentRun ? sourceRunOwners.get(currentRun) : void 0;
-		const currentRunIsPlainText = currentRun?.content.every((runContent) => runContent.type === "text");
+		const currentRunIsPlainText = currentRun?.content.every(isTextLeafContent);
 		const joinsOwnedSourceRun = ownerId !== void 0 && ownerId === currentOwnerId && currentRun !== null && runsShareProperties(currentRun, run);
 		const joinsOrdinaryText = coalescePlainText && currentRun !== null && runsShareProperties(currentRun, run) && currentRunIsPlainText === true && currentMarksKey === marksKey;
 		if (currentRun && (joinsOwnedSourceRun || joinsOrdinaryText)) {
-			if (joinsOrdinaryText) {
-				for (const runContent of run.content) if (runContent.type === "text") appendTextToRun(currentRun, runContent.text);
-			} else currentRun.content.push(...run.content);
+			if (joinsOrdinaryText) for (const runContent of run.content) if (runContent.type === "text") appendTextToRun(currentRun, runContent.text);
+			else currentRun.content.push(runContent);
+			else currentRun.content.push(...run.content);
 			return;
 		}
 		if (currentRun) content.push(currentRun);
@@ -2266,10 +2267,7 @@ function createTrackedChangeRun({ baseParagraphFormatting, inheritedFormatting,
 		const formatting = marksToTextFormatting(marks, formattingContext);
 		run = {
 			type: "run",
-			content: node.text ? [{
-				type: "text",
-				text: node.text
-			}] : [],
+			content: node.text ? textLeafRunContent(node.text, marks) : [],
 			...Object.keys(formatting).length > 0 ? { formatting } : {}
 		};
 		restoreRunRecord(run, marks);
@@ -2355,7 +2353,7 @@ function getLinkKey(mark) {
 * Create a unique key for a set of marks (excluding hyperlink)
 */
 function getMarksKey(marks) {
-	const nonLinkMarks = marks.filter((m) => m.type.name !== "hyperlink");
+	const nonLinkMarks = marks.filter((m) => m.type.name !== "hyperlink" && m.type.name !== "hyphenElement");
 	if (nonLinkMarks.length === 0) return "";
 	return nonLinkMarks.map((m) => `${m.type.name}:${JSON.stringify(m.attrs)}`).toSorted().join("|");
 }
@@ -2526,6 +2524,23 @@ function createNoteReferenceRun(noteRefMark, marks, formattingContext) {
 	restoreRunRecord(run, marks);
 	return run;
 }
+/**
+* The run content one ProseMirror text leaf writes.
+*
+* Text by default; a leaf carrying the hyphen-element mark writes its
+* carriers back as the elements they were read from.
+*/
+function textLeafRunContent(text, marks) {
+	if (marks.some(({ type }) => type.name === "hyphenElement")) return hyphenElementRunContent(text);
+	return [{
+		type: "text",
+		text
+	}];
+}
+/** Content an ordinary text run may hold and still join the next text leaf. */
+function isTextLeafContent(content) {
+	return content.type === "text" || content.type === "softHyphen" || content.type === "noBreakHyphen";
+}
 function createRunFromText({ baseParagraphFormatting, inheritedFormatting, marks, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver, text }) {
 	const formatting = getRunFormattingFromMarks(marks, {
 		baseParagraphFormatting,
@@ -2536,10 +2551,7 @@ function createRunFromText({ baseParagraphFormatting, inheritedFormatting, marks
 	});
 	const run = {
 		type: "run",
-		content: [{
-			type: "text",
-			text
-		}]
+		content: textLeafRunContent(text, marks)
 	};
 	if (formatting) run.formatting = formatting;
 	restoreRunRecord(run, marks);
@@ -2876,11 +2888,37 @@ const reconcileEmptyFieldResultRuns = (runs, displayRun) => {
 	}
 	return reconciled;
 };
-const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
-	const currentText = getFindParagraphText({
+/**
+* A result without its hyphen elements, and without a run that held nothing
+* else. They are part of the text a new display text replaces.
+*/
+const withoutHyphenElements = (items) => items.filter((item) => {
+	switch (item.type) {
+		case "run": {
+			const kept = item.content.filter(({ type }) => type !== "softHyphen" && type !== "noBreakHyphen");
+			if (kept.length === item.content.length) return true;
+			item.content = kept;
+			return kept.length > 0;
+		}
+		case "hyperlink":
+			item.children = withoutHyphenElements(item.children);
+			return true;
+		case "inlineWrapper":
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo":
+			item.content = withoutHyphenElements(item.content);
+			return true;
+		default: return true;
+	}
+});
+const synchronizeFieldDisplayText = (fieldContent, displayText, fallbackRun) => {
+	if (getFindParagraphText({
 		type: "paragraph",
-		content
-	});
+		content: fieldContent
+	}) === displayText) return fieldContent;
+	const content = withoutHyphenElements(fieldContent);
 	const visitRunsIn = (items, visit) => {
 		for (const child of items) {
 			if (child.type === "run") {
@@ -2893,7 +2931,6 @@ const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
 	const visitRuns = (visit) => {
 		visitRunsIn(content, visit);
 	};
-	if (currentText === displayText) return content;
 	let replacedText = false;
 	visitRuns((run) => {
 		for (const runContent of run.content) {

package/dist/prosemirror/conversion/hyphenTextCarriers.d.ts

@@ -1,5 +1,27 @@
+import { document_d_exports } from "../../types/document.js";
 /** These source units render as native text while keeping one logical atom each. */
 export declare const HYPHEN_TEXT_CARRIERS: {
   readonly softHyphen: "­";
   readonly noBreakHyphen: "‑";
-};
+};
+/**
+ * The mark that tells a carrier written for `w:softHyphen` or
+ * `w:noBreakHyphen` apart from the same character authored inside `w:t`.
+ *
+ * Both render identically, so the text alone cannot say which one the source
+ * held; the save leg reads this mark to write each back as it was read.
+ */
+export declare const HYPHEN_ELEMENT_MARK_NAME = "hyphenElement";
+type HyphenElementRunContent = document_d_exports.TextContent | document_d_exports.SoftHyphenContent | document_d_exports.NoBreakHyphenContent;
+/**
+ * The run content a leaf carrying {@link HYPHEN_ELEMENT_MARK_NAME} writes back.
+ *
+ * Each carrier becomes its element again and any other character stays text.
+ * Typing does not normally reach a marked leaf: the mark is not inclusive and
+ * neighbouring carriers hold different ids. Ids only repeat when a copy is pasted
+ * beside its source or two paragraphs join; a character typed exactly between
+ * two such carriers takes the mark, so a letter stays text here and a typed
+ * U+00AD or U+2011 saves as the element.
+ */
+export declare const hyphenElementRunContent: (text: string) => HyphenElementRunContent[];
+export {};

package/dist/prosemirror/conversion/hyphenTextCarriers.js

@@ -4,4 +4,49 @@ const HYPHEN_TEXT_CARRIERS = {
 	softHyphen: "­",
 	noBreakHyphen: "‑"
 };
-export { HYPHEN_TEXT_CARRIERS };
+/**
+* The mark that tells a carrier written for `w:softHyphen` or
+* `w:noBreakHyphen` apart from the same character authored inside `w:t`.
+*
+* Both render identically, so the text alone cannot say which one the source
+* held; the save leg reads this mark to write each back as it was read.
+*/
+const HYPHEN_ELEMENT_MARK_NAME = "hyphenElement";
+const isHyphenElementType = (key) => Object.hasOwn(HYPHEN_TEXT_CARRIERS, key);
+/** The inverse of {@link HYPHEN_TEXT_CARRIERS}, derived so the two cannot drift. */
+const HYPHEN_ELEMENT_BY_CARRIER = new Map(Object.keys(HYPHEN_TEXT_CARRIERS).filter(isHyphenElementType).map((type) => [HYPHEN_TEXT_CARRIERS[type], type]));
+/**
+* The run content a leaf carrying {@link HYPHEN_ELEMENT_MARK_NAME} writes back.
+*
+* Each carrier becomes its element again and any other character stays text.
+* Typing does not normally reach a marked leaf: the mark is not inclusive and
+* neighbouring carriers hold different ids. Ids only repeat when a copy is pasted
+* beside its source or two paragraphs join; a character typed exactly between
+* two such carriers takes the mark, so a letter stays text here and a typed
+* U+00AD or U+2011 saves as the element.
+*/
+const hyphenElementRunContent = (text) => {
+	const content = [];
+	let pending = "";
+	for (const char of text) {
+		const type = HYPHEN_ELEMENT_BY_CARRIER.get(char);
+		if (type === void 0) {
+			pending += char;
+			continue;
+		}
+		if (pending.length > 0) {
+			content.push({
+				type: "text",
+				text: pending
+			});
+			pending = "";
+		}
+		content.push({ type });
+	}
+	if (pending.length > 0) content.push({
+		type: "text",
+		text: pending
+	});
+	return content;
+};
+export { HYPHEN_ELEMENT_MARK_NAME, HYPHEN_TEXT_CARRIERS, hyphenElementRunContent };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -50,17 +50,17 @@ import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { isRunContentProjectionNode } from "../runContentProjection.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
 import { continueSourceCarrierIdentitiesAcrossInsertedParagraphMarks, continueSourceCarrierIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
-import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
+import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphInheritedRunFormatting, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
-import { extractTableParagraphOverlay, paragraphStyleCascadeAttrs, resolveRunFormattingWithoutDefaults } from "../styles/paragraphStyleCascade.js";
+import { extractTableParagraphOverlay, inheritableParagraphMarkFormatting, paragraphStyleCascadeAttrs, resolveRunFormattingWithoutDefaults } from "../styles/paragraphStyleCascade.js";
 import { listIndentationProvenancePatch } from "../styles/resolvedStyleAttrs.js";
 import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { tableCellStyleRegions, tableRowBand } from "../styles/tableStyleRegions.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
-import { HYPHEN_TEXT_CARRIERS } from "./hyphenTextCarriers.js";
+import { HYPHEN_ELEMENT_MARK_NAME, HYPHEN_TEXT_CARRIERS } from "./hyphenTextCarriers.js";
 import { createMarkInterner } from "./markInterner.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
@@ -425,8 +425,10 @@ const resolveListRendering = (numPr, context) => {
 function convertParagraph(paragraph, styleResolver, context, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const { nextHyperlinkInstanceIndex, pairedBookmarkIds, pageBreakRunSourceDescendants, storyRangedCommentIds, openCommentIds } = context;
 	let runIdentityId = 0;
+	let hyphenElementId = 0;
 	const runScope = {
 		nextRunIdentityId: () => runIdentityId++,
+		nextHyphenElementId: () => hyphenElementId++,
 		nextNoteReferenceOccurrenceId: context.nextNoteReferenceOccurrenceId,
 		createMark: context.createMark
 	};
@@ -500,9 +502,11 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 		if (!node) return;
 		emitInlineNodes([node]);
 	};
-	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
-	let inheritableParagraphRunFormatting;
-	if (paragraphRunFormatting && !isTocParagraph && paragraph.formatting?.styleId === void 0) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
+	const inheritableParagraphRunFormatting = isTocParagraph ? void 0 : inheritableParagraphMarkFormatting({
+		runProperties: paragraph.formatting?.runProperties,
+		styleId: paragraph.formatting?.styleId,
+		styleResolver
+	});
 	const { baseFormatting: baseRunFormatting, baseToggleCascade: orderedToggleFormatting, defaultFormatting: ordinaryBaseWithDefaultCharacter, defaultToggleCascade: defaultCharacterStyleCascade, inheritedFormatting: defaultRunFormatting, inheritedToggleCascade: defaultToggleCascade } = resolveParagraphInheritedRunFormatting({
 		styleId: paragraph.formatting?.styleId,
 		tableRunFormatting: extraRunFormatting,
@@ -1739,6 +1743,7 @@ function convertRun(run, resolvedStyleFormatting, runScope, styleResolver, textB
 			formatting: mergedFormatting,
 			textBoxAnchors,
 			authoredFormatting: run.formatting,
+			nextHyphenElementId: runScope.nextHyphenElementId,
 			nextNoteReferenceOccurrenceId: runScope.nextNoteReferenceOccurrenceId
 		});
 		for (const node of contentNodes) if (!isRunContentProjectionNode(content.type, node.type.name)) panic(`Run content ${content.type} projected unsupported inline node ${node.type.name}`);
@@ -2147,7 +2152,7 @@ const noteReferenceVertAlign = (vertAlign) => {
 * run was authored with.
 */
 const carriedRunFormatting = (formatting) => formatting && Object.keys(formatting).length > 0 ? formatting : void 0;
-function convertRunContent({ content, marks, formatting, textBoxAnchors, authoredFormatting, nextNoteReferenceOccurrenceId }) {
+function convertRunContent({ content, marks, formatting, textBoxAnchors, authoredFormatting, nextHyphenElementId, nextNoteReferenceOccurrenceId }) {
 	switch (content.type) {
 		case "noteMarker": return [schema.node("noteMarker", { kind: content.kind }).mark(marks)];
 		case "text":
@@ -2214,8 +2219,8 @@ function convertRunContent({ content, marks, formatting, textBoxAnchors, authore
 			text: content.text,
 			level: PRESERVED_XML_LEVELS.run
 		}).mark(marks)];
-		case "noBreakHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS.noBreakHyphen, marks)];
-		case "softHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS.softHyphen, marks)];
+		case "noBreakHyphen":
+		case "softHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS[content.type], [...marks, schema.mark(HYPHEN_ELEMENT_MARK_NAME, { id: nextHyphenElementId() })])];
 		case "symbol": return [schema.node("symbol", {
 			font: content.font,
 			char: content.char
@@ -2459,6 +2464,7 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 					formatting: mergedFormatting,
 					textBoxAnchors,
 					authoredFormatting: child.formatting,
+					nextHyphenElementId: runScope.nextHyphenElementId,
 					nextNoteReferenceOccurrenceId: runScope.nextNoteReferenceOccurrenceId
 				}));
 				break;

package/dist/prosemirror/extensions/StarterKit.js

@@ -69,7 +69,7 @@ function createStarterKit(options = {}) {
 		...options.historyNewGroupDelay !== void 0 ? { newGroupDelay: options.historyNewGroupDelay } : {},
 		...options.historyShortcuts !== void 0 ? { shortcuts: options.historyShortcuts } : {}
 	}));
-	for (const name of MARK_NESTING_ORDER) add(name, MARK_EXTENSIONS[name]());
+	for (const name of MARK_NESTING_ORDER) add(name, MARK_EXTENSIONS[name]({ getInternalClipboardToken }));
 	add("bookmarkBoundary", BookmarkBoundaryExtension({ getInternalClipboardToken }));
 	add("blockBookmarkBoundary", BlockBookmarkBoundaryExtension({ getInternalClipboardToken }));
 	add("blockMoveRangeBoundary", BlockMoveRangeBoundaryExtension({ getInternalClipboardToken }));