@bendyline/squisq-formats 2.8.0 → 2.8.2

package/dist/{chunk-MVSHWYIE.js → chunk-AOY3UPE3.js}

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

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

@@ -799,6 +799,13 @@ function flattenInlines(nodes, ctx, state) {
   }
   return spans;
 }
+var STANDARD_FONT_NAMES = new Set(Object.values(StandardFonts));
+function drawnWidth(font, text, size) {
+  if (!STANDARD_FONT_NAMES.has(font.name)) return font.widthOfTextAtSize(text, size);
+  let width = 0;
+  for (const character of text) width += font.widthOfTextAtSize(character, size);
+  return width;
+}
 function textSpans(ctx, text, font, style) {
   return ctx.runs.split(text, font).map((run) => ({ ...style, text: run.text, font: run.font }));
 }
@@ -813,7 +820,7 @@ function drawTextLine(ctx, text, font, at) {
       font: run.font,
       color: rgb(at.color.r, at.color.g, at.color.b)
     });
-    x += run.font.widthOfTextAtSize(run.text, at.size);
+    x += drawnWidth(run.font, run.text, at.size);
   }
 }
 function pickFont(ctx, bold, italic) {
@@ -839,7 +846,7 @@ function drawSpans(spans, ctx, availableWidth, x0) {
         font: span.font,
         color: rgb(span.color.r, span.color.g, span.color.b)
       });
-      const textWidth = span.font.widthOfTextAtSize(span.text, span.fontSize);
+      const textWidth = drawnWidth(span.font, span.text, span.fontSize);
       if (span.link) {
         const baseline = spanBaseline;
         ctx.page.drawLine({
@@ -890,7 +897,7 @@ function wrapSpans(spans, maxWidth) {
     }
     const words = splitIntoWords(span.text);
     for (const word of words) {
-      const wordWidth = span.font.widthOfTextAtSize(word, span.fontSize);
+      const wordWidth = drawnWidth(span.font, word, span.fontSize);
       if (lineWidth + wordWidth > maxWidth && currentLine.length > 0 && word.trim().length > 0) {
         lines.push(currentLine);
         currentLine = [];
@@ -898,7 +905,7 @@ function wrapSpans(spans, maxWidth) {
       }
       const trimmedWord = currentLine.length === 0 ? word.replace(/^\s+/, "") : word;
       if (trimmedWord.length > 0) {
-        const tw = span.font.widthOfTextAtSize(trimmedWord, span.fontSize);
+        const tw = drawnWidth(span.font, trimmedWord, span.fontSize);
         currentLine.push({ ...span, text: trimmedWord });
         lineWidth += tw;
       }
@@ -1075,7 +1082,7 @@ function renderListItem(item, ctx, extraIndent, depth, ordered, counter) {
   const indent = extraIndent + depth * LIST_INDENT;
   const bullet = ordered ? `${counter}.` : BULLET_CHAR;
   const bulletFont = ctx.fonts.regular;
-  const bulletWidth = bulletFont.widthOfTextAtSize(bullet + " ", ctx.fontSize);
+  const bulletWidth = drawnWidth(bulletFont, bullet + " ", ctx.fontSize);
   const lineHeight = ctx.fontSize * LINE_HEIGHT_FACTOR;
   ensureSpace(ctx, lineHeight);
   ctx.page.drawText(bullet, {
@@ -1197,7 +1204,7 @@ function renderTable(node, ctx, extraIndent) {
               font: span.font,
               color: rgb(span.color.r, span.color.g, span.color.b)
             });
-            lx += span.font.widthOfTextAtSize(span.text, span.fontSize);
+            lx += drawnWidth(span.font, span.text, span.fontSize);
           }
           ctx.y -= getLineHeight(line);
         }

package/dist/index.js

@@ -28,7 +28,7 @@ import {
   renderOutsideInDocument,
   withOutsideInMarkdownEditing,
   withOutsideInMetadata
-} from "./chunk-MVSHWYIE.js";
+} from "./chunk-AOY3UPE3.js";
 import {
   DEFAULT_CONVERSION_LIMITS,
   convert,
@@ -37,7 +37,7 @@ import {
   defaultRegistry,
   prepareConversion,
   resolveConversionLimits
-} from "./chunk-UJQHFM3K.js";
+} from "./chunk-X6WFQDZD.js";
 import {
   ConversionError
 } from "./chunk-KXOZMWBS.js";
@@ -94,7 +94,7 @@ import {
   markdownDocToPdf,
   pdfToDoc,
   pdfToMarkdownDoc
-} from "./chunk-32AQL6I6.js";
+} from "./chunk-GLIUMDYD.js";
 import "./chunk-34KECNZO.js";
 import "./chunk-BXWNU4T5.js";
 import "./chunk-IIQYS2YH.js";

package/dist/outside-in/index.js

@@ -6,8 +6,8 @@ import {
   renderOutsideInDocument,
   withOutsideInMarkdownEditing,
   withOutsideInMetadata
-} from "../chunk-MVSHWYIE.js";
-import "../chunk-UJQHFM3K.js";
+} from "../chunk-AOY3UPE3.js";
+import "../chunk-X6WFQDZD.js";
 import "../chunk-KXOZMWBS.js";
 import {
   OUTSIDE_IN_FORMAT_IDS,

package/dist/pdf/index.js

@@ -5,7 +5,7 @@ import {
   pdfToContainer,
   pdfToDoc,
   pdfToMarkdownDoc
-} from "../chunk-32AQL6I6.js";
+} from "../chunk-GLIUMDYD.js";
 import "../chunk-34KECNZO.js";
 import "../chunk-BXWNU4T5.js";
 import "../chunk-IIQYS2YH.js";

package/dist/registry/index.js

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

package/package.json

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