@stll/folio-core 0.66.0 → 0.66.2

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 }));

package/dist/prosemirror/extensions/features/pasteCleanup.js

@@ -124,6 +124,7 @@ const EMPTY_SPAN = new RegExp(`<span(?:\\s${TAG_TAIL})?><\\/span>`, "gi");
 const MAX_EMPTY_SPAN_PASSES = 5;
 const INTERNAL_CLIPBOARD_ATTR_PATTERN = /\s+data-docx-internal-clipboard(?:="([^"]*)"|='([^']*)'|=([^\s>]+))?/gi;
 const TEXTBOX_ANCHOR_ATTR = /\s+data-docx-textbox-anchor(?:="[^"]*"|='[^']*')?/gi;
+const HYPHEN_ELEMENT_ATTR = /\s+data-docx-hyphen-element(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
 const BOOKMARK_BOUNDARY_ATTR = /\s+data-docx-bookmark-(?:boundary|id|name|col-first|col-last)(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
 const RANGE_ANCHOR_ATTR = /\s+data-docx-range-anchor(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
 const COMMENT_RANGE_BOUNDARY_ATTR = /\s+data-docx-comment-range-boundary(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
@@ -145,6 +146,10 @@ function stripForeignTextBoxAnchors(html, internal) {
 	if (internal) return html;
 	return html.replace(TEXTBOX_ANCHOR_ATTR, "");
 }
+function stripForeignHyphenElements(html, internal) {
+	if (internal) return html;
+	return html.replace(HYPHEN_ELEMENT_ATTR, "");
+}
 function stripForeignBookmarkBoundaries(html, internal) {
 	if (internal) return html;
 	return html.replace(BOOKMARK_BOUNDARY_ATTR, "");
@@ -187,6 +192,7 @@ function cleanPastedHtml(html, options = {}) {
 		cleaned = stripMsoStyles(cleaned);
 		cleaned = stripEmptySpans(cleaned, internal);
 		cleaned = stripForeignTextBoxAnchors(cleaned, internal);
+		cleaned = stripForeignHyphenElements(cleaned, internal);
 		cleaned = stripForeignBookmarkBoundaries(cleaned, internal);
 		cleaned = stripForeignRangeCarriers(cleaned, internal);
 		cleaned = stripForeignStructuredFields(cleaned, internal);

package/dist/prosemirror/extensions/features/pastedHtmlLists.js

@@ -1,4 +1,5 @@
 import { mintListInstance } from "../../../docx/listNumberingInstances.js";
+import { NO_NUMBERING_IDS_IN_USE } from "../../../docx/numberingIds.js";
 import { createNumberingMap } from "../../../docx/numberingParser.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { completeNumberingForDoc } from "../../listInstanceReferences.js";
@@ -93,7 +94,7 @@ const numberPastedHtmlLists = (slice, view) => {
 					const minted = mintListInstance(definitions, {
 						kind: hint.kind,
 						...hint.start === void 0 ? {} : { start: hint.start }
-					});
+					}, NO_NUMBERING_IDS_IN_USE);
 					definitions = minted.definitions;
 					numbering = createNumberingMap(definitions);
 					group = {

package/dist/prosemirror/extensions/markRegistry.d.ts

@@ -1,4 +1,5 @@
 import { MarkExtension } from "./types.js";
+import { HyphenElementExtension } from "./marks/HyphenElementExtension.js";
 export declare const MARK_EXTENSIONS: {
   readonly bold: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly italic: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
@@ -27,6 +28,7 @@ export declare const MARK_EXTENSIONS: {
   readonly textEffect: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly runFormattingOverride: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly characterStyle: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly hyphenElement: typeof HyphenElementExtension;
   readonly runIdentity: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly comment: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly insertion: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
@@ -56,4 +58,4 @@ export type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
  * own in OOXML, so the save leg ranks it against nothing and its place here is
  * a presentation decision.
  */
-export declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "comment", "inlineWrapper", "insertion", "deletion", "hyperlink", "runPropertyChange", "runIdentity"];
+export declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "hyphenElement", "comment", "inlineWrapper", "insertion", "deletion", "hyperlink", "runPropertyChange", "runIdentity"];

package/dist/prosemirror/extensions/markRegistry.js

@@ -9,6 +9,7 @@ import { FootnoteRefExtension } from "./marks/FootnoteRefExtension.js";
 import { HiddenTextExtension } from "./marks/HiddenTextExtension.js";
 import { HighlightExtension } from "./marks/HighlightExtension.js";
 import { HyperlinkExtension } from "./marks/HyperlinkExtension.js";
+import { HyphenElementExtension } from "./marks/HyphenElementExtension.js";
 import { InlineWrapperExtension } from "./marks/InlineWrapperExtension.js";
 import { ItalicExtension } from "./marks/ItalicExtension.js";
 import { LanguageExtension } from "./marks/LanguageExtension.js";
@@ -67,6 +68,7 @@ const MARK_EXTENSIONS = {
 	textEffect: TextEffectExtension,
 	runFormattingOverride: RunFormattingOverrideExtension,
 	characterStyle: CharacterStyleExtension,
+	hyphenElement: HyphenElementExtension,
 	runIdentity: RunIdentityExtension,
 	comment: CommentExtension,
 	insertion: InsertionExtension,
@@ -123,6 +125,7 @@ const MARK_NESTING_ORDER = markNestingOrder([
 	"textEffect",
 	"runFormattingOverride",
 	"characterStyle",
+	"hyphenElement",
 	"comment",
 	"inlineWrapper",
 	"insertion",

package/dist/prosemirror/extensions/marks/HyphenElementExtension.d.ts

@@ -0,0 +1,6 @@
+import { MarkExtension } from "../types.js";
+type HyphenElementOptions = {
+  getInternalClipboardToken?: () => string;
+};
+export declare const HyphenElementExtension: (options?: Partial<HyphenElementOptions> | undefined) => MarkExtension;
+export {};

package/dist/prosemirror/extensions/marks/HyphenElementExtension.js

@@ -0,0 +1,54 @@
+import { HYPHEN_ELEMENT_MARK_NAME } from "../../conversion/hyphenTextCarriers.js";
+import { expectHyphenElementMarkAttrs } from "../../hyphenElementAttrs.js";
+import { createMarkExtension } from "../create.js";
+// src/prosemirror/extensions/marks/HyphenElementExtension.ts
+/**
+* Marks the native text that stands for a `w:softHyphen` or `w:noBreakHyphen`
+* run child (ECMA-376 Part 1, 17.3.3.29 and 17.3.3.18).
+*
+* The editor renders both elements as their Unicode characters so line
+* breaking and measurement treat them as text. The same characters may also be
+* authored inside `w:t`, so without this mark the save leg could not tell
+* which of the two the source held. Nothing is painted for it.
+*
+* Not inclusive, and each carrier in a paragraph has its own `id`: ProseMirror
+* keeps a non-inclusive mark only where both neighbours hold an equal mark, so
+* distinct ids mean a character typed beside or between carriers is text. The
+* ids only tell neighbours apart. They can repeat after a paste beside the
+* source or a paragraph join, which `hyphenElementRunContent` describes.
+*
+* External HTML must not be able to claim the element: `cleanPastedHtml` strips
+* the attribute unless the slice carries the internal clipboard capability, so
+* `toDOM` stamps that capability on every carrier it writes.
+*/
+const HYPHEN_ELEMENT_ATTRIBUTE = "data-docx-hyphen-element";
+const CANONICAL_HYPHEN_ELEMENT_ID = /^(?:0|[1-9]\d*)$/u;
+const HyphenElementExtension = createMarkExtension({
+	name: HYPHEN_ELEMENT_MARK_NAME,
+	schemaMarkName: HYPHEN_ELEMENT_MARK_NAME,
+	markSpec: (options) => ({
+		attrs: { id: {} },
+		inclusive: false,
+		parseDOM: [{
+			tag: `span[${HYPHEN_ELEMENT_ATTRIBUTE}]`,
+			getAttrs(dom) {
+				const rawId = dom.getAttribute(HYPHEN_ELEMENT_ATTRIBUTE);
+				if (rawId === null || !CANONICAL_HYPHEN_ELEMENT_ID.test(rawId)) return false;
+				const id = Number(rawId);
+				return Number.isSafeInteger(id) ? { id } : false;
+			}
+		}],
+		toDOM(mark) {
+			const { id } = expectHyphenElementMarkAttrs(mark);
+			return [
+				"span",
+				{
+					[HYPHEN_ELEMENT_ATTRIBUTE]: String(id),
+					...options.getInternalClipboardToken ? { "data-docx-internal-clipboard": options.getInternalClipboardToken() } : {}
+				},
+				0
+			];
+		}
+	})
+});
+export { HyphenElementExtension };

package/dist/prosemirror/fieldRepresentation.js

@@ -1,3 +1,4 @@
+import "./conversion/hyphenTextCarriers.js";
 import "./extensions/marks/InlineWrapperExtension.js";
 import { getInlineDisplayText } from "./inlineDisplayText.js";
 import "./runIdentity.js";
@@ -11,7 +12,7 @@ const fieldCommentCoverage = (fieldKind) => FIELD_COMMENT_COVERAGE[fieldKind];
 /** Current children alone decide whether a field needs editable structural content. */
 const fieldRequiresStructuredContent = (children) => {
 	const first = children.at(0);
-	return children.some((child) => !child.isText || first !== void 0 && !Mark.sameSet(first.marks, child.marks) || child.marks.some((mark) => mark.type.name === "runIdentity" || mark.type.name === "footnoteRef" || mark.type.name === "hyperlink" || mark.type.name === "inlineWrapper" || mark.type.name === "insertion" || mark.type.name === "deletion"));
+	return children.some((child) => !child.isText || first !== void 0 && !Mark.sameSet(first.marks, child.marks) || child.marks.some((mark) => mark.type.name === "runIdentity" || mark.type.name === "hyphenElement" || mark.type.name === "footnoteRef" || mark.type.name === "hyperlink" || mark.type.name === "inlineWrapper" || mark.type.name === "insertion" || mark.type.name === "deletion"));
 };
 /** Resolution collapses a field only when the atom can retain its result. */
 const canonicalFieldNode = (node) => {

package/dist/prosemirror/hyphenElementAttrs.d.ts

@@ -0,0 +1,10 @@
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
+import { Mark } from "prosemirror-model";
+type HyphenElementMarkAttrs = {
+  /** Tells this carrier from its neighbours. Monotonic within one paragraph. */
+  id: number;
+};
+export declare const readHyphenElementMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<HyphenElementMarkAttrs>;
+export declare const expectHyphenElementMarkAttrs: (mark: Mark) => HyphenElementMarkAttrs;
+export {};

package/dist/prosemirror/hyphenElementAttrs.js

@@ -0,0 +1,32 @@
+import { panic } from "better-result";
+// src/prosemirror/hyphenElementAttrs.ts
+const readHyphenElementMarkAttrs = (mark) => {
+	const id = mark.attrs["id"];
+	if (mark.type.name !== "hyphenElement") return {
+		ok: false,
+		issues: [{
+			path: "mark.type.name",
+			message: `Expected hyphenElement, got ${mark.type.name}.`
+		}]
+	};
+	if (typeof id !== "number" || !Number.isSafeInteger(id) || id < 0) return {
+		ok: false,
+		issues: [{
+			path: "hyphenElement.attrs.id",
+			message: "Expected a non-negative safe integer."
+		}]
+	};
+	return {
+		ok: true,
+		value: { id }
+	};
+};
+const expectHyphenElementMarkAttrs = (mark) => {
+	const result = readHyphenElementMarkAttrs(mark);
+	if (!result.ok) {
+		const details = result.issues.map((issue) => `${issue.path}: ${issue.message}`).join("\n");
+		panic(`Invalid ProseMirror hyphen element attrs:\n${details}`);
+	}
+	return result.value;
+};
+export { expectHyphenElementMarkAttrs, readHyphenElementMarkAttrs };

package/dist/prosemirror/keptRangeBoundaries.d.ts

@@ -6,6 +6,8 @@ import { Transaction } from "prosemirror-state";
 type BoundaryItem = Extract<document_d_exports.ParagraphContent, {
   type: "bookmarkStart" | "bookmarkEnd" | "commentRangeStart" | "commentRangeEnd" | "moveFromRangeStart" | "moveFromRangeEnd" | "moveToRangeStart" | "moveToRangeEnd";
 }>;
+/** The marks that say a node is in a revision: its wrappers, in the engine. */
+export declare const REVISION_MARK_NAMES: ReadonlySet<string>;
 /** The range boundaries `node` carries; none for any other node. */
 export declare const rangeBoundaryItemsOf: (node: Node) => readonly BoundaryItem[];
 /** Range boundary nodes, as the nodes that stand for them between blocks. */

package/dist/prosemirror/keptRangeBoundaries.js

@@ -377,4 +377,4 @@ const removeResolvedSubtree = (node, selection) => {
 	if (selection.mode === "reject") visit(node);
 	return { kept };
 };
-export { blockBoundariesOf, carriesCommentAnchor, inlineBoundariesOf, isBlockBoundaryNode, normalizeKeptRangeBoundaries, paragraphRemainsOf, rangeBoundaryItemsOf, removeResolvedSubtree, revisionLayerRemovesContent };
+export { REVISION_MARK_NAMES, blockBoundariesOf, carriesCommentAnchor, inlineBoundariesOf, isBlockBoundaryNode, normalizeKeptRangeBoundaries, paragraphRemainsOf, rangeBoundaryItemsOf, removeResolvedSubtree, revisionLayerRemovesContent };

package/dist/prosemirror/listNumbering.js

@@ -1,4 +1,5 @@
 import { mintListInstance, restartListInstance } from "../docx/listNumberingInstances.js";
+import { NO_NUMBERING_IDS_IN_USE } from "../docx/numberingIds.js";
 import { createNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
 import { paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
@@ -179,7 +180,7 @@ const resolveListTarget = ({ numbering, $from, $to, requests }) => {
 		ilvl: 0,
 		numbering
 	};
-	const minted = mintListInstance(numbering?.definitions, first);
+	const minted = mintListInstance(numbering?.definitions, first, NO_NUMBERING_IDS_IN_USE);
 	return {
 		numId: minted.numId,
 		ilvl: 0,
@@ -289,7 +290,7 @@ const setNumberingValue = (value) => withCanonicalCommand((state, dispatch) => {
 		abstractNumId,
 		ilvl: selected.membership.ilvl,
 		start: value
-	});
+	}, NO_NUMBERING_IDS_IN_USE);
 	dispatch(moveItems({
 		state,
 		items: itemsFrom(state, selected.membership.numId, selected.pos),

package/dist/prosemirror/paragraphIndentation.js

@@ -1,3 +1,4 @@
+import { hangingFirstLineIndent } from "../utils/units.js";
 import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { panic } from "better-result";
 // src/prosemirror/paragraphIndentation.ts
@@ -70,7 +71,7 @@ const directParagraphIndentation = (attrs) => {
 	if (indentation.indentFirstLine !== void 0) {
 		const hanging = attrs.hangingIndent === true;
 		indentation.hangingIndent = hanging;
-		if (hanging) indentation.indentFirstLine = -Math.abs(indentation.indentFirstLine);
+		if (hanging) indentation.indentFirstLine = hangingFirstLineIndent(indentation.indentFirstLine);
 	} else if (original?.hangingIndent !== void 0 && original.indentFirstLine === void 0 && typeof attrs.hangingIndent === "boolean") indentation.hangingIndent = attrs.hangingIndent;
 	return Object.keys(indentation).length > 0 ? indentation : void 0;
 };

package/dist/prosemirror/paragraphPropertyCarry.d.ts

@@ -3,7 +3,6 @@ import { NumberingMap } from "../docx/numberingParser.js";
 import { RunStyleResolver } from "./runStyleFormatting.js";
 import { Node } from "prosemirror-model";
 import { Transaction } from "prosemirror-state";
-type RecordedFormatting = NonNullable<ParagraphPropertyChangeAttrs["previousFormatting"]>;
 type CarryParagraphPropertiesOptions = {
   tr: Transaction;
   /** The paragraph that takes the properties. */
@@ -14,14 +13,7 @@ type CarryParagraphPropertiesOptions = {
   numbering: NumberingMap | null;
   /** Records the change as a tracked property change; applied directly when omitted. */
   revision?: ParagraphPropertyChangeAttrs["info"];
-  /** Properties the paragraph keeps its own values of: ones its own batch set. */
-  keep?: ReadonlySet<string>;
 };
-type CarriedParagraphPropertiesOptions = Pick<CarryParagraphPropertiesOptions, "source" | "keep"> & {
-  target: Node;
-};
-/** The exact formatting transfer, shared with pre-mutation capacity checks. */
-export declare const carriedParagraphProperties: ({ source, target, keep }: CarriedParagraphPropertiesOptions) => RecordedFormatting;
 /**
  * Give a paragraph another one's properties: the pPr a property change
  * covers. Its identity, mark, mark run properties and section stay its own,
@@ -29,7 +21,7 @@ export declare const carriedParagraphProperties: ({ source, target, keep }: Carr
  * change now records what it had: a paragraph holds one, and a pending one
  * already records it.
  */
-export declare const carryParagraphProperties: ({ tr, position, source, styleResolver, numbering, revision, keep }: CarryParagraphPropertiesOptions) => {
+export declare const carryParagraphProperties: ({ tr, position, source, styleResolver, numbering, revision }: CarryParagraphPropertiesOptions) => {
   tr: Transaction;
   changed: boolean;
   tracked: boolean;
@@ -60,9 +52,4 @@ export declare const recordReplacedParagraphProperties: ({ tr, position, replace
   replaced: Node;
   revision: ParagraphPropertyChangeAttrs["info"];
 }) => boolean;
-/**
- * The properties a batch's own property change set on a paragraph: the ones
- * whose value differs from what that change records as before.
- */
-export declare const propertiesSetInBatch: (node: Node, batchRevisionIds: ReadonlySet<number>) => ReadonlySet<string>;
 export {};