@stll/folio-core 0.44.0 → 0.46.0

package/dist/layout-engine/measure/tableCellFloating.d.ts

@@ -8,6 +8,8 @@ type TableCellFloatingImage = {
   alt?: string;
   transform?: string;
   opacity?: number;
+  brightness?: number;
+  contrast?: number;
   cropTop?: number;
   cropRight?: number;
   cropBottom?: number;

package/dist/layout-engine/measure/tableCellFloating.js

@@ -68,6 +68,8 @@ function getTableCellFloatingImages(cell, cellMeasure, contentWidth, resolvePosi
 				...run.alt !== void 0 ? { alt: run.alt } : {},
 				...run.transform !== void 0 ? { transform: run.transform } : {},
 				...run.opacity != null ? { opacity: run.opacity } : {},
+				...run.brightness != null ? { brightness: run.brightness } : {},
+				...run.contrast != null ? { contrast: run.contrast } : {},
 				...run.cropTop != null ? { cropTop: run.cropTop } : {},
 				...run.cropRight != null ? { cropRight: run.cropRight } : {},
 				...run.cropBottom != null ? { cropBottom: run.cropBottom } : {},

package/dist/layout-engine/types.d.ts

@@ -1,5 +1,5 @@
 import { OutlineStyleAttr } from "../types/documentEnumValues.js";
-import { ImagePosition, ImageWrap, NumberFormat, SdtProperties, SdtType, ShapeTextBody, TableCellFormatting, TableWidthType, VerticalAlign } from "@stll/docx-core/model";
+import { ImagePosition, ImageWrap, InlineWrapper, NumberFormat, SdtProperties, SdtType, ShapeTextBody, TableCellFormatting, TableWidthType, VerticalAlign } from "@stll/docx-core/model";
 declare namespace types_d_exports {
   export { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, ListNumPr, MathRun, Measure, MeasuredLine, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, tableColumnsArePinned };
 }
@@ -99,6 +99,20 @@ type RunFormatting = {
    * RTL; the painter sets `dir="ltr"` so style/paragraph RTL does not leak in.
    */
   rtl?: boolean;
+  /**
+   * The bidirectional wrapper (`w:bdo` / `w:dir`) the run was authored inside,
+   * when it was inside one. An override switches the bidirectional algorithm
+   * off for its content, which is what makes a Latin word inside an `rtl`
+   * override read backwards; an embedding opens a level and leaves the
+   * algorithm on. `direction` is the wrapper's own `w:val`, absent when the
+   * wrapper states none.
+   *
+   * Distinct from `rtl`, which is the run's own `w:rtl` property: the wrapper
+   * is a container the author wrote around the run, not a property of it.
+   */
+  bidiWrapper?: Omit<Extract<InlineWrapper, {
+    kind: "bidi";
+  }>, "type" | "kind" | "content">;
   /**
    * Text effect animation hint (w:effect). Word 2013+ no longer animates,
    * but the painter emits `docx-text-effect-<name>` plus `data-effect` so
@@ -212,6 +226,10 @@ type ImageRun = {
    * eigenpal #424 (opacity render pipeline).
    */
   opacity?: number;
+  /** DrawingML picture brightness as a signed percentage. */
+  brightness?: number;
+  /** DrawingML picture contrast as a signed percentage. */
+  contrast?: number;
   /** Position for floating/anchored images */
   position?: ImageRunPosition;
   /** Whether a table-cell anchor uses the cell as its positioning scope. Undefined defaults true. */
@@ -681,6 +699,10 @@ type ImageBlock = {
    * eigenpal #424 (opacity render pipeline).
    */
   opacity?: number;
+  /** DrawingML picture brightness as a signed percentage. */
+  brightness?: number;
+  /** DrawingML picture contrast as a signed percentage. */
+  contrast?: number;
   anchor?: {
     isAnchored?: boolean;
     offsetH?: number;

package/dist/layout-painter/renderImage.d.ts

@@ -15,6 +15,8 @@ declare const IMAGE_CLASS_NAMES: {
  */
 type ImageVisualAttrs = {
   opacity?: number;
+  brightness?: number;
+  contrast?: number;
   cropTop?: number;
   cropRight?: number;
   cropBottom?: number;
@@ -43,6 +45,8 @@ declare function applyImageBorder(element: HTMLElement, border: ImageBorderAttrs
  */
 declare function hasImageVisualAttrs(v: ImageVisualAttrs): boolean;
 declare function hasImageCrop(v: ImageVisualAttrs): boolean;
+/** Apply non-geometric opacity and luminance effects to an image element. */
+declare function applyImageColorAttrs(img: HTMLImageElement, v: ImageVisualAttrs): void;
 /**
  * Apply an OOXML `<a:srcRect>` crop to an `<img>` whose parent already has
  * `overflow: hidden` and is sized to the *visible* (cropped) dimensions
@@ -96,4 +100,4 @@ type RenderImageFragmentOptions = {
  */
 declare function renderImageFragment(fragment: ImageFragment, block: ImageBlock, _measure: ImageMeasure, _context: RenderContext, options?: RenderImageFragmentOptions): HTMLElement;
 //#endregion
-export { IMAGE_CLASS_NAMES, ImageBorderAttrs, ImageVisualAttrs, RenderImageFragmentOptions, applyImageBorder, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };
+export { IMAGE_CLASS_NAMES, ImageBorderAttrs, ImageVisualAttrs, RenderImageFragmentOptions, applyImageBorder, applyImageColorAttrs, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };

package/dist/layout-painter/renderImage.js

@@ -1,5 +1,6 @@
+import { imageLuminanceFilter } from "../utils/imageLuminance.js";
 import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
-import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
+import { anchorTargetAttrs, sanitizeExternalUrl } from "../utils/urlSecurity.js";
 //#region src/layout-painter/renderImage.ts
 /**
 * CSS class names for image elements
@@ -32,11 +33,17 @@ function applyImageBorder(element, border) {
 */
 function hasImageVisualAttrs(v) {
 	if (v.opacity != null && v.opacity < 1) return true;
-	return hasImageCrop(v);
+	return imageLuminanceFilter(v) !== void 0 || hasImageCrop(v);
 }
 function hasImageCrop(v) {
 	return Boolean(v.cropTop || v.cropRight || v.cropBottom || v.cropLeft);
 }
+/** Apply non-geometric opacity and luminance effects to an image element. */
+function applyImageColorAttrs(img, v) {
+	if (v.opacity != null && v.opacity < 1) img.style.opacity = String(Math.max(0, v.opacity));
+	const filter = imageLuminanceFilter(v);
+	if (filter !== void 0) img.style.filter = filter;
+}
 /**
 * Apply an OOXML `<a:srcRect>` crop to an `<img>` whose parent already has
 * `overflow: hidden` and is sized to the *visible* (cropped) dimensions
@@ -58,7 +65,7 @@ function hasImageCrop(v) {
 * call for plain images.
 */
 function applyImageVisualAttrs(img, v) {
-	if (v.opacity != null && v.opacity < 1) img.style.opacity = String(Math.max(0, v.opacity));
+	applyImageColorAttrs(img, v);
 	const top = v.cropTop ?? 0;
 	const right = v.cropRight ?? 0;
 	const bottom = v.cropBottom ?? 0;
@@ -145,8 +152,9 @@ function renderImageFragment(fragment, block, _measure, _context, options = {})
 	if (hlinkHref) {
 		const linkEl = doc.createElement("a");
 		linkEl.href = hlinkHref;
-		linkEl.target = "_blank";
-		linkEl.rel = "noopener noreferrer";
+		const { target, rel } = anchorTargetAttrs(void 0);
+		linkEl.target = target;
+		linkEl.rel = rel;
 		linkEl.style.display = "block";
 		linkEl.style.width = "100%";
 		linkEl.style.height = "100%";
@@ -158,4 +166,4 @@ function renderImageFragment(fragment, block, _measure, _context, options = {})
 	return containerEl;
 }
 //#endregion
-export { IMAGE_CLASS_NAMES, applyImageBorder, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };
+export { IMAGE_CLASS_NAMES, applyImageBorder, applyImageColorAttrs, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };

package/dist/layout-painter/renderPage.d.ts

@@ -19,6 +19,8 @@ type PageFloatingImage = {
    * opaque. eigenpal #424 (opacity render pipeline).
    */
   opacity?: number;
+  brightness?: number;
+  contrast?: number;
   /** Which side: 'left' for left margin, 'right' for right margin */
   side: "left" | "right";
   /** X position relative to content area (0 = left edge of content) */

package/dist/layout-painter/renderPage.js

@@ -371,6 +371,8 @@ function extractFloatingImagesFromParagraph(block, fragmentY, geometry) {
 			...imgRun.alt !== void 0 ? { alt: imgRun.alt } : {},
 			...imgRun.transform !== void 0 ? { transform: imgRun.transform } : {},
 			...imgRun.opacity != null ? { opacity: imgRun.opacity } : {},
+			...imgRun.brightness != null ? { brightness: imgRun.brightness } : {},
+			...imgRun.contrast != null ? { contrast: imgRun.contrast } : {},
 			side,
 			x,
 			y,
@@ -460,6 +462,8 @@ function renderHeaderFooterContent(content, context, options, layout) {
 				height: run.height,
 				...run.alt !== void 0 ? { alt: run.alt } : {},
 				...run.opacity != null ? { opacity: run.opacity } : {},
+				...run.brightness != null ? { brightness: run.brightness } : {},
+				...run.contrast != null ? { contrast: run.contrast } : {},
 				...run.pmStart !== void 0 ? { pmStart: run.pmStart } : {},
 				...run.pmEnd !== void 0 ? { pmEnd: run.pmEnd } : {},
 				paragraphY: paragraphStartY,

package/dist/layout-painter/renderParagraph.d.ts

@@ -30,6 +30,18 @@ type RenderParagraphOptions = {
   renderedInlineImageKeys?: Set<string>;
 };
 declare function getRenderableTextColor(run: TextRun | TabRun): string | undefined;
+/**
+ * How CSS spells each bidirectional wrapper: an override switches the
+ * bidirectional algorithm off for its content, an embedding opens a level and
+ * leaves it on.
+ *
+ * Both painters write the keyword from here, so the DOM painter and the
+ * display list cannot spell the pair differently.
+ */
+declare const UNICODE_BIDI_BY_WRAPPER_CONTROL: {
+  readonly override: "bidi-override";
+  readonly embedding: "embed";
+};
 /**
  * Get leader character for tab
  */
@@ -134,4 +146,4 @@ declare function renderLine(block: ParagraphBlock, line: MeasuredLine, alignment
  */
 declare function renderParagraphFragment(fragment: ParagraphFragment, block: ParagraphBlock, measure: ParagraphMeasure, context: RenderContext, options?: RenderParagraphOptions): HTMLElement;
 //#endregion
-export { PARAGRAPH_CLASS_NAMES, RenderParagraphOptions, getLeaderChar, getRenderableTextColor, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };
+export { PARAGRAPH_CLASS_NAMES, RenderParagraphOptions, UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };

package/dist/layout-painter/renderParagraph.js

@@ -8,6 +8,7 @@ import { DOCX_SCRIPT_FONT_SCALE } from "../layout-engine/measure/measureHelpers.
 import { calculateTabWidth } from "../layout-engine/measure/tabCalculator.js";
 import { FONT_KERNING_MODE, countCompressibleSpaces, getFontKerningMode, getRunFontKerningMode, toPaintedText } from "../layout-engine/measure/textMeasurementPolicy.js";
 import { isFloatingImageRun } from "../layout-engine/types.js";
+import { writeCommentAnchorIds } from "../render-dom/commentAnchorAttributes.js";
 import { AUTHOR_COLORS, getAuthorColorIdx } from "../utils/authorColors.js";
 import { resolveFontFamily } from "../utils/fontResolver.js";
 import "../utils/fontWeights.js";
@@ -16,11 +17,11 @@ import { resolvePhysicalParagraphInlineLayout } from "../utils/paragraphInlineLa
 import { inlineImageBoundingBox, parseRotationDegrees, rotatedBoundingBox } from "../utils/rotationBoundingBox.js";
 import { sanitizeImageSrc } from "../utils/sanitizeImageSrc.js";
 import { SCRIPT_CLASS, hasCjk, hasComplexScript, segmentByScript } from "../utils/scriptSegments.js";
-import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
+import { anchorTargetAttrs, sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { borderStrokeToCss, resolveParagraphBorderHorizontalOutsets } from "./borderStroke.js";
 import { planCursiveJoiners, withCursiveJoiners } from "./cursiveJoiners.js";
 import { getAutomaticTextColorForBackground, setAuthoredBackgroundColor, setAuthoredTextColor } from "./documentColors.js";
-import { applyImageBorder, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, wrapImageWithCrop } from "./renderImage.js";
+import { applyImageBorder, applyImageColorAttrs, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, wrapImageWithCrop } from "./renderImage.js";
 import { resolveImageLineAlign } from "./renderUtils.js";
 import { applySdtDataAttrs } from "./sdtBoundary.js";
 //#region src/layout-painter/renderParagraph.ts
@@ -164,6 +165,18 @@ function applyHorizontalScaleTransform(element, horizontalScale) {
 	element.style.transformOrigin = "left center";
 }
 /**
+* How CSS spells each bidirectional wrapper: an override switches the
+* bidirectional algorithm off for its content, an embedding opens a level and
+* leaves it on.
+*
+* Both painters write the keyword from here, so the DOM painter and the
+* display list cannot spell the pair differently.
+*/
+const UNICODE_BIDI_BY_WRAPPER_CONTROL = {
+	override: "bidi-override",
+	embedding: "embed"
+};
+/**
 * Apply text run styles to an element
 */
 function applyRunStyles(element, run) {
@@ -192,6 +205,10 @@ function applyRunStyles(element, run) {
 	}
 	if (run.rtl === true) element.dir = RIGHT_TO_LEFT_DIRECTION;
 	else if (run.rtl === false) element.dir = LEFT_TO_RIGHT_DIRECTION;
+	if (run.bidiWrapper) {
+		element.style.unicodeBidi = UNICODE_BIDI_BY_WRAPPER_CONTROL[run.bidiWrapper.control];
+		if (run.bidiWrapper.direction !== void 0 && run.rtl === void 0) element.dir = run.bidiWrapper.direction === "rtl" ? RIGHT_TO_LEFT_DIRECTION : LEFT_TO_RIGHT_DIRECTION;
+	}
 	if (run.textEffect) {
 		element.classList.add("docx-text-effect", `docx-text-effect-${run.textEffect}`);
 		element.dataset["effect"] = run.textEffect;
@@ -238,7 +255,7 @@ function applyRunStyles(element, run) {
 	if (run.commentIds && run.commentIds.length > 0) {
 		element.style.backgroundColor = "rgba(255, 212, 0, 0.08)";
 		element.style.borderBottom = "1px solid rgba(180, 130, 0, 0.24)";
-		element.dataset["commentId"] = String(run.commentIds[0]);
+		writeCommentAnchorIds(element, run.commentIds);
 	}
 	if (run.isInsertion) {
 		const authorIdx = getAuthorColorIdx(run.changeAuthor ?? "");
@@ -357,8 +374,9 @@ function renderTextRun(run, doc, options) {
 		anchor.href = hyperlinkHref;
 		if (options?.hyperlinkDirection || DISPLAYED_URL_PATTERN.test(paintedText.trim())) anchor.dir = LEFT_TO_RIGHT_DIRECTION;
 		if (!isBookmarkTarget) {
-			anchor.target = "_blank";
-			anchor.rel = "noopener noreferrer";
+			const { target, rel } = anchorTargetAttrs(void 0);
+			anchor.target = target;
+			anchor.rel = rel;
 		}
 		if (run.hyperlink.tooltip) anchor.title = run.hyperlink.tooltip;
 		appendPaintedText({
@@ -491,6 +509,7 @@ function renderInlineImageRun(run, doc) {
 		img.style.transform = run.transform;
 		img.style.transformOrigin = "center center";
 	}
+	applyImageColorAttrs(img, run);
 	if (!hasImageCrop(run)) applyImageBorder(img, run);
 	const rotation = parseRotationDegrees(run.transform);
 	if (rotation !== 0) {
@@ -557,6 +576,7 @@ function renderBlockImage(run, doc) {
 		img.style.transform = run.transform;
 		img.style.transformOrigin = "center center";
 	}
+	applyImageColorAttrs(img, run);
 	if (!hasImageCrop(run)) applyImageBorder(img, run);
 	const rotation = parseRotationDegrees(run.transform);
 	if (rotation !== 0) {
@@ -1666,4 +1686,4 @@ function renderListMarker({ marker, inlineWidth, visualOffset, doc, formatting,
 	return span;
 }
 //#endregion
-export { PARAGRAPH_CLASS_NAMES, getLeaderChar, getRenderableTextColor, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };
+export { PARAGRAPH_CLASS_NAMES, UNICODE_BIDI_BY_WRAPPER_CONTROL, getLeaderChar, getRenderableTextColor, renderLine, renderParagraphFragment, sliceRunsForLine, splitCollapsibleLineEdgeSpaces, splitTextRunsByEastAsia, startsAfterSoftWrap };

package/dist/managers/autoSaveCodec.d.ts

@@ -1,6 +1,14 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/managers/autoSaveCodec.d.ts
-declare const AUTOSAVE_FORMAT_VERSION = 2;
+/**
+ * Version 3 renamed the model's `bidiWrapper` to `inlineWrapper` and gave it a
+ * `kind`. The codec serialises the model itself, so a version-2 envelope holds
+ * paragraph content under the old discriminator: the model validator would
+ * reject it, and a reader that did not validate would drop the wrapper. The
+ * envelope is a local draft of one editing session, so it is refused and
+ * re-taken rather than migrated.
+ */
+declare const AUTOSAVE_FORMAT_VERSION = 3;
 type DecodedAutoSave = {
   document: document_d_exports.Document;
   savedAt: string;

package/dist/managers/autoSaveCodec.js

@@ -1,13 +1,15 @@
 import { validateFolioDocumentModel } from "../docx/modelValidation.js";
+import { bytesToBase64 } from "../utils/base64.js";
 //#region src/managers/autoSaveCodec.ts
-const AUTOSAVE_FORMAT_VERSION = 2;
-const BASE64_CHUNK_BYTES = 32768;
-const encodeBase64 = (buffer) => {
-	const bytes = new Uint8Array(buffer);
-	const chunks = [];
-	for (let offset = 0; offset < bytes.length; offset += BASE64_CHUNK_BYTES) chunks.push(String.fromCharCode(...bytes.subarray(offset, offset + BASE64_CHUNK_BYTES)));
-	return btoa(chunks.join(""));
-};
+/**
+* Version 3 renamed the model's `bidiWrapper` to `inlineWrapper` and gave it a
+* `kind`. The codec serialises the model itself, so a version-2 envelope holds
+* paragraph content under the old discriminator: the model validator would
+* reject it, and a reader that did not validate would drop the wrapper. The
+* envelope is a local draft of one editing session, so it is refused and
+* re-taken rather than migrated.
+*/
+const AUTOSAVE_FORMAT_VERSION = 3;
 const decodeBase64 = (value) => {
 	const binary = atob(value);
 	const bytes = new Uint8Array(binary.length);
@@ -23,7 +25,7 @@ const encodeValue = (value) => {
 	};
 	if (value instanceof ArrayBuffer) return {
 		type: "arrayBuffer",
-		value: encodeBase64(value)
+		value: bytesToBase64(new Uint8Array(value))
 	};
 	if (value instanceof Map) return {
 		type: "map",
@@ -86,20 +88,20 @@ const encodeAutoSaveDocument = (document) => {
 	};
 	return { json: JSON.stringify(encodeValue(snapshot)) };
 };
-const encodeAutoSaveEnvelopeFromDocument = (document, savedAt) => `{"document":${document.json},"savedAt":${JSON.stringify(savedAt)},"version":2}`;
+const encodeAutoSaveEnvelopeFromDocument = (document, savedAt) => `{"document":${document.json},"savedAt":${JSON.stringify(savedAt)},"version":3}`;
 const encodeAutoSaveEnvelope = (document, savedAt) => encodeAutoSaveEnvelopeFromDocument(encodeAutoSaveDocument(document), savedAt);
 const decodeAutoSaveEnvelope = (json) => {
 	try {
 		const parsed = JSON.parse(json);
 		if (typeof parsed !== "object" || !parsed || !("document" in parsed) || !("savedAt" in parsed) || !("version" in parsed)) return null;
-		if (parsed.version !== 2 || typeof parsed.savedAt !== "string" || !Number.isFinite(Date.parse(parsed.savedAt))) return null;
+		if (parsed.version !== 3 || typeof parsed.savedAt !== "string" || !Number.isFinite(Date.parse(parsed.savedAt))) return null;
 		const document = decodeValue(parsed.document);
 		if (typeof document !== "object" || !document) return null;
 		if (!validateFolioDocumentModel(document).valid) return null;
 		return {
 			document,
 			savedAt: parsed.savedAt,
-			version: 2
+			version: 3
 		};
 	} catch {
 		return null;

package/dist/markdown/images.js

@@ -1,3 +1,4 @@
+import { bytesToBase64 } from "../utils/base64.js";
 //#region src/markdown/images.ts
 const MIME_TO_EXT = {
 	"image/png": "png",
@@ -14,10 +15,6 @@ const MIME_TO_EXT = {
 function extFor(mimeType, fallback) {
 	return MIME_TO_EXT[mimeType] ?? fallback;
 }
-function bytesToBase64(bytes) {
-	if (typeof Buffer !== "undefined") return Buffer.from(bytes).toString("base64");
-	return btoa(new TextDecoder("latin1").decode(bytes));
-}
 function toUint8(data) {
 	if (data instanceof Uint8Array) return data;
 	return new Uint8Array(data);

package/dist/markdown/renderBlock.js

@@ -71,6 +71,7 @@ function renderBlocks(ctx, pkg, blocks) {
 			}
 			break;
 		}
+		case "preservedBlock": break;
 		default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);
 	}
 	return out.join("\n");

package/dist/markdown/renderRuns.d.ts

@@ -5,6 +5,6 @@ import { RenderContext } from "./types.js";
  * Render the full inline content of a paragraph, tracking comment-range
  * boundaries to apply the configured wrapper.
  */
-declare function renderParagraphInline(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, content: document_d_exports.ParagraphContent[], paraId: string | undefined): string;
+declare function renderParagraphInline(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, content: readonly document_d_exports.ParagraphContent[], paraId: string | undefined): string;
 //#endregion
 export { renderParagraphInline };

package/dist/markdown/renderRuns.js

@@ -76,6 +76,9 @@ function renderRunContent(ctx, pkg, content, paraId) {
 		case "noBreakHyphen":
 			out += "‑";
 			break;
+		case "preservedXml":
+			out += escapeInline(item.text);
+			break;
 		case "footnoteRef":
 		case "endnoteRef": {
 			if (ctx.opts.footnotes === "strip") break;
@@ -147,10 +150,23 @@ function renderHyperlink(ctx, pkg, link, paraId) {
 }
 function renderTrackedWrapper(ctx, pkg, wrapper, paraId) {
 	const renderChild = (child) => {
-		if (child.type === "run") return renderRun(ctx, pkg, child, paraId);
-		if (child.type === "hyperlink") return renderHyperlink(ctx, pkg, child, paraId);
-		if (child.type === "mathEquation") return child.plainText ? escapeInline(child.plainText) : "";
-		return "";
+		switch (child.type) {
+			case "run": return renderRun(ctx, pkg, child, paraId);
+			case "hyperlink": return renderHyperlink(ctx, pkg, child, paraId);
+			case "mathEquation": return child.plainText ? escapeInline(child.plainText) : "";
+			case "inlineWrapper":
+			case "inlineSdt": return renderParagraphInline(ctx, pkg, child.content, paraId);
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return renderTrackedWrapper(ctx, pkg, child, paraId);
+			case "simpleField":
+			case "complexField": return renderParagraphInline(ctx, pkg, [child], paraId);
+			case "bookmarkStart":
+			case "bookmarkEnd":
+			case "preservedInline": return "";
+			default: return child;
+		}
 	};
 	if (ctx.opts.trackedChanges === "clean") {
 		if (wrapper.type === "insertion" || wrapper.type === "moveTo") return wrapper.content.map(renderChild).join("");
@@ -196,10 +212,17 @@ function renderParagraphInline(ctx, pkg, content, paraId) {
 		case "simpleField":
 		case "complexField": {
 			const runs = item.type === "simpleField" ? item.content : item.fieldResult;
-			for (const child of runs) out += child.type === "run" ? renderRun(ctx, pkg, child, paraId) : renderHyperlink(ctx, pkg, child, paraId);
+			for (const child of runs) {
+				if (child.type === "run") {
+					out += renderRun(ctx, pkg, child, paraId);
+					continue;
+				}
+				out += child.type === "hyperlink" ? renderHyperlink(ctx, pkg, child, paraId) : child.text;
+			}
 			break;
 		}
 		case "inlineSdt":
+		case "inlineWrapper":
 			out += renderParagraphInline(ctx, pkg, item.content, paraId);
 			break;
 		case "mathEquation":

package/dist/markdown/renderTable.js

@@ -113,7 +113,7 @@ function renderHtmlCell(ctx, pkg, cell) {
 	for (const item of cell.content) if (item.type === "paragraph") {
 		const inner = renderHtmlInline(ctx, pkg, item.content, item.paraId);
 		if (inner) parts.push(inner);
-	} else {
+	} else if (item.type === "table") {
 		const nested = renderHtmlTable(ctx, pkg, item.rows, true);
 		if (nested) parts.push(nested);
 	}
@@ -148,6 +148,7 @@ function renderHtmlInline(ctx, pkg, content, paraId) {
 			break;
 		}
 		case "inlineSdt":
+		case "inlineWrapper":
 			out += renderHtmlInline(ctx, pkg, item.content, paraId);
 			break;
 		case "mathEquation":
@@ -159,10 +160,23 @@ function renderHtmlInline(ctx, pkg, content, paraId) {
 }
 function renderHtmlChildren(ctx, pkg, children, paraId) {
 	return children.map((child) => {
-		if (child.type === "run") return renderHtmlRun(ctx, pkg, child, paraId);
-		if (child.type === "hyperlink") return renderHtmlHyperlink(ctx, pkg, child, paraId);
-		if (child.type === "mathEquation") return child.plainText ? escapeHtml(child.plainText) : "";
-		return "";
+		switch (child.type) {
+			case "run": return renderHtmlRun(ctx, pkg, child, paraId);
+			case "hyperlink": return renderHtmlHyperlink(ctx, pkg, child, paraId);
+			case "mathEquation": return child.plainText ? escapeHtml(child.plainText) : "";
+			case "inlineWrapper":
+			case "inlineSdt":
+			case "simpleField":
+			case "complexField":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return renderHtmlInline(ctx, pkg, [child], paraId);
+			case "bookmarkStart":
+			case "bookmarkEnd":
+			case "preservedInline": return "";
+			default: return child;
+		}
 	}).join("");
 }
 function renderHtmlRun(ctx, pkg, run, paraId) {
@@ -184,6 +198,9 @@ function renderHtmlRun(ctx, pkg, run, paraId) {
 		case "noBreakHyphen":
 			text += "‑";
 			break;
+		case "preservedXml":
+			text += escapeHtml(item.text);
+			break;
 		case "softHyphen": break;
 		case "drawing": {
 			const ref = resolveRelationshipIdOfType(pkg?.relationships, item.image.rId, RELATIONSHIP_TYPES.image);

package/dist/markdown/trailers.js

@@ -65,12 +65,15 @@ function inlineText(content) {
 		case "moveFrom":
 		case "moveTo":
 		case "inlineSdt":
-		case "bidiWrapper":
+		case "inlineWrapper":
 			out += inlineText(item.content);
 			break;
 		case "mathEquation":
 			out += item.plainText ?? "";
 			break;
+		case "preservedInline":
+			out += item.text;
+			break;
 		case "bookmarkStart":
 		case "bookmarkEnd":
 		case "commentRangeStart":