@segnavia/idml 0.33.0 → 0.34.0

package/dist/styles.js

@@ -1,11 +1,13 @@
 import { idmlDirection, localName } from "./xml.js";
 import { resolveSwatchColor } from "./swatch-color.js";
-import { stylePropertyMapping } from "./style-mappings.js";
+import { paragraphBoxDeclarations } from "./paragraph-box.js";
+import { STYLE_PROPERTY_MAPPINGS, stylePropertyMapping } from "./style-mappings.js";
 import { reportableStyleProperties } from "./style-property-report.js";
 import { isTag } from "domhandler";
 //#region src/styles.ts
 const PARAGRAPH_ROOT = "$ID/[No paragraph style]";
 const CHARACTER_ROOT = "$ID/[No character style]";
+const OBJECT_ROOT = "$ID/[None]";
 function text(element) {
 	return element.children.map((child) => "data" in child ? child.data : isTag(child) ? text(child) : "").join("").trim();
 }
@@ -21,14 +23,18 @@ function properties(element) {
 }
 function parseStyles(roots, part) {
 	const result = [];
-	for (const kind of ["ParagraphStyle", "CharacterStyle"]) for (const element of roots.filter((candidate) => localName(candidate.name) === kind)) {
+	for (const kind of [
+		"ParagraphStyle",
+		"CharacterStyle",
+		"ObjectStyle"
+	]) for (const element of roots.filter((candidate) => localName(candidate.name) === kind)) {
 		const values = properties(element);
 		const id = values.Self;
 		if (!id) continue;
 		result.push({
 			id,
 			name: values.Name ?? id.split("/").at(-1) ?? id,
-			kind: kind === "ParagraphStyle" ? "paragraph" : "character",
+			kind: kind === "ParagraphStyle" ? "paragraph" : kind === "CharacterStyle" ? "character" : "object",
 			...values.BasedOn ? { basedOn: values.BasedOn } : {},
 			properties: Object.fromEntries(Object.entries(values).filter(([name]) => ![
 				"Self",
@@ -59,7 +65,32 @@ function parseSwatches(roots) {
 	return result;
 }
 function rootName(kind) {
-	return kind === "paragraph" ? PARAGRAPH_ROOT : CHARACTER_ROOT;
+	return kind === "paragraph" ? PARAGRAPH_ROOT : kind === "character" ? CHARACTER_ROOT : OBJECT_ROOT;
+}
+function findStyle(styles, id, kind) {
+	if (!id) return void 0;
+	const exact = styles.find((style) => style.id === id);
+	if (exact?.kind === kind) return exact;
+	return styles.find((style) => style.kind === kind && (style.name === id || style.id.endsWith(`/${id}`)));
+}
+function rootStyle(styles, kind) {
+	return styles.find((style) => style.kind === kind && (style.name === rootName(kind) || style.id.endsWith(`/${rootName(kind)}`)));
+}
+function styleChain(styles, id, kind) {
+	const root = rootStyle(styles, kind);
+	const chain = [];
+	const seen = /* @__PURE__ */ new Set();
+	let current = findStyle(styles, id, kind);
+	while (current && !seen.has(current.id)) {
+		seen.add(current.id);
+		chain.unshift(current);
+		current = findStyle(styles, current.basedOn, kind);
+	}
+	if (root && !chain.includes(root)) chain.unshift(root);
+	return chain;
+}
+function flattenedStyle(styles, id, kind) {
+	return Object.assign({}, ...styleChain(styles, id, kind).map((style) => style.properties));
 }
 function slug(value) {
 	return value.normalize("NFKD").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") || "style";
@@ -92,6 +123,21 @@ function resolvedFontProperties(changed, resolved) {
 		...resolved.FontStyle === void 0 ? {} : { FontStyle: resolved.FontStyle }
 	};
 }
+const PARAGRAPH_BOX_PROPERTIES = [
+	"SpaceBefore",
+	"SpaceAfter",
+	"LeftIndent",
+	"RightIndent",
+	...Object.keys(STYLE_PROPERTY_MAPPINGS).filter((name) => name.startsWith("ParagraphShading"))
+];
+function paragraphBoxOverrideProperties(changed, resolved, base) {
+	const touchesBox = Object.keys(changed).some((name) => PARAGRAPH_BOX_PROPERTIES.includes(name));
+	const hasShading = [base.ParagraphShadingOn, resolved.ParagraphShadingOn].some((value) => value?.trim().toLowerCase() === "true");
+	if (!touchesBox || !hasShading) return changed;
+	const output = { ...changed };
+	for (const name of PARAGRAPH_BOX_PROPERTIES) if (resolved[name] !== void 0) output[name] = resolved[name];
+	return output;
+}
 var StyleMapper = class {
 	swatches;
 	report;
@@ -110,6 +156,7 @@ var StyleMapper = class {
 		this.byId = new Map(styles.map((style) => [style.id, style]));
 		const taken = /* @__PURE__ */ new Set();
 		for (const style of styles) {
+			if (style.kind === "object") continue;
 			const base = `${style.kind === "paragraph" ? "idml-p-" : "idml-c-"}${slug(style.name)}`;
 			let candidate = base;
 			let suffix = 2;
@@ -119,20 +166,10 @@ var StyleMapper = class {
 		}
 	}
 	flattened(id, kind) {
-		return Object.assign({}, ...this.styleChain(id, kind).map((style) => style.properties));
+		return flattenedStyle([...this.byId.values()], id, kind);
 	}
 	styleChain(id, kind) {
-		const root = this.rootStyle(kind);
-		const chain = [];
-		const seen = /* @__PURE__ */ new Set();
-		let current = this.findStyle(id, kind);
-		while (current && !seen.has(current.id)) {
-			seen.add(current.id);
-			chain.unshift(current);
-			current = this.findStyle(current.basedOn, kind);
-		}
-		if (root && !chain.includes(root)) chain.unshift(root);
-		return chain;
+		return styleChain([...this.byId.values()], id, kind);
 	}
 	styleClass(id, _kind) {
 		if (!id || id.includes("[None]") || id.includes("[No character style]")) return void 0;
@@ -142,11 +179,13 @@ var StyleMapper = class {
 		return value;
 	}
 	overrideClass(values, base, directionValue, location, styleDirection) {
-		const changed = Object.fromEntries(Object.entries(values).filter(([name, value]) => stylePropertyMapping(name)?.kind !== "non-formatting" && value !== base[name]));
+		let changed = Object.fromEntries(Object.entries(values).filter(([name, value]) => stylePropertyMapping(name)?.kind !== "non-formatting" && value !== base[name]));
 		const resolved = {
 			...base,
 			...values
 		};
+		const resetShading = base.ParagraphShadingOn?.trim().toLowerCase() === "true" && values.ParagraphShadingOn?.trim().toLowerCase() === "false";
+		changed = paragraphBoxOverrideProperties(changed, resolved, base);
 		for (const name of reportableStyleProperties(changed, resolved)) this.report.add(this.report.unsupportedOverrideProperties, name, location);
 		if (changed.AppliedFont !== void 0 || changed.FontStyle !== void 0) this.report.font(resolved.AppliedFont, resolved.FontStyle, location);
 		const cssProperties = Object.fromEntries(Object.entries(changed).filter(([name]) => stylePropertyMapping(name)?.kind === "css"));
@@ -156,7 +195,7 @@ var StyleMapper = class {
 			for (const name of ["Justification"]) if (base[name] !== void 0 && cssProperties[name] === void 0) cssProperties[name] = base[name];
 		}
 		if (Object.keys(cssProperties).length === 0) return void 0;
-		const key = JSON.stringify(Object.entries(cssProperties).sort(([a], [b]) => a.localeCompare(b))) + directionValue;
+		const key = JSON.stringify(Object.entries(cssProperties).sort(([a], [b]) => a.localeCompare(b))) + directionValue + resetShading;
 		const found = this.overrides.get(key);
 		if (found) return found.name;
 		const name = `idml-o-${this.overrides.size + 1}`;
@@ -164,7 +203,8 @@ var StyleMapper = class {
 			name,
 			properties: cssProperties,
 			direction: directionValue,
-			location
+			location,
+			resetShading
 		});
 		return name;
 	}
@@ -194,16 +234,16 @@ var StyleMapper = class {
 			this.reportUnmappedStyleProperties(style);
 			this.report.font(values.AppliedFont, values.FontStyle, style.location);
 			const dir = style.kind === "paragraph" ? this.paragraphStyleDirection(values) : this.bookDirection;
-			const declarations = this.declarations(values, dir, style.location);
+			const declarations = this.declarations(values, dir, style.location, this.report.unsupportedStyleProperties, false);
 			rules.push(`.${name}{${declarations}}`);
 		}
 		for (const value of this.overrides.values()) {
-			const declarations = this.declarations(value.properties, value.direction, value.location, this.report.unsupportedOverrideProperties);
+			const declarations = this.declarations(value.properties, value.direction, value.location, this.report.unsupportedOverrideProperties, value.resetShading);
 			if (declarations) rules.push(`.${value.name}{${declarations}}`);
 		}
 		return rules.join("");
 	}
-	declarations(values, dir, location, unsupported = this.report.unsupportedStyleProperties) {
+	declarations(values, dir, location, unsupported, resetShading) {
 		const output = [];
 		output.push(...this.fonts?.declarations(values.AppliedFont, values.FontStyle, location) ?? []);
 		const mapped = new Set(Object.keys(values).filter((name) => stylePropertyMapping(name)?.kind === "css"));
@@ -217,13 +257,17 @@ var StyleMapper = class {
 		else pt("Leading", "line-height");
 		const tracking = Number(values.Tracking);
 		if (mapped.has("Tracking") && Number.isFinite(tracking)) output.push(`letter-spacing:${tracking / 1e3}em`);
-		pt("SpaceBefore", "margin-block-start");
-		pt("SpaceAfter", "margin-block-end");
 		pt("FirstLineIndent", "text-indent");
-		const startIndent = dir === "rtl" ? "RightIndent" : "LeftIndent";
-		const endIndent = dir === "rtl" ? "LeftIndent" : "RightIndent";
-		pt(startIndent, "padding-inline-start");
-		pt(endIndent, "padding-inline-end");
+		output.push(...paragraphBoxDeclarations({
+			values,
+			mapped,
+			resetShading,
+			direction: dir,
+			swatches: this.swatches,
+			report: this.report,
+			unsupported,
+			location
+		}));
 		textDeclarations(values, mapped, output);
 		if (mapped.has("Justification")) this.justification(values.Justification, dir, output, location, unsupported);
 		if (hasCssMapping(mapped, "keeps")) this.keeps(values, output);
@@ -233,13 +277,10 @@ var StyleMapper = class {
 		return output.join(";");
 	}
 	findStyle(id, kind) {
-		if (!id) return void 0;
-		const exact = this.byId.get(id);
-		if (exact?.kind === kind) return exact;
-		return [...this.byId.values()].find((style) => style.kind === kind && (style.name === id || style.id.endsWith(`/${id}`)));
+		return findStyle([...this.byId.values()], id, kind);
 	}
 	rootStyle(kind) {
-		return [...this.byId.values()].find((style) => style.kind === kind && (style.name === rootName(kind) || style.id.endsWith(`/${rootName(kind)}`)));
+		return rootStyle([...this.byId.values()], kind);
 	}
 	reportUnmappedStyleProperties(style) {
 		const root = this.rootStyle(style.kind);
@@ -279,4 +320,4 @@ var StyleMapper = class {
 	}
 };
 //#endregion
-export { StyleMapper, parseStyles, parseSwatches };
+export { StyleMapper, flattenedStyle, parseStyles, parseSwatches };

package/dist/swatch-color.js

@@ -1,15 +1,15 @@
 //#region src/swatch-color.ts
 const colorComponent = (value) => Math.round(value + 1e-9);
-function unresolved(id, location, use, report) {
-	report.add(report.unsupportedStyleProperties, `FillColor:${id}`, location);
+function unresolved(id, location, use, report, property) {
+	report.add(report.unsupportedStyleProperties, `${property}:${id}`, location);
 	return use === "fill" ? "currentColor" : void 0;
 }
-function resolveSwatchColor(id, swatches, report, location, use) {
+function resolveSwatchColor(id, swatches, report, location, use, property = "FillColor") {
 	if (!id || id.endsWith("/None") || id === "None") return use === "fill" ? "none" : void 0;
 	if (id.endsWith("/Black") || id === "Black") return "#000";
 	if (id.endsWith("/Paper") || id === "Paper") return "#fff";
 	const swatch = swatches.find((value) => value.id === id || value.name === id);
-	if (!swatch) return unresolved(id, location, use, report);
+	if (!swatch) return unresolved(id, location, use, report, property);
 	if (swatch.model === "spot") {
 		report.add(report.spotColors, swatch.name, location);
 		return use === "fill" ? "currentColor" : void 0;
@@ -19,7 +19,7 @@ function resolveSwatchColor(id, swatches, report, location, use) {
 		const [c, m, y, k] = swatch.values.map((value) => value / 100);
 		return `rgb(${colorComponent(255 * (1 - c) * (1 - k))} ${colorComponent(255 * (1 - m) * (1 - k))} ${colorComponent(255 * (1 - y) * (1 - k))})`;
 	}
-	return unresolved(id, location, use, report);
+	return unresolved(id, location, use, report, property);
 }
 //#endregion
 export { resolveSwatchColor };

package/dist/types.d.ts

@@ -10,7 +10,7 @@ export interface IdmlTextNode {
 export interface IdmlStyle {
   id: string;
   name: string;
-  kind: 'paragraph' | 'character';
+  kind: 'paragraph' | 'character' | 'object';
   basedOn?: string;
   properties: Record<string, string>;
   location: string;
@@ -87,6 +87,24 @@ export interface IdmlStory {
   root?: IdmlTextNode;
   frame?: IdmlFramePreference;
 }
+export interface IdmlAnchoredFrame {
+  story: string;
+  location: string;
+  width?: number;
+  position: string;
+  anchorYoffset?: number;
+  fill?: string;
+  stroke?: {
+    color: string;
+    weight: number;
+  };
+  corners?: {
+    topLeft?: number;
+    topRight?: number;
+    bottomLeft?: number;
+    bottomRight?: number;
+  };
+}
 export interface IdmlTextVariable {
   id: string;
   name: string;
@@ -111,6 +129,7 @@ export interface IdmlDocumentPreferences {
 export interface IdmlPage {
   id: string;
   appliedMaster?: string;
+  showMasterItems?: boolean;
   stories: string[];
   side?: 'left' | 'right' | 'single';
   bodyFrames?: IdmlFramePlacement[];
@@ -140,6 +159,7 @@ export interface IdmlMasterSpread {
   id: string;
   name: string;
   basedOn?: string;
+  showMasterItems?: boolean;
   pages: IdmlMasterPage[];
   unmappedItems: {
     type: string;

package/dist/unsupported-elements.js

@@ -39,6 +39,7 @@ const MAPPED_ELEMENTS = /* @__PURE__ */ new Set([
 	"CharacterStyleGroup",
 	"ParagraphStyle",
 	"CharacterStyle",
+	"AnchoredObjectSetting",
 	"Color",
 	"TextVariable",
 	"MatchCharacterStylePreference",
@@ -48,7 +49,7 @@ function insideMappedResource(element) {
 	let parent = element.parent;
 	while (parent && "name" in parent) {
 		const name = localName(parent.name);
-		if (name === "ParagraphStyle" || name === "CharacterStyle" || name === "Color") return true;
+		if (name === "ParagraphStyle" || name === "CharacterStyle" || name === "ObjectStyle" || name === "Color") return true;
 		parent = parent.parent;
 	}
 	return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@segnavia/idml",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@segnavia/format": "0.33.0",
-    "@segnavia/html": "0.33.0",
+    "@segnavia/format": "0.34.0",
+    "@segnavia/html": "0.34.0",
     "dom-serializer": "^2.0.0",
     "domhandler": "^5.0.3",
     "htmlparser2": "^10.0.0"