@stll/folio-core 0.15.4 → 0.15.5

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

@@ -4,7 +4,7 @@ import { padDecimal } from "../../docx/numberingParser.js";
 import { setParagraphFrame } from "../../layout-engine/paragraphFrame.js";
 import { setTextBoxGroupId } from "../../layout-engine/textBoxGroup.js";
 import { DEFAULT_TEXTBOX_MARGINS } from "../../layout-engine/types.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
+import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSymbolAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../../prosemirror/attrs/index.js";
 import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { runShadingAttrsToShading } from "../../prosemirror/conversion/runShadingMark.js";
 import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
@@ -13,6 +13,7 @@ import { NUMBER_FORMAT_VALUES } from "../../types/documentEnumValues.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
+import { decodeOoxmlSymbolCharacter } from "../../utils/ooxmlSymbol.js";
 import { AUTO_PARAGRAPH_SPACING_PX, halfPointsToPixels, halfPointsToPoints, pointsToPixels } from "../../utils/units.js";
 import { getColumns } from "../sectionColumns.js";
 import { groupParagraphFrames } from "./paragraphFrames.js";
@@ -538,6 +539,22 @@ function paragraphToRuns(node, startPos, _options) {
 			runs.push(run);
 			return;
 		}
+		if (child.type.name === "symbol") {
+			const attrs = expectSymbolAttrs(child);
+			const text = decodeOoxmlSymbolCharacter(attrs.char);
+			if (text === null) return;
+			const formatting = extractRunFormatting(child.marks, theme);
+			if (inTocParagraph) stripTocHyperlinkStyle(formatting);
+			runs.push({
+				kind: "text",
+				text,
+				...mergeRunFormatting(paraDefaults, formatting),
+				fontFamily: attrs.font,
+				pmStart: childPos,
+				pmEnd: childPos + child.nodeSize
+			});
+			return;
+		}
 		if (child.type.name === "hardBreak") {
 			runs.push({
 				kind: "lineBreak",

package/dist/markdown/renderRuns.js

@@ -1,3 +1,4 @@
+import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { wrapComment, wrapDeletion, wrapInsertion, wrapMoveFrom, wrapMoveTo } from "./annotations.js";
 import { escapeAltText, escapeInline, escapeLinkUrl } from "./escape.js";
 import { registerImage } from "./images.js";
@@ -68,7 +69,7 @@ function renderRunContent(ctx, pkg, content, paraId) {
 			else out += "  \n";
 			break;
 		case "symbol":
-			out += escapeInline(item.char);
+			out += escapeInline(decodeOoxmlSymbolCharacter(item.char) ?? item.char);
 			break;
 		case "softHyphen": break;
 		case "noBreakHyphen":

package/dist/markdown/renderTable.js

@@ -1,3 +1,4 @@
+import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { escapeTableCell } from "./escape.js";
 import { registerImage } from "./images.js";
 import { pushWarning } from "./internals.js";
@@ -172,7 +173,7 @@ function renderHtmlRun(ctx, pkg, run, paraId) {
 			text += "<br>";
 			break;
 		case "symbol":
-			text += escapeHtml(item.char);
+			text += escapeHtml(decodeOoxmlSymbolCharacter(item.char) ?? item.char);
 			break;
 		case "noBreakHyphen":
 			text += "&#8209;";

package/dist/prosemirror/attrs/index.d.ts

@@ -1,5 +1,5 @@
 import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "../schema/marks.js";
-import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "../schema/nodes.js";
+import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "../schema/nodes.js";
 import "../schema/index.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/attrs/index.d.ts
@@ -20,6 +20,8 @@ declare const readHardBreakAttrs: (node: Node) => ReadProseMirrorAttrsResult<Har
 declare const expectHardBreakAttrs: (node: Node) => HardBreakAttrs;
 declare const readTabAttrs: (node: Node) => ReadProseMirrorAttrsResult<TabAttrs>;
 declare const expectTabAttrs: (node: Node) => TabAttrs;
+declare const readSymbolAttrs: (node: Node) => ReadProseMirrorAttrsResult<SymbolAttrs>;
+declare const expectSymbolAttrs: (node: Node) => SymbolAttrs;
 declare const readTableAttrs: (node: Node) => ReadProseMirrorAttrsResult<TableAttrs>;
 declare const expectTableAttrs: (node: Node) => TableAttrs;
 declare const readTableRowAttrs: (node: Node) => ReadProseMirrorAttrsResult<TableRowAttrs>;
@@ -83,4 +85,4 @@ declare const mergeTableAttrs: (node: Node, patch: NodeAttrPatch<TableAttrs>) =>
 declare const mergeTableRowAttrs: (node: Node, patch: NodeAttrPatch<TableRowAttrs>) => TableRowAttrs;
 declare const mergeTableCellAttrs: (node: Node, patch: NodeAttrPatch<TableCellAttrs>) => TableCellAttrs;
 //#endregion
-export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { ProseMirrorAttrIssue, ReadProseMirrorAttrsResult, expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };

package/dist/prosemirror/attrs/index.js

@@ -2,6 +2,7 @@ import { FIELD_TYPE_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_V
 import { isParagraphDirection } from "../paragraphDirection.js";
 import { TRACKED_CHANGE_PROVENANCE_VALUES } from "../schema/marks.js";
 import { panic } from "better-result";
+import { isOoxmlSymbolCharacter } from "@stll/docx-core/model";
 //#region src/prosemirror/attrs/index.ts
 const SECTION_BREAK_TYPES = [
 	"nextPage",
@@ -120,6 +121,7 @@ const SECTION_VERTICAL_ALIGNMENTS = [
 const paragraphAttrsCache = /* @__PURE__ */ new WeakMap();
 const hardBreakAttrsCache = /* @__PURE__ */ new WeakMap();
 const tabAttrsCache = /* @__PURE__ */ new WeakMap();
+const symbolAttrsCache = /* @__PURE__ */ new WeakMap();
 const tableAttrsCache = /* @__PURE__ */ new WeakMap();
 const tableRowAttrsCache = /* @__PURE__ */ new WeakMap();
 const tableCellAttrsCache = /* @__PURE__ */ new WeakMap();
@@ -248,6 +250,23 @@ const readTabAttrs = (node) => {
 	return attrsResult(attrs, issues);
 };
 const expectTabAttrs = (node) => expectCachedNodeAttrs(node, tabAttrsCache, readTabAttrs, "tab attrs");
+const readSymbolAttrs = (node) => {
+	const attrs = attrsRecord(node.attrs);
+	const issues = [];
+	expectNodeType(node, "symbol", issues);
+	requiredString(attrs, "font", "symbol.attrs.font", issues);
+	requiredString(attrs, "char", "symbol.attrs.char", issues);
+	if (typeof attrs["font"] === "string" && attrs["font"].trim() === "") issues.push({
+		path: "symbol.attrs.font",
+		message: "Expected a non-empty font name."
+	});
+	if (typeof attrs["char"] === "string" && !isOoxmlSymbolCharacter(attrs["char"])) issues.push({
+		path: "symbol.attrs.char",
+		message: "Expected exactly four hexadecimal digits."
+	});
+	return attrsResult(attrs, issues);
+};
+const expectSymbolAttrs = (node) => expectCachedNodeAttrs(node, symbolAttrsCache, readSymbolAttrs, "symbol attrs");
 const readTableAttrs = (node) => {
 	const attrs = attrsRecord(node.attrs);
 	const issues = [];
@@ -1426,4 +1445,4 @@ const optionalEmptyHyperlinkArray = (value, issues) => {
 	}
 };
 //#endregion
-export { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };
+export { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs, mergeImageAttrs, mergeParagraphAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs, readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs };

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -2,7 +2,7 @@ import { numPrEqual } from "../../docx/numberingParser.js";
 import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
 import { OUTLINE_STYLE_CSS_ALIASES } from "../../types/documentEnumValues.js";
 import { pixelsToEmu } from "../../utils/units.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
+import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
 import { directionToBidi } from "../paragraphDirection.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
@@ -795,6 +795,9 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				currentRun = createRunFromText(node.text || "", node.marks);
 				currentMarksKey = marksKey;
 			}
+		} else if (node.type.name === "symbol") {
+			flushCurrentInline();
+			content.push(createSymbolRun(node, node.marks));
 		} else if (node.type.name === "hardBreak") {
 			flushCurrentInline();
 			content.push(createBreakRun(readHardBreakType(node)));
@@ -867,6 +870,7 @@ function createTrackedChangeRun(node, marks) {
 		restoreRunPropertyChanges(run, marks);
 		return run;
 	}
+	if (node.type.name === "symbol") return createSymbolRun(node, marks);
 	if (node.type.name === "hardBreak") return createBreakRun(readHardBreakType(node));
 	if (node.type.name === "image") return createImageRun(node);
 	if (node.type.name === "shape") return createShapeRun(node);
@@ -974,6 +978,10 @@ function addNodeToHyperlink(hyperlink, node) {
 		hyperlink.children.push(run);
 		return;
 	}
+	if (node.type.name === "symbol") {
+		hyperlink.children.push(createSymbolRun(node, nonLinkMarks));
+		return;
+	}
 	if (node.type.name === "hardBreak") {
 		hyperlink.children.push(createBreakRun(readHardBreakType(node), nonLinkMarks));
 		return;
@@ -1026,6 +1034,21 @@ function createRunFromText(text, marks) {
 	restoreRunPropertyChanges(run, marks);
 	return run;
 }
+function createSymbolRun(node, marks) {
+	const { font, char } = expectSymbolAttrs(node);
+	const run = {
+		type: "run",
+		content: [{
+			type: "symbol",
+			font,
+			char
+		}]
+	};
+	const formatting = getRunFormattingFromMarks(marks);
+	if (formatting) run.formatting = formatting;
+	restoreRunPropertyChanges(run, marks);
+	return run;
+}
 function restoreRunPropertyChanges(run, marks) {
 	const changeMark = marks.find((mark) => mark.type.name === "runPropertyChange");
 	if (!changeMark) return;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -268,7 +268,7 @@ function convertTrackedChange(change, markType, getInheritedRunFormatting, style
 	});
 }
 function canCarryTrackedRunMark(node, markType) {
-	return node.isText || node.isInline && node.type.allowsMarkType(markType) && (node.type.name === "image" || node.type.name === "shape" || node.type.name === "hardBreak" || node.type.name === "tab" || node.type.name === "textBoxAnchor");
+	return node.isText || node.isInline && node.type.allowsMarkType(markType) && (node.type.name === "image" || node.type.name === "shape" || node.type.name === "hardBreak" || node.type.name === "tab" || node.type.name === "symbol" || node.type.name === "textBoxAnchor");
 }
 /**
 * Convert ParagraphFormatting to ProseMirror paragraph attrs
@@ -1078,7 +1078,10 @@ function convertRunContent(content, marks, formatting, textBoxAnchors) {
 		case "instrText": return [];
 		case "noBreakHyphen": return [schema.text("‑", marks)];
 		case "softHyphen": return [schema.text("­", marks)];
-		case "symbol": return content.char ? [schema.text(content.char, marks)] : [];
+		case "symbol": return [schema.node("symbol", {
+			font: content.font,
+			char: content.char
+		}).mark(marks)];
 	}
 }
 function withHyperlinkBoundaryMarks(node, marks) {

package/dist/prosemirror/extensions/StarterKit.js

@@ -52,6 +52,7 @@ import { PageBreakExtension } from "./nodes/PageBreakExtension.js";
 import { RenderedPageBreakExtension } from "./nodes/RenderedPageBreakExtension.js";
 import { SdtExtension } from "./nodes/SdtExtension.js";
 import { ShapeExtension } from "./nodes/ShapeExtension.js";
+import { SymbolExtension } from "./nodes/SymbolExtension.js";
 import { TabExtension } from "./nodes/TabExtension.js";
 import { createTableExtensions } from "./nodes/TableExtension.js";
 import { TextBoxAnchorExtension } from "./nodes/TextBoxAnchorExtension.js";
@@ -106,6 +107,7 @@ function createStarterKit(options = {}) {
 	add("runPropertyChange", RunPropertyChangeExtension());
 	add("hardBreak", HardBreakExtension());
 	add("tab", TabExtension());
+	add("symbol", SymbolExtension());
 	add("image", ImageExtension());
 	add("textBox", TextBoxExtension());
 	add("textBoxAnchor", TextBoxAnchorExtension());

package/dist/prosemirror/extensions/nodes/SymbolExtension.d.ts

@@ -0,0 +1,5 @@
+import { NodeExtension } from "../types.js";
+//#region src/prosemirror/extensions/nodes/SymbolExtension.d.ts
+declare const SymbolExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
+//#endregion
+export { SymbolExtension };

package/dist/prosemirror/extensions/nodes/SymbolExtension.js

@@ -0,0 +1,49 @@
+import { decodeOoxmlSymbolCharacter } from "../../../utils/ooxmlSymbol.js";
+import { expectSymbolAttrs } from "../../attrs/index.js";
+import { createNodeExtension } from "../create.js";
+import { isOoxmlSymbolCharacter } from "@stll/docx-core/model";
+//#region src/prosemirror/extensions/nodes/SymbolExtension.ts
+const escapeCssString = (value) => value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\n", "\\a ").replaceAll("\r", "\\d ").replaceAll("\f", "\\c ");
+const SymbolExtension = createNodeExtension({
+	name: "symbol",
+	schemaNodeName: "symbol",
+	nodeSpec: {
+		inline: true,
+		group: "inline",
+		atom: true,
+		marks: "_",
+		attrs: {
+			font: {},
+			char: {}
+		},
+		selectable: false,
+		parseDOM: [{
+			tag: "span[data-docx-symbol-char][data-docx-symbol-font]",
+			getAttrs(node) {
+				if (!(node instanceof HTMLElement)) return false;
+				const font = node.dataset["docxSymbolFont"];
+				const char = node.dataset["docxSymbolChar"];
+				if (!font || font.trim() === "" || !char || !isOoxmlSymbolCharacter(char)) return false;
+				return {
+					font,
+					char
+				};
+			}
+		}],
+		toDOM(node) {
+			const { font, char } = expectSymbolAttrs(node);
+			const decoded = decodeOoxmlSymbolCharacter(char);
+			return [
+				"span",
+				{
+					"data-docx-symbol-char": char,
+					"data-docx-symbol-font": font,
+					style: `font-family: "${escapeCssString(font)}";`
+				},
+				decoded ?? "�"
+			];
+		}
+	}
+});
+//#endregion
+export { SymbolExtension };

package/dist/prosemirror/findReplaceSelection.js

@@ -1,4 +1,6 @@
 import { findAllMatches } from "../utils/findReplace.js";
+import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
+import { expectSymbolAttrs } from "./attrs/index.js";
 //#region src/prosemirror/findReplaceSelection.ts
 function resolveFindMatchRange(doc, match) {
 	let resolved = null;
@@ -105,7 +107,7 @@ function resolveTextRangeInParagraph({ paragraph, paragraphPos, startOffset, end
 }
 function getSearchTextTokenLength(node) {
 	if (node.isText) return node.text?.length ?? 0;
-	if (node.type.name === "tab" || node.type.name === "hardBreak") return 1;
+	if (node.type.name === "tab" || node.type.name === "hardBreak" || node.type.name === "symbol") return 1;
 	return 0;
 }
 function getSearchableParagraphText(paragraph) {
@@ -123,6 +125,10 @@ function getSearchableParagraphText(paragraph) {
 			text += "\n";
 			return false;
 		}
+		if (node.type.name === "symbol") {
+			text += decodeOoxmlSymbolCharacter(expectSymbolAttrs(node).char) ?? "";
+			return false;
+		}
 		return true;
 	});
 	return text;

package/dist/prosemirror/schema/index.d.ts

@@ -1,6 +1,6 @@
 import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
-import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
+import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 //#region src/prosemirror/schema/index.d.ts
 declare const singletonManager: ExtensionManager;
 declare const schema: import("prosemirror-model").Schema<any, any>;
@@ -11,4 +11,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };

package/dist/prosemirror/schema/nodes.d.ts

@@ -11,6 +11,10 @@ type HardBreakAttrs = {
 type TabAttrs = {
   positional?: document_d_exports.PositionalTab;
 };
+type SymbolAttrs = {
+  font: string;
+  char: string;
+};
 /**
  * Paragraph node attributes - maps to ParagraphFormatting
  */
@@ -684,4 +688,4 @@ type TableCellAttrs = {
   _docxVMergeContinuationCells?: document_d_exports.TableCell[];
 };
 //#endregion
-export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };
+export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };

package/dist/prosemirror/validation.js

@@ -1,4 +1,4 @@
-import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
+import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
 import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
 //#region src/prosemirror/validation.ts
 var ProseMirrorDocumentValidationError = class extends Error {
@@ -53,6 +53,9 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "tab":
 			appendAttrIssues(path, readTabAttrs(node), issues);
 			return;
+		case "symbol":
+			appendAttrIssues(path, readSymbolAttrs(node), issues);
+			return;
 		case "hardBreak":
 			appendAttrIssues(path, readHardBreakAttrs(node), issues);
 			return;

package/dist/utils/ooxmlSymbol.d.ts

@@ -0,0 +1,4 @@
+//#region src/utils/ooxmlSymbol.d.ts
+declare const decodeOoxmlSymbolCharacter: (value: string) => string | null;
+//#endregion
+export { decodeOoxmlSymbolCharacter };

package/dist/utils/ooxmlSymbol.js

@@ -0,0 +1,5 @@
+import { isOoxmlSymbolCharacter } from "@stll/docx-core/model";
+//#region src/utils/ooxmlSymbol.ts
+const decodeOoxmlSymbolCharacter = (value) => isOoxmlSymbolCharacter(value) ? String.fromCodePoint(Number.parseInt(value, 16)) : null;
+//#endregion
+export { decodeOoxmlSymbolCharacter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -107,7 +107,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.7.0",
+    "@stll/docx-core": "^0.8.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
     "better-result": "2.10.0",