@harbour-enterprises/superdoc 1.17.0-next.22 → 1.17.0-next.26

package/dist/chunks/{DocxZipper-B5QHkGwk.cjs → DocxZipper-B8xyRRbO.cjs}

@@ -1,7 +1,7 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Dp2H1eGw.cjs");
 const require_jszip = require("./jszip-DCT9QYaK.cjs");
 const require_xml_js = require("./xml-js--DznO7Gk.cjs");
-const require_constants = require("./constants-CpniKo9Z.cjs");
+const require_constants = require("./constants-C-hTr4No.cjs");
 const DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 const PDF = "application/pdf";
 const HTML = "text/html";
@@ -1477,8 +1477,8 @@ var DocxZipper = class {
 				this.mediaFiles[name] = fileBase64;
 			} else {
 				const fileBase64 = await zipEntry.async("base64");
-				const extension = this.getFileExtension(name)?.toLowerCase();
-				if (new Set([
+				let extension = this.getFileExtension(name)?.toLowerCase();
+				const imageTypes = new Set([
 					"png",
 					"jpg",
 					"jpeg",
@@ -1489,7 +1489,13 @@ var DocxZipper = class {
 					"wmf",
 					"svg",
 					"webp"
-				]).has(extension)) {
+				]);
+				let detectedType = null;
+				if (!imageTypes.has(extension) || extension === "tmp") {
+					detectedType = require_constants.detectImageType(fileBase64);
+					if (detectedType) extension = detectedType;
+				}
+				if (imageTypes.has(extension)) {
 					this.mediaFiles[name] = `data:image/${extension};base64,${fileBase64}`;
 					const blob = await zipEntry.async("blob");
 					const fileObj = new File([blob], name, { type: blob.type });

package/dist/chunks/{DocxZipper-CXjNiywL.es.js → DocxZipper-B9Uo1uiZ.es.js}

@@ -1,7 +1,7 @@
 import { o as __toESM } from "./rolldown-runtime-B2q5OVn9.es.js";
 import { t as require_jszip_min } from "./jszip-ChlR43oI.es.js";
 import { t as require_lib } from "./xml-js-DLE8mr0n.es.js";
-import { m as getContentTypesFromXml, o as base64ToUint8Array, t as COMMENT_FILE_BASENAMES } from "./constants-DBKi0Amm.es.js";
+import { d as detectImageType, h as getContentTypesFromXml, o as base64ToUint8Array, t as COMMENT_FILE_BASENAMES } from "./constants-Dw0kAsLd.es.js";
 const DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 const PDF = "application/pdf";
 const HTML = "text/html";
@@ -1477,8 +1477,8 @@ var DocxZipper = class {
 				this.mediaFiles[name] = fileBase64;
 			} else {
 				const fileBase64 = await zipEntry.async("base64");
-				const extension = this.getFileExtension(name)?.toLowerCase();
-				if (new Set([
+				let extension = this.getFileExtension(name)?.toLowerCase();
+				const imageTypes = new Set([
 					"png",
 					"jpg",
 					"jpeg",
@@ -1489,7 +1489,13 @@ var DocxZipper = class {
 					"wmf",
 					"svg",
 					"webp"
-				]).has(extension)) {
+				]);
+				let detectedType = null;
+				if (!imageTypes.has(extension) || extension === "tmp") {
+					detectedType = detectImageType(fileBase64);
+					if (detectedType) extension = detectedType;
+				}
+				if (imageTypes.has(extension)) {
 					this.mediaFiles[name] = `data:image/${extension};base64,${fileBase64}`;
 					const blob = await zipEntry.async("blob");
 					const fileObj = new File([blob], name, { type: blob.type });

package/dist/chunks/{SuperConverter-Da2sHpq1.es.js → SuperConverter-BTdYC9eH.es.js}

@@ -2,7 +2,7 @@ import { o as __toESM, r as __export, t as __commonJSMin } from "./rolldown-runt
 import { a as init_dist, i as global } from "./jszip-ChlR43oI.es.js";
 import { t as require_lib } from "./xml-js-DLE8mr0n.es.js";
 import { t as v4_default } from "./uuid-2IzDu5nl.es.js";
-import { A as resolveOpcTargetPath, C as objToPolygon, D as pointsToTwips, E as pixelsToTwips, F as twipsToLines, I as twipsToPixels, L as twipsToPt, M as rgbToHex, N as rotToDegrees, O as polygonToObj, P as twipsToInches, S as normalizeHexColor, T as pixelsToEmu, _ as halfPointToPoints, a as HYPERLINK_RELATIONSHIP_TYPE, b as isValidHexColor, d as eighthPointsToPixels, f as emuToPixels, g as getHexColorFromDocxSystem, h as getDocxHighlightKeywordFromHex, i as HEADER_RELATIONSHIP_TYPE, j as resolveShadingFillColor, k as ptToTwips, l as degreesToRot, n as COMMENT_RELATIONSHIP_TYPES, o as base64ToUint8Array, p as getArrayBufferFromUrl, r as FOOTER_RELATIONSHIP_TYPE, s as computeCrc32Hex, t as COMMENT_FILE_BASENAMES, u as deobfuscateFont, w as pixelsToEightPoints, x as linesToTwips, y as inchesToTwips } from "./constants-DBKi0Amm.es.js";
+import { A as ptToTwips, C as normalizeHexColor, D as pixelsToTwips, E as pixelsToEmu, F as twipsToInches, I as twipsToLines, L as twipsToPixels, M as resolveShadingFillColor, N as rgbToHex, O as pointsToTwips, P as rotToDegrees, R as twipsToPt, S as linesToTwips, T as pixelsToEightPoints, _ as getHexColorFromDocxSystem, a as HYPERLINK_RELATIONSHIP_TYPE, b as inchesToTwips, f as eighthPointsToPixels, g as getDocxHighlightKeywordFromHex, i as HEADER_RELATIONSHIP_TYPE, j as resolveOpcTargetPath, k as polygonToObj, l as degreesToRot, m as getArrayBufferFromUrl, n as COMMENT_RELATIONSHIP_TYPES, o as base64ToUint8Array, p as emuToPixels, r as FOOTER_RELATIONSHIP_TYPE, s as computeCrc32Hex, t as COMMENT_FILE_BASENAMES, u as deobfuscateFont, v as halfPointToPoints, w as objToPolygon, x as isValidHexColor } from "./constants-Dw0kAsLd.es.js";
 import { t as unified } from "./unified-BRHLwnjP.es.js";
 import { r as stringifyPosition } from "./lib-HnbxUP96.es.js";
 import { s as toString } from "./lib-DAB30bX1.es.js";
@@ -10901,6 +10901,54 @@ function extractFillColor(spPr, style) {
 	}
 	return null;
 }
+function extractCustomGeometry(spPr) {
+	const custGeom = spPr?.elements?.find((el) => el.name === "a:custGeom");
+	if (!custGeom) return null;
+	const pathLst = custGeom.elements?.find((el) => el.name === "a:pathLst");
+	if (!pathLst?.elements) return null;
+	const paths = pathLst.elements.filter((el) => el.name === "a:path").map((pathEl) => {
+		const w = parseInt(pathEl.attributes?.["w"] || "0", 10);
+		const h = parseInt(pathEl.attributes?.["h"] || "0", 10);
+		return {
+			d: convertDrawingMLPathToSvg(pathEl),
+			w,
+			h
+		};
+	}).filter((p) => p.d);
+	if (paths.length === 0) return null;
+	return { paths };
+}
+function convertDrawingMLPathToSvg(pathEl) {
+	if (!pathEl?.elements) return "";
+	const parts = [];
+	for (const cmd of pathEl.elements) switch (cmd.name) {
+		case "a:moveTo": {
+			const pt = cmd.elements?.find((el) => el.name === "a:pt");
+			if (pt) parts.push(`M ${pt.attributes?.["x"] || 0} ${pt.attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:lnTo": {
+			const pt = cmd.elements?.find((el) => el.name === "a:pt");
+			if (pt) parts.push(`L ${pt.attributes?.["x"] || 0} ${pt.attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:cubicBezTo": {
+			const pts = cmd.elements?.filter((el) => el.name === "a:pt") || [];
+			if (pts.length === 3) parts.push(`C ${pts[0].attributes?.["x"] || 0} ${pts[0].attributes?.["y"] || 0} ${pts[1].attributes?.["x"] || 0} ${pts[1].attributes?.["y"] || 0} ${pts[2].attributes?.["x"] || 0} ${pts[2].attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:quadBezTo": {
+			const pts = cmd.elements?.filter((el) => el.name === "a:pt") || [];
+			if (pts.length === 2) parts.push(`Q ${pts[0].attributes?.["x"] || 0} ${pts[0].attributes?.["y"] || 0} ${pts[1].attributes?.["x"] || 0} ${pts[1].attributes?.["y"] || 0}`);
+			break;
+		}
+		case "a:close":
+			parts.push("Z");
+			break;
+		default: break;
+	}
+	return parts.join(" ");
+}
 function extractGradientFill(gradFill) {
 	const gradient = {
 		type: "gradient",
@@ -11519,6 +11567,155 @@ var Blob$2 = class Blob$2 {
 		return ret;
 	}
 };
+var BitmapCoreHeader$1 = class {
+	constructor(reader, skipsize) {
+		if (skipsize) reader.skip(4);
+		this.width = reader.readUint16();
+		this.height = reader.readUint16();
+		this.planes = reader.readUint16();
+		this.bitcount = reader.readUint16();
+	}
+	colors() {
+		return this.bitcount <= 8 ? 1 << this.bitcount : 0;
+	}
+};
+var BitmapInfoHeader$1 = class {
+	constructor(reader, skipsize) {
+		if (skipsize) reader.skip(4);
+		this.width = reader.readInt32();
+		this.height = reader.readInt32();
+		this.planes = reader.readUint16();
+		this.bitcount = reader.readUint16();
+		this.compression = reader.readUint32();
+		this.sizeimage = reader.readUint32();
+		this.xpelspermeter = reader.readInt32();
+		this.ypelspermeter = reader.readInt32();
+		this.clrused = reader.readUint32();
+		this.clrimportant = reader.readUint32();
+	}
+	colors() {
+		if (this.clrused !== 0) return this.clrused < 256 ? this.clrused : 256;
+		else return this.bitcount > 8 ? 0 : 1 << this.bitcount;
+	}
+};
+var BitmapInfo$1 = class {
+	constructor(reader, usergb) {
+		this._usergb = usergb;
+		const hdrsize = reader.readUint32();
+		this._infosize = hdrsize;
+		if (hdrsize === Helper$1.GDI.BITMAPCOREHEADER_SIZE) {
+			this._header = new BitmapCoreHeader$1(reader, false);
+			this._infosize += this._header.colors() * (usergb ? 3 : 2);
+		} else {
+			this._header = new BitmapInfoHeader$1(reader, false);
+			const masks = this._header.compression === Helper$1.GDI.BitmapCompression.BI_BITFIELDS ? 3 : 0;
+			if (hdrsize <= Helper$1.GDI.BITMAPINFOHEADER_SIZE + masks * 4) this._infosize = Helper$1.GDI.BITMAPINFOHEADER_SIZE + masks * 4;
+			this._infosize += this._header.colors() * (usergb ? 4 : 2);
+		}
+	}
+	getWidth() {
+		return this._header.width;
+	}
+	getHeight() {
+		return Math.abs(this._header.height);
+	}
+	infosize() {
+		return this._infosize;
+	}
+	header() {
+		return this._header;
+	}
+};
+var DIBitmap$1 = class {
+	constructor(reader, bitmapInfo) {
+		this._reader = reader;
+		this._offset = reader.pos;
+		this._location = bitmapInfo;
+		this._info = new BitmapInfo$1(reader, true);
+	}
+	getWidth() {
+		return this._info.getWidth();
+	}
+	getHeight() {
+		return this._info.getHeight();
+	}
+	totalSize() {
+		return this._location.header.size + this._location.data.size;
+	}
+	makeBitmapFileHeader() {
+		const buf = /* @__PURE__ */ new ArrayBuffer(14);
+		const view = new Uint8Array(buf);
+		view[0] = 66;
+		view[1] = 77;
+		Helper$1._writeUint32Val(view, 2, this.totalSize() + 14);
+		Helper$1._writeUint32Val(view, 10, this._info.infosize() + 14);
+		return Helper$1._blobToBinary(view);
+	}
+	convertToPNG(bitmapData, width, height, hasAlpha) {
+		const canvas = document.createElement("canvas");
+		canvas.width = width;
+		canvas.height = Math.abs(height);
+		const ctx = canvas.getContext("2d");
+		if (!ctx) throw new Error("Unable to get canvas context for PNG conversion");
+		const imageData = ctx.createImageData(width, Math.abs(height));
+		const pixels = imageData.data;
+		const rowSize = width * 32 + 31 >>> 5 << 2;
+		const absHeight = Math.abs(height);
+		const topDown = height < 0;
+		let alphaUsed = false;
+		if (hasAlpha) for (let y = 0; y < absHeight && !alphaUsed; y++) {
+			const srcY = topDown ? y : absHeight - 1 - y;
+			for (let x = 0; x < width && !alphaUsed; x++) if (bitmapData[srcY * rowSize + x * 4 + 3] > 0) alphaUsed = true;
+		}
+		for (let y = 0; y < absHeight; y++) {
+			const srcY = topDown ? y : absHeight - 1 - y;
+			for (let x = 0; x < width; x++) {
+				const srcOffset = srcY * rowSize + x * 4;
+				const dstOffset = (y * width + x) * 4;
+				pixels[dstOffset] = bitmapData[srcOffset + 2];
+				pixels[dstOffset + 1] = bitmapData[srcOffset + 1];
+				pixels[dstOffset + 2] = bitmapData[srcOffset];
+				pixels[dstOffset + 3] = alphaUsed ? bitmapData[srcOffset + 3] : 255;
+			}
+		}
+		ctx.putImageData(imageData, 0, 0);
+		return canvas.toDataURL("image/png");
+	}
+	base64ref() {
+		const prevpos = this._reader.pos;
+		this._reader.seek(this._offset);
+		const header = this._info.header();
+		if (header instanceof BitmapInfoHeader$1 && header.compression != null) switch (header.compression) {
+			case Helper$1.GDI.BitmapCompression.BI_JPEG:
+				this._reader.seek(this._location.data.off);
+				const jpegData = "data:image/jpeg;base64," + btoa(this._reader.readBinary(this._location.data.size));
+				this._reader.seek(prevpos);
+				return jpegData;
+			case Helper$1.GDI.BitmapCompression.BI_PNG:
+				this._reader.seek(this._location.data.off);
+				const pngData = "data:image/png;base64," + btoa(this._reader.readBinary(this._location.data.size));
+				this._reader.seek(prevpos);
+				return pngData;
+		}
+		if (header instanceof BitmapInfoHeader$1 && header.bitcount === 32) {
+			this._reader.seek(this._location.data.off);
+			const bitmapBytes = new Uint8Array(this._location.data.size);
+			const bitmapData = this._reader.readBinary(this._location.data.size);
+			for (let i = 0; i < this._location.data.size; i++) bitmapBytes[i] = bitmapData.charCodeAt(i);
+			const pngDataUrl = this.convertToPNG(bitmapBytes, header.width, header.height, true);
+			this._reader.seek(prevpos);
+			return pngDataUrl;
+		}
+		let data = this.makeBitmapFileHeader();
+		this._reader.seek(this._location.header.off);
+		data += this._reader.readBinary(this._location.header.size);
+		this._reader.seek(this._location.data.off);
+		data += this._reader.readBinary(this._location.data.size);
+		const ref = "data:image/bmp;base64," + btoa(data);
+		this._reader.seek(prevpos);
+		return ref;
+	}
+};
 var PointS$1 = class PointS$1 {
 	constructor(reader, x, y) {
 		if (reader != null) {
@@ -11917,118 +12114,6 @@ var Scan$1 = class Scan$1 {
 		return this.scanlines.length > 0;
 	}
 };
-var BitmapCoreHeader$1 = class {
-	constructor(reader, skipsize) {
-		if (skipsize) reader.skip(4);
-		this.width = reader.readUint16();
-		this.height = reader.readUint16();
-		this.planes = reader.readUint16();
-		this.bitcount = reader.readUint16();
-	}
-	colors() {
-		return this.bitcount <= 8 ? 1 << this.bitcount : 0;
-	}
-};
-var BitmapInfoHeader$1 = class {
-	constructor(reader, skipsize) {
-		if (skipsize) reader.skip(4);
-		this.width = reader.readInt32();
-		this.height = reader.readInt32();
-		this.planes = reader.readUint16();
-		this.bitcount = reader.readUint16();
-		this.compression = reader.readUint32();
-		this.sizeimage = reader.readUint32();
-		this.xpelspermeter = reader.readInt32();
-		this.ypelspermeter = reader.readInt32();
-		this.clrused = reader.readUint32();
-		this.clrimportant = reader.readUint32();
-	}
-	colors() {
-		if (this.clrused !== 0) return this.clrused < 256 ? this.clrused : 256;
-		else return this.bitcount > 8 ? 0 : 1 << this.bitcount;
-	}
-};
-var BitmapInfo$1 = class {
-	constructor(reader, usergb) {
-		this._usergb = usergb;
-		const hdrsize = reader.readUint32();
-		this._infosize = hdrsize;
-		if (hdrsize === Helper$1.GDI.BITMAPCOREHEADER_SIZE) {
-			this._header = new BitmapCoreHeader$1(reader, false);
-			this._infosize += this._header.colors() * (usergb ? 3 : 2);
-		} else {
-			this._header = new BitmapInfoHeader$1(reader, false);
-			const masks = this._header.compression === Helper$1.GDI.BitmapCompression.BI_BITFIELDS ? 3 : 0;
-			if (hdrsize <= Helper$1.GDI.BITMAPINFOHEADER_SIZE + masks * 4) this._infosize = Helper$1.GDI.BITMAPINFOHEADER_SIZE + masks * 4;
-			this._infosize += this._header.colors() * (usergb ? 4 : 2);
-		}
-	}
-	getWidth() {
-		return this._header.width;
-	}
-	getHeight() {
-		return Math.abs(this._header.height);
-	}
-	infosize() {
-		return this._infosize;
-	}
-	header() {
-		return this._header;
-	}
-};
-var DIBitmap$1 = class {
-	constructor(reader, bitmapInfo) {
-		this._reader = reader;
-		this._offset = reader.pos;
-		this._location = bitmapInfo;
-		this._info = new BitmapInfo$1(reader, true);
-	}
-	getWidth() {
-		return this._info.getWidth();
-	}
-	getHeight() {
-		return this._info.getHeight();
-	}
-	totalSize() {
-		return this._location.header.size + this._location.data.size;
-	}
-	makeBitmapFileHeader() {
-		const buf = /* @__PURE__ */ new ArrayBuffer(14);
-		const view = new Uint8Array(buf);
-		view[0] = 66;
-		view[1] = 77;
-		Helper$1._writeUint32Val(view, 2, this.totalSize() + 14);
-		Helper$1._writeUint32Val(view, 10, this._info.infosize() + 14);
-		return Helper$1._blobToBinary(view);
-	}
-	base64ref() {
-		const prevpos = this._reader.pos;
-		this._reader.seek(this._offset);
-		let mime = "image/bmp";
-		const header = this._info.header();
-		let data;
-		if (header instanceof BitmapInfoHeader$1 && header.compression != null) switch (header.compression) {
-			case Helper$1.GDI.BitmapCompression.BI_JPEG:
-				mime = "data:image/jpeg";
-				break;
-			case Helper$1.GDI.BitmapCompression.BI_PNG:
-				mime = "data:image/png";
-				break;
-			default:
-				data = this.makeBitmapFileHeader();
-				break;
-		}
-		else data = this.makeBitmapFileHeader();
-		this._reader.seek(this._location.header.offset);
-		if (data != null) data += this._reader.readBinary(this._location.header.size);
-		else data = this._reader.readBinary(this._location.header.size);
-		this._reader.seek(this._location.data.offset);
-		data += this._reader.readBinary(this._location.data.size);
-		const ref = "data:" + mime + ";base64," + btoa(data);
-		this._reader.seek(prevpos);
-		return ref;
-	}
-};
 var ColorRef$1 = class ColorRef$1 {
 	constructor(reader, r, g, b) {
 		if (reader != null) {
@@ -12244,6 +12329,9 @@ var EmfHeader = class {
 			}
 		}
 	}
+	getBounds() {
+		return this.bounds;
+	}
 	toString() {
 		return "{bounds: " + this.bounds.toString() + ", frame: " + this.frame.toString() + ", description: " + this.description + "}";
 	}
@@ -12352,11 +12440,11 @@ var EMFRecords = class {
 					const cbBits = reader.readUint32();
 					const pen = new Pen$1(reader, {
 						header: {
-							off: offBmi,
+							off: curpos + offBmi,
 							size: cbBmi
 						},
 						data: {
-							off: offBits,
+							off: curpos + offBits,
 							size: cbBits
 						}
 					});
@@ -12594,6 +12682,37 @@ var EMFRecords = class {
 					});
 					break;
 				}
+				case Helper$1.GDI.RecordType.EMR_STRETCHDIBITS: {
+					new RectL(reader);
+					const xDest = reader.readInt32();
+					const yDest = reader.readInt32();
+					const xSrc = reader.readInt32();
+					const ySrc = reader.readInt32();
+					const cxSrc = reader.readInt32();
+					const cySrc = reader.readInt32();
+					const offBmiSrc = reader.readUint32();
+					const cbBmiSrc = reader.readUint32();
+					const offBitsSrc = reader.readUint32();
+					const cbBitsSrc = reader.readUint32();
+					const iUsageSrc = reader.readUint32();
+					const dwRop = reader.readUint32();
+					const cxDest = reader.readInt32();
+					const cyDest = reader.readInt32();
+					const dib = new DIBitmap$1(reader, {
+						header: {
+							off: curpos + offBmiSrc,
+							size: cbBmiSrc
+						},
+						data: {
+							off: curpos + offBitsSrc,
+							size: cbBitsSrc
+						}
+					});
+					this._records.push((gdi) => {
+						gdi.stretchDibBits(xSrc, ySrc, cxSrc, cySrc, xDest, yDest, cxDest, cyDest, dwRop, iUsageSrc, dib);
+					});
+					break;
+				}
 				case Helper$1.GDI.RecordType.EMR_POLYLINE:
 				case Helper$1.GDI.RecordType.EMR_POLYLINETO:
 				case Helper$1.GDI.RecordType.EMR_POLYPOLYLINE:
@@ -12636,7 +12755,6 @@ var EMFRecords = class {
 				case Helper$1.GDI.RecordType.EMR_MASKBLT:
 				case Helper$1.GDI.RecordType.EMR_PLGBLT:
 				case Helper$1.GDI.RecordType.EMR_SETDIBITSTODEVICE:
-				case Helper$1.GDI.RecordType.EMR_STRETCHDIBITS:
 				case Helper$1.GDI.RecordType.EMR_EXTCREATEFONTINDIRECTW:
 				case Helper$1.GDI.RecordType.EMR_EXTTEXTOUTA:
 				case Helper$1.GDI.RecordType.EMR_EXTTEXTOUTW:
@@ -12683,6 +12801,9 @@ var EMFRecords = class {
 		}
 		if (!all) throw new EMFJSError("Could not read all records");
 	}
+	getBounds() {
+		return this._header.getBounds();
+	}
 	play(gdi) {
 		const len = this._records.length;
 		for (let i = 0; i < len; i++) this._records[i](gdi);
@@ -12832,6 +12953,9 @@ var GDIContext$1 = class {
 		this.state.mapmode = mode;
 		this.state._svggroup = null;
 	}
+	getMapMode() {
+		return this.state.mapmode;
+	}
 	setWindowOrgEx(x, y) {
 		Helper$1.log("[gdi] setWindowOrgEx: x=" + x + " y=" + y);
 		this.state.wx = x;
@@ -12880,6 +13004,20 @@ var GDIContext$1 = class {
 	setStretchBltMode(stretchMode) {
 		Helper$1.log("[gdi] setStretchBltMode: stretchMode=" + stretchMode);
 	}
+	stretchDibBits(srcX, srcY, srcW, srcH, dstX, dstY, dstW, dstH, rasterOp, colorUsage, dib) {
+		Helper$1.log("[gdi] stretchDibBits: srcX=" + srcX + " srcY=" + srcY + " srcW=" + srcW + " srcH=" + srcH + " dstX=" + dstX + " dstY=" + dstY + " dstW=" + dstW + " dstH=" + dstH + " rasterOp=0x" + rasterOp.toString(16));
+		srcX = this._todevX(srcX);
+		srcY = this._todevY(srcY);
+		srcW = this._todevW(srcW);
+		srcH = this._todevH(srcH);
+		dstX = this._todevX(dstX);
+		dstY = this._todevY(dstY);
+		dstW = this._todevW(dstW);
+		dstH = this._todevH(dstH);
+		Helper$1.log("[gdi] stretchDibBits: TRANSLATED: srcX=" + srcX + " srcY=" + srcY + " srcW=" + srcW + " srcH=" + srcH + " dstX=" + dstX + " dstY=" + dstY + " dstW=" + dstW + " dstH=" + dstH + " rasterOp=0x" + rasterOp.toString(16));
+		this._pushGroup();
+		this._svg.image(this.state._svggroup, dstX, dstY, dstW, dstH, dib.base64ref());
+	}
 	rectangle(rect, rw, rh) {
 		Helper$1.log("[gdi] rectangle: rect=" + rect.toString() + " with pen " + this.state.selected.pen.toString() + " and brush " + this.state.selected.brush.toString());
 		const bottom = this._todevY(rect.bottom);
@@ -13327,14 +13465,16 @@ var Renderer$1 = class {
 	}
 	render(info) {
 		const svgElement = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-		this._render(new SVG(svgElement), info.mapMode, info.wExt, info.hExt, info.xExt, info.yExt);
+		const emfBounds = this._img.getBounds();
+		const gdi = this._render(new SVG(svgElement), info.mapMode, emfBounds.width, emfBounds.height, emfBounds.width, emfBounds.height);
 		svgElement.setAttribute("viewBox", [
 			0,
 			0,
-			info.xExt,
-			info.yExt
+			emfBounds.width,
+			emfBounds.height
 		].join(" "));
-		svgElement.setAttribute("preserveAspectRatio", "none");
+		const preserveAspectRatio = gdi.getMapMode() === Helper$1.GDI.MapMode.MM_ANISOTROPIC ? "none" : "xMidYMid meet";
+		svgElement.setAttribute("preserveAspectRatio", preserveAspectRatio);
 		svgElement.setAttribute("width", info.width);
 		svgElement.setAttribute("height", info.height);
 		return svgElement;
@@ -13356,6 +13496,7 @@ var Renderer$1 = class {
 		Helper$1.log("[EMF] BEGIN RENDERING --->");
 		this._img.render(gdi);
 		Helper$1.log("[EMF] <--- DONE RENDERING");
+		return gdi;
 	}
 };
 var EMF = class {
@@ -13366,6 +13507,13 @@ var EMF = class {
 	render(gdi) {
 		this._records.play(gdi);
 	}
+	getBounds() {
+		const bounds = this._records.getBounds();
+		return {
+			width: bounds.right - bounds.left,
+			height: bounds.bottom - bounds.top
+		};
+	}
 };
 var WMFJSError = class extends Error {
 	constructor(message) {
@@ -16530,6 +16678,7 @@ function handleImageNode(node, params, isAnchor) {
 	const blipFill = picture.elements.find((el) => el.name === "pic:blipFill");
 	const blip = blipFill?.elements.find((el) => el.name === "a:blip");
 	if (!blip) return null;
+	const hasGrayscale = blip.elements?.some((el) => el.name === "a:grayscl");
 	const stretch = blipFill?.elements?.find((el) => el.name === "a:stretch");
 	const fillRect = stretch?.elements?.find((el) => el.name === "a:fillRect");
 	const srcRect = blipFill?.elements?.find((el) => el.name === "a:srcRect");
@@ -16625,14 +16774,18 @@ function handleImageNode(node, params, isAnchor) {
 			originalAttributes: node.attributes,
 			rId: relAttributes["Id"],
 			...order.length ? { drawingChildOrder: order } : {},
-			...originalChildren.length ? { originalDrawingChildren: originalChildren } : {}
+			...originalChildren.length ? { originalDrawingChildren: originalChildren } : {},
+			...hasGrayscale ? { grayscale: true } : {}
 		}
 	};
 }
 var handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset, anchorData, wrap$1, isAnchor, isHidden) => {
 	const wsp = graphicData.elements.find((el) => el.name === "wps:wsp");
 	const textBoxContent = wsp.elements.find((el) => el.name === "wps:txbx")?.elements?.find((el) => el.name === "w:txbxContent");
-	if ((wsp.elements.find((el) => el.name === "wps:spPr")?.elements.find((el) => el.name === "a:prstGeom"))?.attributes["prst"]) {
+	const spPr = wsp.elements.find((el) => el.name === "wps:spPr");
+	const shapeType = (spPr?.elements.find((el) => el.name === "a:prstGeom"))?.attributes["prst"];
+	const custGeom = !shapeType ? extractCustomGeometry(spPr) : null;
+	if (shapeType || custGeom) {
 		const result = getVectorShape({
 			params,
 			node,
@@ -16641,7 +16794,8 @@ var handleShapeDrawing = (params, node, graphicData, size, padding, marginOffset
 			marginOffset,
 			anchorData,
 			wrap: wrap$1,
-			isAnchor
+			isAnchor,
+			customGeometry: custGeom
 		});
 		if (result?.attrs && isHidden) result.attrs.hidden = true;
 		if (result) return result;
@@ -16710,6 +16864,7 @@ var handleShapeGroup = (params, node, graphicData, size, padding, marginOffset,
 		const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
 		if (!spPr) return null;
 		const shapeKind = (spPr.elements?.find((el) => el.name === "a:prstGeom"))?.attributes?.["prst"];
+		const customGeom = !shapeKind ? extractCustomGeometry(spPr) : null;
 		const shapeXfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
 		const shapeOff = shapeXfrm?.elements?.find((el) => el.name === "a:off");
 		const shapeExt = shapeXfrm?.elements?.find((el) => el.name === "a:ext");
@@ -16753,6 +16908,7 @@ var handleShapeGroup = (params, node, graphicData, size, padding, marginOffset,
 			shapeType: "vectorShape",
 			attrs: {
 				kind: shapeKind,
+				customGeometry: customGeom || void 0,
 				x,
 				y,
 				width,
@@ -16979,7 +17135,7 @@ var buildShapePlaceholder = (node, size, padding, marginOffset, shapeType) => {
 		attrs
 	};
 };
-function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap$1, isAnchor }) {
+function getVectorShape({ params, node, graphicData, size, marginOffset, anchorData, wrap: wrap$1, isAnchor, customGeometry }) {
 	const schemaAttrs = {};
 	const drawingNode = params.nodes?.[0];
 	if (drawingNode?.name === "w:drawing") schemaAttrs.drawingContent = drawingNode;
@@ -16988,8 +17144,12 @@ function getVectorShape({ params, node, graphicData, size, marginOffset, anchorD
 	const spPr = wsp.elements?.find((el) => el.name === "wps:spPr");
 	if (!spPr) return null;
 	const shapeKind = (spPr.elements?.find((el) => el.name === "a:prstGeom"))?.attributes?.["prst"];
-	if (!shapeKind) console.warn("Shape kind not found");
 	schemaAttrs.kind = shapeKind;
+	if (customGeometry) schemaAttrs.customGeometry = customGeometry;
+	else if (!shapeKind) {
+		const extracted = extractCustomGeometry(spPr);
+		if (extracted) schemaAttrs.customGeometry = extracted;
+	}
 	const width = size?.width ?? DEFAULT_SHAPE_WIDTH;
 	const height = size?.height ?? DEFAULT_SHAPE_HEIGHT;
 	const xfrm = spPr.elements?.find((el) => el.name === "a:xfrm");
@@ -25587,7 +25747,8 @@ const translateImageNode = (params) => {
 								elements: [
 									{
 										name: "a:blip",
-										attributes: { "r:embed": imageId }
+										attributes: { "r:embed": imageId },
+										...attrs.grayscale ? { elements: [{ name: "a:grayscl" }] } : {}
 									},
 									...rawSrcRect ? [rawSrcRect] : [],
 									{
@@ -36996,7 +37157,7 @@ var SuperConverter = class SuperConverter {
 	static getStoredSuperdocVersion(docx) {
 		return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
 	}
-	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.22") {
+	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.26") {
 		return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
 	}
 	static generateWordTimestamp() {