reamkit 1.21.0 → 1.23.0

package/dist/esm/layout/page-doc.js

@@ -5,30 +5,46 @@ function paintPlan(commands) {
 	const borders = [];
 	const shapes = [];
 	const lines = [];
-	for (const c of commands) switch (c.type) {
-		case "fill":
-			fills.push(c);
-			break;
-		case "image":
-			images.push(c);
-			break;
-		case "border":
-			borders.push(c);
-			break;
-		case "shape":
-			shapes.push(c);
-			break;
-		case "line":
-			lines.push(c);
-			break;
-		default: assertNeverPageItem(c);
+	const pictures = /* @__PURE__ */ new Map();
+	const behind = [];
+	for (const c of commands) {
+		if (c.behind === true) {
+			behind.push(c);
+			continue;
+		}
+		if (c.pictureId !== void 0) {
+			const group = pictures.get(c.pictureId);
+			if (group) group.push(c);
+			else pictures.set(c.pictureId, [c]);
+			continue;
+		}
+		switch (c.type) {
+			case "fill":
+				fills.push(c);
+				break;
+			case "image":
+				images.push(c);
+				break;
+			case "border":
+				borders.push(c);
+				break;
+			case "shape":
+				shapes.push(c);
+				break;
+			case "line":
+				lines.push(c);
+				break;
+			default: assertNeverPageItem(c);
+		}
 	}
 	return {
+		behind,
 		fills,
 		images,
 		borders,
 		shapes,
-		lines
+		lines,
+		pictures: [...pictures.values()]
 	};
 }
 function assertNeverPageItem(item) {

package/dist/esm/layout/styled-layout.d.ts

@@ -1,6 +1,6 @@
 import { BodyElement, Chart, Comment, DocumentInfo, Numbering, Section, SectionProperties, ShapeFill, StyleSheet } from '../core/document-model/index.js';
 import { FontRegistry } from '../core/font/index.js';
-import { FamilyKey } from '../core/fonts/index.js';
+import { SubstituteKey } from '../core/fonts/index.js';
 import { Hyphenator } from '../core/hyphenation/index.js';
 import { Pt, ResourceStore } from '../core/ir/index.js';
 import { LaidOutDocument, PageItem } from './page-doc.js';
@@ -53,7 +53,7 @@ export interface StyledRenderOptions {
      * run uses `registry`), byte-identical to before. `registry` remains the
      * guaranteed fallback for math/chart/default glyphs and any missing family.
      */
-    readonly registriesByFamily?: ReadonlyMap<FamilyKey, FontRegistry>;
+    readonly registriesByFamily?: ReadonlyMap<SubstituteKey, FontRegistry>;
     /**
      * The document's OWN embedded fonts (`word/fonts/*.odttf`, de-obfuscated),
      * keyed by normalized font name. A run whose `w:ascii` matches one renders with