@bendyline/squisq-formats 2.7.3 → 2.7.4

package/dist/{chunk-GRIARAMQ.js → chunk-32AQL6I6.js}

@@ -13,9 +13,10 @@ import {
   fontAwesomeGlyph
 } from "./chunk-LBXBRFBZ.js";
 import {
+  authoredImageSize,
   fitWithin,
   readImageDimensions
-} from "./chunk-RSU3V5IQ.js";
+} from "./chunk-JZR32FON.js";
 
 // src/pdf/export.ts
 import { PDFDocument, StandardFonts, rgb, PDFString } from "pdf-lib";
@@ -1019,9 +1020,10 @@ function renderImageParagraph(node, ctx, x0, width) {
       drawSpans(note, ctx, width, x0);
       continue;
     }
+    const display = authoredImageSize(imageNode, embedded) ?? embedded;
     const size = fitWithin(
-      embedded.width * POINTS_PER_CSS_PIXEL,
-      embedded.height * POINTS_PER_CSS_PIXEL,
+      display.width * POINTS_PER_CSS_PIXEL,
+      display.height * POINTS_PER_CSS_PIXEL,
       width,
       maxHeight
     );

package/dist/{chunk-YITBSNPM.js → chunk-5YYF3Z6C.js}

@@ -67,10 +67,11 @@ import {
   obfuscateDocxFont
 } from "./chunk-LBXBRFBZ.js";
 import {
+  authoredImageSize,
   extToMime,
   fitWithin,
   readImageDimensions
-} from "./chunk-RSU3V5IQ.js";
+} from "./chunk-JZR32FON.js";
 
 // src/docx/export.ts
 import { resolveFontFamily } from "@bendyline/squisq/schemas";
@@ -703,7 +704,8 @@ function convertImage(node, ctx) {
   const ext = contentType.split("/")[1]?.replace("jpeg", "jpg") || "png";
   const filename = `image${ctx.images.length + 1}.${ext}`;
   const { relId, docPrId } = ctx.addImage(data, contentType, filename);
-  const dims = imageEntry.width && imageEntry.height ? { width: imageEntry.width, height: imageEntry.height } : readImageDimensions(data);
+  const natural = imageEntry.width && imageEntry.height ? { width: imageEntry.width, height: imageEntry.height } : readImageDimensions(data);
+  const dims = authoredImageSize(node, natural) ?? natural;
   const EMU_PER_INCH3 = 914400;
   const MAX_WIDTH_EMU2 = 6 * EMU_PER_INCH3;
   const MAX_HEIGHT_EMU2 = 8 * EMU_PER_INCH3;

package/dist/{chunk-ETK2SKVQ.js → chunk-B6UQPW75.js}

@@ -2,7 +2,7 @@ import {
   arrayBufferToBase64DataUrl,
   extractFilename,
   inferMimeType
-} from "./chunk-YVCUNZB5.js";
+} from "./chunk-WMIDXNGR.js";
 import {
   exportImageBytes
 } from "./chunk-VCZUXQUL.js";
@@ -10,6 +10,9 @@ import {
   FootnoteIndex,
   footnoteIds
 } from "./chunk-BXWNU4T5.js";
+import {
+  imageSizeAttributes
+} from "./chunk-JZR32FON.js";
 
 // src/html/index.ts
 import JSZip3 from "jszip";
@@ -504,7 +507,8 @@ function extractFirstImageFromBlock(block) {
       );
       const replacement = remainingKids.length === 0 ? null : { ...b, children: remainingKids };
       return {
-        image: { src: img.url, alt: img.alt ?? "" },
+        // A resized image parses with the size it was given in the editor.
+        image: { src: img.url, alt: img.alt ?? "", width: img.width, height: img.height },
         replacement
       };
     }
@@ -780,7 +784,7 @@ function nodeToHtml(node, ctx) {
       const resolved = ctx?.images?.get(original) ?? original;
       const safeSrc = sanitizeUrl(resolved, "media") ?? svgDataImageToHtmlSrc(resolved);
       if (!safeSrc) return escapeHtml2(node.alt ?? "");
-      return `<img src="${escapeAttr(safeSrc)}" alt="${escapeAttr(node.alt ?? "")}" />`;
+      return `<img src="${escapeAttr(safeSrc)}" alt="${escapeAttr(node.alt ?? "")}"${imageSizeAttributes(node)} />`;
     }
     case "thematicBreak":
       return "<hr />";

package/dist/{chunk-PKFWF4FX.js → chunk-GESOAVYN.js}

@@ -1,7 +1,7 @@
 import {
   extractFilename,
   inferMimeType
-} from "./chunk-YVCUNZB5.js";
+} from "./chunk-WMIDXNGR.js";
 import {
   exportImageBytes,
   svgIslandsAsImages
@@ -21,6 +21,9 @@ import {
   fontAwesomeFaces,
   fontAwesomeGlyph
 } from "./chunk-LBXBRFBZ.js";
+import {
+  imageSizeAttributes
+} from "./chunk-JZR32FON.js";
 
 // src/epub/export.ts
 import JSZip from "jszip";
@@ -432,7 +435,7 @@ function inlineToXhtml(node, ctx) {
       const safeSrc = resolved ? `../images/${resolved.filename}` : sanitizeUrl(node.url, "media");
       if (!safeSrc) return alt;
       const src = escapeXml(safeSrc);
-      return `<img src="${src}" alt="${alt}"/>`;
+      return `<img src="${src}" alt="${alt}"${imageSizeAttributes(node)}/>`;
     }
     case "break":
       return "<br/>";

package/dist/{chunk-RSU3V5IQ.js → chunk-JZR32FON.js}

@@ -65,9 +65,22 @@ function fitWithin(width, height, maxWidth, maxHeight) {
   const scale = Math.min(1, maxWidth / width, maxHeight / height);
   return { width: width * scale, height: height * scale };
 }
+function imageSizeAttributes(image) {
+  return (image.width !== void 0 ? ` width="${image.width}"` : "") + (image.height !== void 0 ? ` height="${image.height}"` : "");
+}
+function authoredImageSize(image, intrinsic) {
+  const { width, height } = image;
+  if (width !== void 0 && height !== void 0) return { width, height };
+  if (!intrinsic || intrinsic.width <= 0 || intrinsic.height <= 0) return void 0;
+  if (width !== void 0) return { width, height: width * intrinsic.height / intrinsic.width };
+  if (height !== void 0) return { width: height * intrinsic.width / intrinsic.height, height };
+  return void 0;
+}
 
 export {
   extToMime,
   readImageDimensions,
-  fitWithin
+  fitWithin,
+  imageSizeAttributes,
+  authoredImageSize
 };

package/dist/{chunk-52RXDH24.js → chunk-OOM2YMXU.js}

@@ -1,6 +1,6 @@
 import {
   inferMimeType
-} from "./chunk-YVCUNZB5.js";
+} from "./chunk-WMIDXNGR.js";
 import {
   RelIdAllocator,
   blipXml,
@@ -63,7 +63,7 @@ import {
 } from "./chunk-LBXBRFBZ.js";
 import {
   extToMime
-} from "./chunk-RSU3V5IQ.js";
+} from "./chunk-JZR32FON.js";
 
 // src/pptx/export.ts
 import { resolveFontFamily, VIEWPORT_PRESETS } from "@bendyline/squisq/schemas";

package/dist/{chunk-CUQ7YITW.js → chunk-RRULGPWV.js}

@@ -262,7 +262,7 @@ function dataReferenceWarnings(doc, formatLabel) {
 }
 async function collectContainerDocxImages(container, signal) {
   const images = await collectContainerImages(container, signal);
-  const { extToMime } = await import("./images-CAWESWRF.js");
+  const { extToMime } = await import("./images-PQCYRJJ5.js");
   return new Map(
     [...images].map(([path, data]) => [
       path,

package/dist/{chunk-GHHIYBUT.js → chunk-VU7M3YV6.js}

@@ -1,7 +1,7 @@
 import {
   convert,
   defaultRegistry
-} from "./chunk-CUQ7YITW.js";
+} from "./chunk-RRULGPWV.js";
 import {
   ConversionError
 } from "./chunk-KXOZMWBS.js";

package/dist/{chunk-YVCUNZB5.js → chunk-WMIDXNGR.js}

@@ -1,6 +1,6 @@
 import {
   extToMime
-} from "./chunk-RSU3V5IQ.js";
+} from "./chunk-JZR32FON.js";
 
 // src/html/imageUtils.ts
 function inferMimeType(filename) {

package/dist/docx/index.js

@@ -4,7 +4,7 @@ import {
   docxToDoc,
   docxToMarkdownDoc,
   markdownDocToDocx
-} from "../chunk-YITBSNPM.js";
+} from "../chunk-5YYF3Z6C.js";
 import "../chunk-XVBQB2SL.js";
 import "../chunk-VCZUXQUL.js";
 import "../chunk-AVOZAKGP.js";
@@ -15,7 +15,7 @@ import "../chunk-7AWFHP5U.js";
 import "../chunk-BXWNU4T5.js";
 import "../chunk-IIQYS2YH.js";
 import "../chunk-LBXBRFBZ.js";
-import "../chunk-RSU3V5IQ.js";
+import "../chunk-JZR32FON.js";
 export {
   docToDocx,
   docxToContainer,

package/dist/epub/index.js

@@ -1,14 +1,14 @@
 import {
   docToEpub,
   markdownDocToEpub
-} from "../chunk-PKFWF4FX.js";
-import "../chunk-YVCUNZB5.js";
+} from "../chunk-GESOAVYN.js";
+import "../chunk-WMIDXNGR.js";
 import "../chunk-VCZUXQUL.js";
 import "../chunk-AVOZAKGP.js";
 import "../chunk-JU2RHXUB.js";
 import "../chunk-BXWNU4T5.js";
 import "../chunk-LBXBRFBZ.js";
-import "../chunk-RSU3V5IQ.js";
+import "../chunk-JZR32FON.js";
 export {
   docToEpub,
   markdownDocToEpub

package/dist/html/index.js

@@ -10,15 +10,15 @@ import {
   markdownDocToPlainHtml,
   markdownDocsToHtmlBundle,
   markdownDocsToPlainHtmlBundle
-} from "../chunk-ETK2SKVQ.js";
+} from "../chunk-B6UQPW75.js";
 import {
   arrayBufferToBase64DataUrl,
   extractFilename,
   inferMimeType
-} from "../chunk-YVCUNZB5.js";
+} from "../chunk-WMIDXNGR.js";
 import "../chunk-VCZUXQUL.js";
 import "../chunk-BXWNU4T5.js";
-import "../chunk-RSU3V5IQ.js";
+import "../chunk-JZR32FON.js";
 export {
   arrayBufferToBase64DataUrl,
   collectImagePaths,

package/dist/images-PQCYRJJ5.js

@@ -0,0 +1,14 @@
+import {
+  authoredImageSize,
+  extToMime,
+  fitWithin,
+  imageSizeAttributes,
+  readImageDimensions
+} from "./chunk-JZR32FON.js";
+export {
+  authoredImageSize,
+  extToMime,
+  fitWithin,
+  imageSizeAttributes,
+  readImageDimensions
+};

package/dist/index.js

@@ -5,11 +5,11 @@ import {
   htmlToMarkdown,
   htmlToMarkdownDoc,
   htmlToMarkdownDocSync
-} from "./chunk-ETK2SKVQ.js";
+} from "./chunk-B6UQPW75.js";
 import {
   docToEpub,
   markdownDocToEpub
-} from "./chunk-PKFWF4FX.js";
+} from "./chunk-GESOAVYN.js";
 import {
   BUILTIN_FORMAT_IDS
 } from "./chunk-2P5HJAQL.js";
@@ -28,7 +28,7 @@ import {
   renderOutsideInDocument,
   withOutsideInMarkdownEditing,
   withOutsideInMetadata
-} from "./chunk-GHHIYBUT.js";
+} from "./chunk-VU7M3YV6.js";
 import {
   DEFAULT_CONVERSION_LIMITS,
   convert,
@@ -37,7 +37,7 @@ import {
   defaultRegistry,
   prepareConversion,
   resolveConversionLimits
-} from "./chunk-CUQ7YITW.js";
+} from "./chunk-RRULGPWV.js";
 import {
   ConversionError
 } from "./chunk-KXOZMWBS.js";
@@ -52,15 +52,15 @@ import {
   docxToDoc,
   docxToMarkdownDoc,
   markdownDocToDocx
-} from "./chunk-YITBSNPM.js";
+} from "./chunk-5YYF3Z6C.js";
 import {
   docToPptx,
   markdownDocToPptx,
   pptxToDoc,
   pptxToMarkdownDoc
-} from "./chunk-52RXDH24.js";
+} from "./chunk-OOM2YMXU.js";
 import "./chunk-6N2J7C2B.js";
-import "./chunk-YVCUNZB5.js";
+import "./chunk-WMIDXNGR.js";
 import "./chunk-XVBQB2SL.js";
 import "./chunk-VCZUXQUL.js";
 import {
@@ -94,12 +94,12 @@ import {
   markdownDocToPdf,
   pdfToDoc,
   pdfToMarkdownDoc
-} from "./chunk-GRIARAMQ.js";
+} from "./chunk-32AQL6I6.js";
 import "./chunk-34KECNZO.js";
 import "./chunk-BXWNU4T5.js";
 import "./chunk-IIQYS2YH.js";
 import "./chunk-LBXBRFBZ.js";
-import "./chunk-RSU3V5IQ.js";
+import "./chunk-JZR32FON.js";
 export {
   BUILTIN_FORMAT_IDS,
   ConversionError,

package/dist/outside-in/index.js

@@ -6,8 +6,8 @@ import {
   renderOutsideInDocument,
   withOutsideInMarkdownEditing,
   withOutsideInMetadata
-} from "../chunk-GHHIYBUT.js";
-import "../chunk-CUQ7YITW.js";
+} from "../chunk-VU7M3YV6.js";
+import "../chunk-RRULGPWV.js";
 import "../chunk-KXOZMWBS.js";
 import {
   OUTSIDE_IN_FORMAT_IDS,

package/dist/pdf/index.js

@@ -5,12 +5,12 @@ import {
   pdfToContainer,
   pdfToDoc,
   pdfToMarkdownDoc
-} from "../chunk-GRIARAMQ.js";
+} from "../chunk-32AQL6I6.js";
 import "../chunk-34KECNZO.js";
 import "../chunk-BXWNU4T5.js";
 import "../chunk-IIQYS2YH.js";
 import "../chunk-LBXBRFBZ.js";
-import "../chunk-RSU3V5IQ.js";
+import "../chunk-JZR32FON.js";
 export {
   configurePdfWorker,
   docToPdf,

package/dist/pptx/index.js

@@ -4,12 +4,12 @@ import {
   pptxToContainer,
   pptxToDoc,
   pptxToMarkdownDoc
-} from "../chunk-52RXDH24.js";
+} from "../chunk-OOM2YMXU.js";
 import {
   analyzePptxLayouts,
   inspectPptxLayouts
 } from "../chunk-6N2J7C2B.js";
-import "../chunk-YVCUNZB5.js";
+import "../chunk-WMIDXNGR.js";
 import "../chunk-XVBQB2SL.js";
 import "../chunk-VCZUXQUL.js";
 import "../chunk-AVOZAKGP.js";
@@ -19,7 +19,7 @@ import "../chunk-S5PCVMKU.js";
 import "../chunk-7AWFHP5U.js";
 import "../chunk-IIQYS2YH.js";
 import "../chunk-LBXBRFBZ.js";
-import "../chunk-RSU3V5IQ.js";
+import "../chunk-JZR32FON.js";
 export {
   analyzePptxLayouts,
   docToPptx,

package/dist/registry/index.js

@@ -9,7 +9,7 @@ import {
   defaultRegistry,
   prepareConversion,
   resolveConversionLimits
-} from "../chunk-CUQ7YITW.js";
+} from "../chunk-RRULGPWV.js";
 import {
   ConversionError
 } from "../chunk-KXOZMWBS.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bendyline/squisq-formats",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Document format converters — DOCX, PDF, OOXML import/export",
   "license": "MIT",
   "author": "Bendyline",
@@ -125,7 +125,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@bendyline/squisq": "2.12.3",
+    "@bendyline/squisq": "2.12.4",
     "@pdf-lib/fontkit": "1.1.1",
     "@pdf-lib/upng": "1.0.1",
     "@xmldom/xmldom": "0.9.12",

package/dist/images-CAWESWRF.js

@@ -1,10 +0,0 @@
-import {
-  extToMime,
-  fitWithin,
-  readImageDimensions
-} from "./chunk-RSU3V5IQ.js";
-export {
-  extToMime,
-  fitWithin,
-  readImageDimensions
-};