jspdf-md-renderer 3.1.0 → 3.3.0

package/dist/index.mjs

@@ -1,23 +1,90 @@
-import { marked as R } from "marked";
-import A from "jspdf-autotable";
+import { marked as j } from "marked";
+import O from "jspdf-autotable";
 var u = /* @__PURE__ */ ((t) => (t.Heading = "heading", t.Paragraph = "paragraph", t.List = "list", t.ListItem = "list_item", t.Blockquote = "blockquote", t.Code = "code", t.CodeSpan = "codespan", t.Table = "table", t.Html = "html", t.Hr = "hr", t.Image = "image", t.Link = "link", t.Strong = "strong", t.Em = "em", t.TableHeader = "table_header", t.TableCell = "table_cell", t.Raw = "raw", t.Text = "text", t))(u || {});
-const j = async (t) => {
-  const n = await R.lexer(t, { async: !0, gfm: !0 });
-  return W(n);
+const D = "__jmr_", q = /(!\[[^\]]*\]\()([^)]+)(\))\s*\{([^}]+)\}/g, U = /(\w+)\s*=\s*(\w+)/g, R = ["left", "center", "right"], Q = (t) => {
+  const e = [];
+  return t.width !== void 0 && e.push(`w=${t.width}`), t.height !== void 0 && e.push(`h=${t.height}`), t.align && e.push(`a=${t.align}`), e.length > 0 ? `#${D}${e.join("&")}` : "";
+}, V = (t) => {
+  const e = {};
+  let i;
+  for (; (i = U.exec(t)) !== null; ) {
+    const r = i[1].toLowerCase(), h = i[2];
+    switch (r) {
+      case "width":
+      case "w": {
+        const o = parseInt(h, 10);
+        !isNaN(o) && o > 0 && (e.width = o);
+        break;
+      }
+      case "height":
+      case "h": {
+        const o = parseInt(h, 10);
+        !isNaN(o) && o > 0 && (e.height = o);
+        break;
+      }
+      case "align": {
+        const o = h.toLowerCase();
+        R.includes(
+          o
+        ) && (e.align = o);
+        break;
+      }
+    }
+  }
+  return e;
+}, Z = (t) => t.replace(
+  q,
+  (e, i, r, h, o) => {
+    const l = V(o), a = Q(l);
+    return `${i}${r}${a}${h}`;
+  }
+), K = (t) => {
+  const e = t.indexOf(`#${D}`);
+  if (e === -1)
+    return { cleanHref: t, attrs: {} };
+  const i = t.substring(0, e), r = t.substring(e + 1 + D.length), h = {}, o = r.split("&");
+  for (const l of o) {
+    const [a, s] = l.split("=");
+    switch (a) {
+      case "w": {
+        const g = parseInt(s, 10);
+        !isNaN(g) && g > 0 && (h.width = g);
+        break;
+      }
+      case "h": {
+        const g = parseInt(s, 10);
+        !isNaN(g) && g > 0 && (h.height = g);
+        break;
+      }
+      case "a": {
+        R.includes(
+          s
+        ) && (h.align = s);
+        break;
+      }
+    }
+  }
+  return { cleanHref: i, attrs: h };
+}, M = async (t) => {
+  const e = Z(t), i = await j.lexer(e, {
+    async: !0,
+    gfm: !0
+  });
+  return W(i);
 }, W = (t) => {
-  const n = [];
-  return t.forEach((s) => {
+  const e = [];
+  return t.forEach((i) => {
     try {
-      const g = O[s.type];
-      g ? n.push(g(s)) : n.push({
+      const r = tt[i.type];
+      r ? e.push(r(i)) : e.push({
         type: u.Raw,
-        content: s.raw
+        content: i.raw
       });
-    } catch (g) {
-      console.error("Failed to handle token ==>", s, g);
+    } catch (r) {
+      console.error("Failed to handle token ==>", i, r);
     }
-  }), n;
-}, O = {
+  }), e;
+}, tt = {
   [u.Heading]: (t) => ({
     type: u.Heading,
     depth: t.depth,
@@ -47,22 +114,28 @@ const j = async (t) => {
   }),
   [u.Table]: (t) => ({
     type: u.Table,
-    header: t.header.map((n) => ({
+    header: t.header.map((e) => ({
       type: u.TableHeader,
-      content: n.text
+      content: e.text
     })),
     rows: t.rows.map(
-      (n) => n.map((s) => ({
+      (e) => e.map((i) => ({
         type: u.TableCell,
-        content: s.text
+        content: i.text
       }))
     )
   }),
-  [u.Image]: (t) => ({
-    type: u.Image,
-    src: t.href,
-    alt: t.text
-  }),
+  [u.Image]: (t) => {
+    const { cleanHref: e, attrs: i } = K(t.href);
+    return {
+      type: u.Image,
+      src: e,
+      alt: t.text,
+      width: i.width,
+      height: i.height,
+      align: i.align
+    };
+  },
   [u.Link]: (t) => ({
     type: u.Link,
     href: t.href,
@@ -99,15 +172,15 @@ const j = async (t) => {
     content: t.text,
     items: t.tokens ? W(t.tokens) : []
   })
-}, H = class H {
-  static initialize(n) {
-    this.options_ = n, this.cursor = { x: n.cursor.x, y: n.cursor.y }, this.lastContentY_ = n.cursor.y;
+}, I = class I {
+  static initialize(e) {
+    this.options_ = e, this.cursor = { x: e.cursor.x, y: e.cursor.y }, this.lastContentY_ = e.cursor.y;
   }
   static getCursor() {
     return this.cursor;
   }
-  static setCursor(n) {
-    this.cursor = n;
+  static setCursor(e) {
+    this.cursor = e;
   }
   static get options() {
     return this.options_;
@@ -127,8 +200,8 @@ const j = async (t) => {
    * @param operation 'set' to assign a new value, 'add' to increment the current value.
    * @default operation = 'set'
    */
-  static updateX(n, s = "set") {
-    s === "set" ? this.cursor.x = n : s === "add" && (this.cursor.x += n);
+  static updateX(e, i = "set") {
+    i === "set" ? this.cursor.x = e : i === "add" && (this.cursor.x += e);
   }
   /**
    * Updates the y pointer of the cursor.
@@ -136,8 +209,8 @@ const j = async (t) => {
    * @param operation 'set' to assign a new value, 'add' to increment the current value.
    * @default operation = 'set'
    */
-  static updateY(n, s = "set") {
-    s === "set" ? this.cursor.y = n : s === "add" && (this.cursor.y += n);
+  static updateY(e, i = "set") {
+    i === "set" ? this.cursor.y = e : i === "add" && (this.cursor.y += e);
   }
   /**
    * Records a Y position as the bottom of rendered content.
@@ -145,8 +218,8 @@ const j = async (t) => {
    * where their actual text content ends, ignoring any trailing margins.
    * @param specificY Optional Y value to record. Defaults to current cursor Y.
    */
-  static recordContentY(n) {
-    this.lastContentY_ = n !== void 0 ? n : this.cursor.y;
+  static recordContentY(e) {
+    this.lastContentY_ = e !== void 0 ? e : this.cursor.y;
   }
   /**
    * Gets the last Y position recorded as content bottom.
@@ -162,75 +235,192 @@ const j = async (t) => {
     return this.cursor.y;
   }
 };
-H.cursor = { x: 0, y: 0 }, H.lastContentY_ = 0, H.inlineLock = !1;
-let e = H;
-const b = (t) => t.getTextDimensions("H").h * e.options.page.defaultLineHeightFactor, y = (t) => t.getTextDimensions("H").w * e.options.page.defaultLineHeightFactor, q = (t, n, s, g) => {
-  const c = 6 - (n?.depth ?? 0) > 0 ? 6 - (n?.depth ?? 0) : 1;
-  if (t.setFontSize(e.options.page.defaultFontSize + c), n?.items && n?.items.length > 0)
-    for (const l of n?.items ?? [])
-      g(l, s, !1);
+I.cursor = { x: 0, y: 0 }, I.lastContentY_ = 0, I.inlineLock = !1;
+let n = I;
+const C = (t) => t.getTextDimensions("H").h * n.options.page.defaultLineHeightFactor, y = (t) => t.getTextDimensions("H").w * n.options.page.defaultLineHeightFactor, et = (t, e, i, r) => {
+  const h = 6 - (e?.depth ?? 0) > 0 ? 6 - (e?.depth ?? 0) : 1;
+  if (t.setFontSize(n.options.page.defaultFontSize + h), e?.items && e?.items.length > 0)
+    for (const o of e?.items ?? [])
+      r(o, i, !1);
   else {
-    const l = b(t);
+    const o = C(t);
     t.text(
-      n?.content ?? "",
-      e.X + s,
-      e.Y,
+      e?.content ?? "",
+      n.X + i,
+      n.Y,
       {
         align: "left",
-        maxWidth: e.options.page.maxContentWidth - s,
+        maxWidth: n.options.page.maxContentWidth - i,
         baseline: "top"
       }
-    ), e.recordContentY(e.Y + l), e.updateY(l, "add");
+    ), n.recordContentY(n.Y + o), n.updateY(o, "add");
+  }
+  t.setFontSize(n.options.page.defaultFontSize), n.updateX(n.options.page.xpading, "set");
+}, Y = (t) => {
+  typeof n.options.pageBreakHandler == "function" ? n.options.pageBreakHandler(t) : t.addPage(
+    n.options.page?.format,
+    n.options.page?.orientation
+  ), n.updateY(n.options.page.topmargin), n.updateX(n.options.page.xpading);
+}, z = 96, k = (t, e = "mm") => {
+  switch (e) {
+    case "pt":
+      return t * 72 / z;
+    case "in":
+      return t / z;
+    case "px":
+      return t;
+    default:
+      return t * 25.4 / z;
+  }
+}, G = (t) => {
+  try {
+    let e = "";
+    if (t.includes("base64,")) {
+      const a = t.split("base64,")[1];
+      typeof window < "u" && typeof window.atob == "function" ? e = decodeURIComponent(escape(window.atob(a))) : typeof Buffer < "u" ? e = Buffer.from(a, "base64").toString("utf-8") : e = decodeURIComponent(escape(atob(a)));
+    } else
+      e = decodeURIComponent(t.split(",")[1] || "");
+    const i = e.match(
+      /<svg[^>]*\swidth=(?:'|")([0-9.]+)[a-zA-Z]*(?:'|")/i
+    ), r = e.match(
+      /<svg[^>]*\sheight=(?:'|")([0-9.]+)[a-zA-Z]*(?:'|")/i
+    ), h = e.match(
+      /<svg[^>]*\sviewBox=(?:'|")[^'"]*(?:'|")/i
+    );
+    let o = i ? parseFloat(i[1]) : 0, l = r ? parseFloat(r[1]) : 0;
+    if ((!o || !l) && h) {
+      const a = h[0].match(
+        /viewBox=(?:'|")([^'"]+)(?:'|")/i
+      );
+      if (a) {
+        const s = a[1].split(/[ ,]+/).filter(Boolean).map(parseFloat);
+        s.length >= 4 && (o = o || s[2], l = l || s[3]);
+      }
+    }
+    if (o > 0 && l > 0) return { width: o, height: l };
+  } catch (e) {
+    console.warn("Failed to extract SVG dimensions:", e);
+  }
+  return null;
+}, _ = (t, e, i, r, h = "mm") => {
+  if (!e.data)
+    return { finalWidth: 0, finalHeight: 0 };
+  let o = e.naturalWidth || 0, l = e.naturalHeight || 0;
+  if (!o || !l)
+    if (e.data.startsWith("data:image/svg")) {
+      const c = G(e.data);
+      c && (o = c.width, l = c.height);
+    } else
+      try {
+        const c = t.getImageProperties(e.data);
+        o = c.width, l = c.height;
+      } catch (c) {
+        console.warn(
+          "Failed to get image properties for intrinsic sizing:",
+          c
+        );
+      }
+  const a = l > 0 ? o / l : 1;
+  let s, g;
+  if (e.width && e.height ? (s = k(e.width, h), g = k(e.height, h)) : e.width ? (s = k(e.width, h), g = s / a) : e.height ? (g = k(e.height, h), s = g * a) : (s = k(o, h), g = k(l, h)), s > i) {
+    const c = i / s;
+    s = i, g = g * c;
+  }
+  if (g > r) {
+    const c = r / g;
+    g = r, s = s * c;
+  }
+  return { finalWidth: s, finalHeight: g };
+}, $ = async (t) => {
+  for (const e of t) {
+    if (e.type === u.Image && e.src)
+      try {
+        if (e.src.startsWith("data:"))
+          e.data = e.src;
+        else {
+          const i = await fetch(e.src);
+          if (!i.ok)
+            throw new Error(
+              `Failed to fetch image: ${i.statusText}`
+            );
+          const r = await i.blob(), h = await new Promise(
+            (o, l) => {
+              const a = new FileReader();
+              a.onloadend = () => {
+                typeof a.result == "string" ? o(a.result) : l(
+                  new Error(
+                    "Failed to convert image to base64 string"
+                  )
+                );
+              }, a.onerror = l, a.readAsDataURL(r);
+            }
+          );
+          e.data = h;
+        }
+        e.data && e.data.startsWith("data:image/svg") && typeof window < "u" && typeof document < "u" && (e.data = await new Promise((i) => {
+          const r = new Image();
+          r.onload = () => {
+            const h = document.createElement("canvas"), o = G(
+              e.data
+            ), l = o ? o.width : r.width || 300, a = o ? o.height : r.height || 150;
+            e.naturalWidth = l, e.naturalHeight = a;
+            const s = 4;
+            h.width = l * s, h.height = a * s;
+            const g = h.getContext("2d");
+            g ? (g.scale(s, s), g.drawImage(r, 0, 0, l, a), i(h.toDataURL("image/png"))) : i(e.data);
+          }, r.onerror = () => i(e.data), r.src = e.data;
+        }));
+      } catch (i) {
+        console.warn(
+          `[jspdf-md-renderer] Warning: Failed to load image at ${e.src}. It will be skipped.`,
+          i
+        );
+      }
+    e.items && e.items.length > 0 && await $(e.items);
   }
-  t.setFontSize(e.options.page.defaultFontSize), e.updateX(e.options.page.xpading, "set");
-}, w = (t) => {
-  typeof e.options.pageBreakHandler == "function" ? e.options.pageBreakHandler(t) : t.addPage(
-    e.options.page?.format,
-    e.options.page?.orientation
-  ), e.updateY(e.options.page.topmargin), e.updateX(e.options.page.xpading);
 };
-class E {
+class A {
   // Default codespan styling (can be overridden via RenderStore.options.codespan)
   static getCodespanOptions() {
-    const n = e.options.codespan ?? {};
+    const e = n.options.codespan ?? {};
     return {
-      backgroundColor: n.backgroundColor ?? "#EEEEEE",
-      padding: n.padding ?? 0.5,
-      showBackground: n.showBackground !== !1,
-      fontSizeScale: n.fontSizeScale ?? 0.9
+      backgroundColor: e.backgroundColor ?? "#EEEEEE",
+      padding: e.padding ?? 0.5,
+      showBackground: e.showBackground !== !1,
+      fontSizeScale: e.fontSizeScale ?? 0.9
     };
   }
   /**
    * Apply font style to the jsPDF document.
    */
-  static applyStyle(n, s) {
-    const g = n.getFont().fontName, c = n.getFontSize(), l = () => {
-      const i = e.options.font.bold?.name;
-      return i && i !== "" ? i : g;
-    }, r = () => {
-      const i = e.options.font.regular?.name;
-      return i && i !== "" ? i : g;
+  static applyStyle(e, i) {
+    const r = e.getFont().fontName, h = e.getFontSize(), o = () => {
+      const a = n.options.font.bold?.name;
+      return a && a !== "" ? a : r;
+    }, l = () => {
+      const a = n.options.font.regular?.name;
+      return a && a !== "" ? a : r;
     };
-    switch (s) {
+    switch (i) {
       case "bold":
-        n.setFont(
-          l(),
-          e.options.font.bold?.style || "bold"
+        e.setFont(
+          o(),
+          n.options.font.bold?.style || "bold"
         );
         break;
       case "italic":
-        n.setFont(r(), "italic");
+        e.setFont(l(), "italic");
         break;
       case "bolditalic":
-        n.setFont(l(), "bolditalic");
+        e.setFont(o(), "bolditalic");
         break;
       case "codespan":
-        n.setFont("courier", "normal"), n.setFontSize(
-          c * this.getCodespanOptions().fontSizeScale
+        e.setFont("courier", "normal"), e.setFontSize(
+          h * this.getCodespanOptions().fontSizeScale
         );
         break;
       default:
-        n.setFont(r(), n.getFont().fontStyle);
+        e.setFont(l(), e.getFont().fontStyle);
         break;
     }
   }
@@ -239,60 +429,79 @@ class E {
    * NOTE: jsPDF's getTextWidth() does NOT include charSpace in its calculation,
    * so we must manually add it: effectiveWidth = getTextWidth(text) + (text.length * charSpace)
    */
-  static measureWordWidth(n, s, g) {
-    const c = n.getFont(), l = n.getFontSize();
-    this.applyStyle(n, g);
-    const r = n.getTextWidth(s), i = n.getCharSpace?.() ?? 0, a = r + s.length * i;
-    return n.setFont(c.fontName, c.fontStyle), n.setFontSize(l), a;
+  static measureWordWidth(e, i, r) {
+    const h = e.getFont(), o = e.getFontSize();
+    this.applyStyle(e, r);
+    const l = e.getTextWidth(i), a = e.getCharSpace?.() ?? 0, s = l + i.length * a;
+    return e.setFont(h.fontName, h.fontStyle), e.setFontSize(o), s;
   }
   /**
    * Extract style from element type string.
    */
-  static getStyleFromType(n, s) {
-    switch (n) {
+  static getStyleFromType(e, i) {
+    switch (e) {
       case "strong":
-        return s === "italic" ? "bolditalic" : "bold";
+        return i === "italic" ? "bolditalic" : "bold";
       case "em":
-        return s === "bold" ? "bolditalic" : "italic";
+        return i === "bold" ? "bolditalic" : "italic";
       case "codespan":
         return "codespan";
       default:
-        return s || "normal";
+        return i || "normal";
     }
   }
   /**
    * Flatten ParsedElement tree into an array of StyledWordInfo.
    * Handles nested inline elements.
    */
-  static flattenToWords(n, s, g = "normal", c = !1, l) {
-    const r = [];
-    for (const i of s) {
-      const a = this.getStyleFromType(i.type, g), h = i.type === "link" || c, p = i.href || l;
-      if (i.items && i.items.length > 0) {
+  static flattenToWords(e, i, r = "normal", h = !1, o) {
+    const l = [];
+    for (const a of i) {
+      const s = this.getStyleFromType(a.type, r), g = a.type === "link" || h, c = a.href || o;
+      if (a.items && a.items.length > 0) {
         const f = this.flattenToWords(
-          n,
-          i.items,
+          e,
+          a.items,
+          s,
+          g,
+          c
+        );
+        l.push(...f);
+      } else if (a.type === "image") {
+        const f = n.options.page.maxContentHeight - n.options.page.topmargin, d = n.options.page.maxContentWidth - n.options.page.indent * 0, p = n.options.page.unit || "mm", { finalWidth: m, finalHeight: x } = _(
+          e,
           a,
-          h,
+          d,
+          f,
           p
         );
-        r.push(...f);
+        l.push({
+          text: "",
+          width: m,
+          style: s,
+          isLink: g,
+          href: c,
+          linkColor: g ? n.options.link?.linkColor || [0, 0, 255] : void 0,
+          isImage: !0,
+          imageElement: a,
+          imageHeight: x
+        });
       } else {
-        const f = i.content || i.text || "";
+        const f = a.content || a.text || "";
         if (!f) continue;
-        if (a === "codespan") {
-          const o = f.trim();
-          o && r.push({
-            text: o,
+        if (s === "codespan") {
+          const p = f.trim();
+          p && l.push({
+            text: p,
             width: this.measureWordWidth(
-              n,
-              o,
-              a
+              e,
+              p,
+              s
             ),
-            style: a,
-            isLink: h,
-            href: p,
-            linkColor: h ? e.options.link?.linkColor || [
+            style: s,
+            isLink: g,
+            href: c,
+            linkColor: g ? n.options.link?.linkColor || [
               0,
               0,
               255
@@ -300,93 +509,130 @@ class E {
           });
           continue;
         }
-        const d = f.split(/\s+/).filter((o) => o.length > 0);
+        const d = f.split(/\s+/).filter((p) => p.length > 0);
         if (d.length === 0)
           continue;
-        for (let o = 0; o < d.length; o++) {
-          const m = d[o];
-          r.push({
+        for (let p = 0; p < d.length; p++) {
+          const m = d[p];
+          l.push({
             text: m,
-            width: this.measureWordWidth(n, m, a),
-            style: a,
-            isLink: h,
-            href: p,
-            linkColor: h ? e.options.link?.linkColor || [0, 0, 255] : void 0
+            width: this.measureWordWidth(e, m, s),
+            style: s,
+            isLink: g,
+            href: c,
+            linkColor: g ? n.options.link?.linkColor || [0, 0, 255] : void 0
           });
         }
       }
     }
-    return r;
+    return l;
   }
   /**
    * Break a flat list of words into lines that fit within maxWidth.
    * Correctly tracks totalTextWidth (sum of word widths only) for justification.
    */
-  static breakIntoLines(n, s, g) {
-    const c = [];
-    let l = [], r = 0, i = 0;
-    const a = n.getTextWidth(" ");
-    for (let h = 0; h < s.length; h++) {
-      const p = s[h], f = l.length > 0 ? a + p.width : p.width;
-      i + f > g && l.length > 0 ? (c.push({
-        words: l,
-        totalTextWidth: r,
-        isLastLine: !1
-      }), l = [p], r = p.width, i = p.width) : (l.push(p), r += p.width, i += f);
+  static breakIntoLines(e, i, r) {
+    const h = [];
+    let o = [], l = 0, a = 0, s = C(e) * n.options.page.defaultLineHeightFactor;
+    const g = e.getTextWidth(" ");
+    for (let c = 0; c < i.length; c++) {
+      const f = i[c], d = o.length > 0 ? g + f.width : f.width, p = f.isImage && f.imageHeight ? f.imageHeight : C(e) * n.options.page.defaultLineHeightFactor;
+      a + d > r && o.length > 0 ? (h.push({
+        words: o,
+        totalTextWidth: l,
+        isLastLine: !1,
+        lineHeight: s
+      }), o = [f], l = f.width, a = f.width, s = p) : (o.push(f), l += f.width, a += d, s = Math.max(s, p));
     }
-    return l.length > 0 && c.push({
-      words: l,
-      totalTextWidth: r,
-      isLastLine: !0
-    }), c;
+    return o.length > 0 && h.push({
+      words: o,
+      totalTextWidth: l,
+      isLastLine: !0,
+      lineHeight: s
+    }), h;
   }
   /**
    * Render a single word with its style applied.
    */
-  static renderWord(n, s, g, c) {
-    const l = n.getFont(), r = n.getFontSize(), i = n.getTextColor();
-    if (this.applyStyle(n, s.style), s.isLink && s.linkColor && n.setTextColor(...s.linkColor), s.style === "codespan") {
-      const a = this.getCodespanOptions();
-      if (a.showBackground) {
-        const h = b(n), p = a.padding;
-        n.setFillColor(a.backgroundColor), n.rect(
-          g - p,
-          c - p,
-          s.width + p * 2,
-          h + p * 2,
-          "F"
-        ), n.setFillColor("#000000");
+  static renderWord(e, i, r, h) {
+    const o = e.getFont(), l = e.getFontSize(), a = e.getTextColor();
+    if (this.applyStyle(e, i.style), i.isLink && i.linkColor && e.setTextColor(...i.linkColor), i.isImage && i.imageElement && i.imageElement.data)
+      try {
+        let s = "JPEG";
+        if (i.imageElement.data.startsWith("data:image/png"))
+          s = "PNG";
+        else if (i.imageElement.data.startsWith("data:image/webp"))
+          s = "WEBP";
+        else if (i.imageElement.data.startsWith("data:image/gif"))
+          s = "GIF";
+        else if (i.imageElement.src) {
+          const c = i.imageElement.src.split("?")[0].split("#")[0].split(".").pop()?.toUpperCase();
+          c && ["PNG", "JPEG", "JPG", "WEBP", "GIF"].includes(c) && (s = c === "JPG" ? "JPEG" : c);
+        }
+        if (i.width > 0 && (i.imageHeight || 0) > 0) {
+          const g = i.imageHeight || 0, c = h - g;
+          e.addImage(
+            i.imageElement.data,
+            s,
+            r,
+            c,
+            i.width,
+            g
+          );
+        }
+      } catch (s) {
+        console.warn("Failed to render inline image", s);
+      }
+    else {
+      if (i.style === "codespan") {
+        const s = this.getCodespanOptions();
+        if (s.showBackground) {
+          const g = C(e), c = s.padding;
+          e.setFillColor(s.backgroundColor), e.rect(
+            r - c,
+            h - c,
+            i.width + c * 2,
+            g + c * 2,
+            "F"
+          ), e.setFillColor("#000000");
+        }
       }
+      e.text(i.text, r, h, { baseline: "top" });
     }
-    if (n.text(s.text, g, c, { baseline: "top" }), s.isLink && s.href) {
-      const a = b(n) / 2;
-      n.link(g, c, s.width, a, { url: s.href });
+    if (i.isLink && i.href) {
+      const s = i.isImage && i.imageHeight ? i.imageHeight : C(e);
+      e.link(r, h, i.width, s, { url: i.href });
     }
-    n.setFont(l.fontName, l.fontStyle), n.setFontSize(r), n.setTextColor(i);
+    e.setFont(o.fontName, o.fontStyle), e.setFontSize(l), e.setTextColor(a);
   }
   /**
    * Render a single line with specified alignment.
    */
-  static renderAlignedLine(n, s, g, c, l, r = "left") {
-    const { words: i, totalTextWidth: a, isLastLine: h } = s;
-    if (i.length === 0) return;
-    const p = n.getTextWidth(" ");
-    let f = g, d = p;
-    const o = a + (i.length - 1) * p;
-    switch (r) {
+  static renderAlignedLine(e, i, r, h, o, l = "left") {
+    const { words: a, totalTextWidth: s, isLastLine: g } = i;
+    if (a.length === 0) return;
+    const c = e.getTextWidth(" ");
+    let f = r, d = c;
+    const p = s + (a.length - 1) * c;
+    switch (l) {
       case "right":
-        f = g + l - o;
+        f = r + o - p;
         break;
       case "center":
-        f = g + (l - o) / 2;
+        f = r + (o - p) / 2;
         break;
       case "justify":
-        !h && i.length > 1 && (d = (l - a) / (i.length - 1));
+        !g && a.length > 1 && (d = (o - s) / (a.length - 1));
         break;
     }
     let m = f;
-    for (let x = 0; x < i.length; x++)
-      this.renderWord(n, i[x], m, c), m += i[x].width, x < i.length - 1 && (m += d);
+    const x = C(e) * n.options.page.defaultLineHeightFactor;
+    for (let F = 0; F < a.length; F++) {
+      const b = a[F];
+      let H = h;
+      const w = b.isImage && b.imageHeight ? b.imageHeight : x;
+      w < i.lineHeight && (H = h + (i.lineHeight - w)), this.renderWord(e, b, m, H), m += b.width, F < a.length - 1 && (m += d);
+    }
   }
   /**
    * Main entry point: Render a paragraph with mixed inline elements.
@@ -399,34 +645,34 @@ class E {
    * @param maxWidth Maximum width for text wrapping
    * @param alignment Optional alignment override (defaults to RenderStore option)
    */
-  static renderStyledParagraph(n, s, g, c, l, r) {
-    const i = r ?? e.options.content?.textAlignment ?? "left", a = this.flattenToWords(n, s);
-    if (a.length === 0) return;
-    const h = this.breakIntoLines(n, a, l), p = b(n) * e.options.page.defaultLineHeightFactor;
-    let f = c;
-    for (const o of h)
-      f + p > e.options.page.maxContentHeight && (w(n), f = e.Y), this.renderAlignedLine(
-        n,
+  static renderStyledParagraph(e, i, r, h, o, l) {
+    const a = l ?? n.options.content?.textAlignment ?? "left", s = this.flattenToWords(e, i);
+    if (s.length === 0) return;
+    const g = this.breakIntoLines(e, s, o);
+    let c = h;
+    for (const d of g)
+      c + d.lineHeight > n.options.page.maxContentHeight && (Y(e), c = n.Y), this.renderAlignedLine(
+        e,
+        d,
+        r,
+        c,
         o,
-        g,
-        f,
-        l,
-        i
-      ), e.recordContentY(f + b(n)), f += p, e.updateY(p, "add");
-    const d = h[h.length - 1];
-    if (d) {
-      const o = d.totalTextWidth + (d.words.length - 1) * n.getTextWidth(" ");
-      e.updateX(g + o, "set");
+        a
+      ), n.recordContentY(c + d.lineHeight), c += d.lineHeight, n.updateY(d.lineHeight, "add");
+    const f = g[g.length - 1];
+    if (f) {
+      const d = f.totalTextWidth + (f.words.length - 1) * e.getTextWidth(" ");
+      n.updateX(r + d, "set");
     }
   }
   /**
    * @deprecated Use renderStyledParagraph instead
    */
-  static renderJustifiedParagraph(n, s, g, c, l) {
-    this.renderStyledParagraph(n, s, g, c, l);
+  static renderJustifiedParagraph(e, i, r, h, o) {
+    this.renderStyledParagraph(e, i, r, h, o);
   }
 }
-class X {
+class T {
   /**
    * Renders text with automatic line wrapping and page breaking.
    * @param doc jsPDF instance
@@ -436,228 +682,236 @@ class X {
    * @param maxWidth Max width for text wrapping
    * @param justify Whether to justify the text
    */
-  static renderText(n, s, g = e.X, c = e.Y, l, r = !1) {
-    const i = n.splitTextToSize(s, l), a = b(n), h = a * e.options.page.defaultLineHeightFactor;
-    let p = c;
-    for (let f = 0; f < i.length; f++) {
-      const d = i[f];
-      p + h > e.options.page.maxContentHeight && (w(n), p = e.Y), r ? f === i.length - 1 ? n.text(d, g, p, { baseline: "top" }) : n.text(d, g, p, {
-        maxWidth: l,
+  static renderText(e, i, r = n.X, h = n.Y, o, l = !1) {
+    const a = e.splitTextToSize(i, o), s = C(e), g = s * n.options.page.defaultLineHeightFactor;
+    let c = h;
+    for (let f = 0; f < a.length; f++) {
+      const d = a[f];
+      c + g > n.options.page.maxContentHeight && (Y(e), c = n.Y), l ? f === a.length - 1 ? e.text(d, r, c, { baseline: "top" }) : e.text(d, r, c, {
+        maxWidth: o,
         align: "justify",
         baseline: "top"
-      }) : n.text(d, g, p, { baseline: "top" }), e.recordContentY(p + a), p += h, e.updateY(h, "add");
+      }) : e.text(d, r, c, { baseline: "top" }), n.recordContentY(c + s), c += g, n.updateY(g, "add");
     }
-    return p;
+    return c;
   }
 }
-const _ = (t, n, s, g) => {
-  e.activateInlineLock(), t.setFontSize(e.options.page.defaultFontSize);
-  const c = e.options.page.maxContentWidth - s;
-  if (n?.items && n?.items.length > 0)
-    if (n.items.some(
-      (r) => !["strong", "em", "text", "codespan", "link"].includes(
-        r.type
-      )
+const nt = (t, e, i, r) => {
+  n.activateInlineLock(), t.setFontSize(n.options.page.defaultFontSize);
+  const h = n.options.page.maxContentWidth - i;
+  if (e?.items && e?.items.length > 0) {
+    if (e.items.length === 1 && e.items[0].type === "image") {
+      r(e.items[0], i, !1), n.updateX(n.options.page.xpading), n.deactivateInlineLock();
+      return;
+    }
+    const o = [
+      "strong",
+      "em",
+      "text",
+      "codespan",
+      "link",
+      "image"
+    ];
+    if (e.items.some(
+      (a) => !o.includes(a.type)
     )) {
-      const r = [], i = () => {
-        r.length > 0 && (E.renderStyledParagraph(
+      const a = [], s = () => {
+        a.length > 0 && (A.renderStyledParagraph(
           t,
-          r,
-          e.X + s,
-          e.Y,
-          c
-        ), r.length = 0);
+          a,
+          n.X + i,
+          n.Y,
+          h
+        ), a.length = 0);
       };
-      for (const a of n.items)
-        ["strong", "em", "text", "codespan", "link"].includes(
-          a.type
-        ) ? r.push(a) : (i(), g(a, s, !1));
-      i();
+      for (const g of e.items)
+        o.includes(g.type) ? a.push(g) : (s(), r(g, i, !1));
+      s();
     } else
-      E.renderStyledParagraph(
+      A.renderStyledParagraph(
         t,
-        n.items,
-        e.X + s,
-        e.Y,
-        c
+        e.items,
+        n.X + i,
+        n.Y,
+        h
       );
-  else {
-    const l = n.content ?? "", r = e.options.content?.textAlignment ?? "left";
-    l.trim() && X.renderText(
+  } else {
+    const o = e.content ?? "", l = n.options.content?.textAlignment ?? "left";
+    o.trim() && T.renderText(
       t,
-      l,
-      e.X + s,
-      e.Y,
-      c,
-      r === "justify"
+      o,
+      n.X + i,
+      n.Y,
+      h,
+      l === "justify"
     );
   }
-  e.updateX(e.options.page.xpading), e.deactivateInlineLock();
-}, $ = (t, n, s, g) => {
-  t.setFontSize(e.options.page.defaultFontSize);
-  for (const [c, l] of n?.items?.entries() ?? []) {
-    const r = n.ordered ? (n.start ?? 0) + c : n.start;
-    g(
-      l,
-      s + 1,
+  n.updateX(n.options.page.xpading), n.deactivateInlineLock();
+}, it = (t, e, i, r) => {
+  t.setFontSize(n.options.page.defaultFontSize);
+  for (const [h, o] of e?.items?.entries() ?? []) {
+    const l = e.ordered ? (e.start ?? 0) + h : e.start;
+    r(
+      o,
+      i + 1,
       !0,
-      r,
-      n.ordered
+      l,
+      e.ordered
     );
   }
-}, J = (t, n, s, g, c, l) => {
-  e.Y + b(t) >= e.options.page.maxContentHeight && w(t);
-  const r = e.options, i = s * r.page.indent, a = l ? `${c}. ` : "• ", h = r.page.xpading;
-  e.updateX(h, "set"), t.setFont(r.font.regular.name, r.font.regular.style), t.text(a, h + i, e.Y, { baseline: "top" });
-  const p = t.getTextWidth(a), f = h + i + p, d = r.page.maxContentWidth - i - p;
-  if (n.items && n.items.length > 0) {
-    const o = [], m = () => {
-      o.length > 0 && (E.renderStyledParagraph(
+}, st = (t, e, i, r, h, o) => {
+  n.Y + C(t) >= n.options.page.maxContentHeight && Y(t);
+  const l = n.options, a = i * l.page.indent, s = o ? `${h}. ` : "• ", g = l.page.xpading;
+  n.updateX(g, "set"), t.setFont(l.font.regular.name, l.font.regular.style), t.text(s, g + a, n.Y, { baseline: "top" });
+  const c = t.getTextWidth(s), f = g + a + c, d = l.page.maxContentWidth - a - c;
+  if (e.items && e.items.length > 0) {
+    const p = [], m = () => {
+      p.length > 0 && (A.renderStyledParagraph(
         t,
-        o,
+        p,
         f,
-        e.Y,
+        n.Y,
         d
-      ), o.length = 0, e.updateX(h, "set"));
+      ), p.length = 0, n.updateX(g, "set"));
     };
-    for (const x of n.items)
-      x.type === u.List ? (m(), g(
+    for (const x of e.items)
+      x.type === u.List ? (m(), r(
         x,
-        s,
+        i,
         !0,
-        c,
+        h,
         x.ordered ?? !1
-      )) : x.type === u.ListItem ? (m(), g(
+      )) : x.type === u.ListItem ? (m(), r(
         x,
-        s,
+        i,
         !0,
-        c,
-        l
-      )) : o.push(x);
+        h,
+        o
+      )) : p.push(x);
     m();
-  } else if (n.content) {
-    const o = r.content?.textAlignment ?? "left";
-    X.renderText(
+  } else if (e.content) {
+    const p = l.content?.textAlignment ?? "left";
+    T.renderText(
       t,
-      n.content,
+      e.content,
       f,
-      e.Y,
+      n.Y,
       d,
-      o === "justify"
+      p === "justify"
     );
   }
-}, G = (t, n, s, g, c, l, r, i = !0) => {
-  if (n?.items && n?.items.length > 0)
-    for (const a of n?.items ?? [])
-      c(
-        a,
+}, at = (t, e, i, r, h, o, l, a = !0) => {
+  if (e?.items && e?.items.length > 0)
+    for (const s of e?.items ?? [])
+      h(
         s,
-        g,
-        l,
+        i,
         r,
-        i
+        o,
+        l,
+        a
       );
   else {
-    const a = e.options, h = s * a.page.indent, p = g ? r ? `${l}. ` : "• " : "", f = n.content || "", d = a.page.xpading;
-    if (!f && !p) return;
-    if (!f.trim() && !p) {
-      const o = (f.match(/\n/g) || []).length;
-      if (o > 1) {
-        const m = o - 1, x = t.getTextDimensions("A").h * a.page.defaultLineHeightFactor, C = m * x;
-        e.Y + C > a.page.maxContentHeight ? w(t) : (e.updateY(C, "add"), e.recordContentY(e.Y));
+    const s = n.options, g = i * s.page.indent, c = r ? l ? `${o}. ` : "• " : "", f = e.content || "", d = s.page.xpading;
+    if (!f && !c) return;
+    if (!f.trim() && !c) {
+      const p = (f.match(/\n/g) || []).length;
+      if (p > 1) {
+        const m = p - 1, x = t.getTextDimensions("A").h * s.page.defaultLineHeightFactor, F = m * x;
+        n.Y + F > s.page.maxContentHeight ? Y(t) : (n.updateY(F, "add"), n.recordContentY(n.Y));
       }
       return;
     }
-    if (e.updateX(d, "set"), g && p) {
-      const o = t.getTextWidth(p), m = a.page.maxContentWidth - h - o;
-      t.setFont(a.font.regular.name, a.font.regular.style), t.text(p, d + h, e.Y, {
+    if (n.updateX(d, "set"), r && c) {
+      const p = t.getTextWidth(c), m = s.page.maxContentWidth - g - p;
+      t.setFont(s.font.regular.name, s.font.regular.style), t.text(c, d + g, n.Y, {
         baseline: "top"
-      }), X.renderText(
+      }), T.renderText(
         t,
         f,
-        d + h + o,
-        e.Y,
+        d + g + p,
+        n.Y,
         m,
-        i
+        a
       );
     } else {
-      const o = a.page.maxContentWidth - h;
-      X.renderText(
+      const p = s.page.maxContentWidth - g;
+      T.renderText(
         t,
         f,
-        d + h,
-        e.Y,
-        o,
-        i
+        d + g,
+        n.Y,
+        p,
+        a
       );
     }
-    e.updateX(d, "set");
+    n.updateX(d, "set");
   }
-}, U = (t) => {
-  const n = t.internal.pageSize.getWidth();
+}, ot = (t) => {
+  const e = t.internal.pageSize.getWidth();
   t.setLineDashPattern([1, 1], 0), t.setLineWidth(0.1), t.line(
-    e.options.page.xpading,
-    e.Y,
-    n - e.options.page.xpading,
-    e.Y
-  ), t.setLineWidth(0.1), t.setLineDashPattern([], 0), e.updateY(b(t), "add");
-}, K = (t, n, s, g) => {
-  const c = t.getFont(), l = t.getFontSize();
+    n.options.page.xpading,
+    n.Y,
+    e - n.options.page.xpading,
+    n.Y
+  ), t.setLineWidth(0.1), t.setLineDashPattern([], 0), n.updateY(C(t), "add");
+}, rt = (t, e, i, r) => {
+  const h = t.getFont(), o = t.getFontSize();
   t.setFont("courier", "normal");
-  const r = e.options.page.defaultFontSize * 0.9;
-  t.setFontSize(r);
-  const i = s * e.options.page.indent, a = e.options.page.maxContentWidth - i - 8, h = t.getLineHeightFactor(), p = r / t.internal.scaleFactor * h, d = (n.code ?? "").replace(/[\r\n\s]+$/, "");
+  const l = n.options.page.defaultFontSize * 0.9;
+  t.setFontSize(l);
+  const a = i * n.options.page.indent, s = n.options.page.maxContentWidth - a - 8, g = t.getLineHeightFactor(), c = l / t.internal.scaleFactor * g, d = (e.code ?? "").replace(/[\r\n\s]+$/, "");
   if (!d) {
-    t.setFont(c.fontName, c.fontStyle), t.setFontSize(l);
+    t.setFont(h.fontName, h.fontStyle), t.setFontSize(o);
     return;
   }
-  const o = t.splitTextToSize(d, a);
-  for (; o.length > 0 && o[o.length - 1].trim() === ""; )
-    o.pop();
-  if (o.length === 0) {
-    t.setFont(c.fontName, c.fontStyle), t.setFontSize(l);
+  const p = t.splitTextToSize(d, s);
+  for (; p.length > 0 && p[p.length - 1].trim() === ""; )
+    p.pop();
+  if (p.length === 0) {
+    t.setFont(h.fontName, h.fontStyle), t.setFontSize(o);
     return;
   }
-  const m = 4, x = "#EEEEEE", C = "#DDDDDD";
-  let F = 0;
-  for (; F < o.length; ) {
-    const k = e.options.page.maxContentHeight - e.Y, S = o.length - F, L = k - m * 2;
-    let Y = Math.floor(L / p);
-    if (Y <= 0) {
-      w(t);
+  const m = 4, x = "#EEEEEE", F = "#DDDDDD";
+  let b = 0;
+  for (; b < p.length; ) {
+    const H = n.options.page.maxContentHeight - n.Y, w = p.length - b, L = H - m * 2;
+    let S = Math.floor(L / c);
+    if (S <= 0) {
+      Y(t);
       continue;
     }
-    Y > S && (Y = S);
-    const N = o.slice(
-      F,
-      F + Y
-    ), T = F === 0, z = F + Y >= o.length, P = Y * p;
-    if (T && e.updateY(m, "add"), t.setFillColor(x), t.setDrawColor(C), t.roundedRect(
-      e.X,
-      e.Y - m,
-      e.options.page.maxContentWidth,
-      P + (T ? m : 0) + (z ? m : 0),
+    S > w && (S = w);
+    const J = p.slice(
+      b,
+      b + S
+    ), E = b === 0, X = b + S >= p.length, B = S * c;
+    if (E && n.updateY(m, "add"), t.setFillColor(x), t.setDrawColor(F), t.roundedRect(
+      n.X,
+      n.Y - m,
+      n.options.page.maxContentWidth,
+      B + (E ? m : 0) + (X ? m : 0),
       2,
       2,
       "FD"
-    ), T && n.lang) {
-      const I = t.getFontSize();
+    ), E && e.lang) {
+      const P = t.getFontSize();
       t.setFontSize(10), t.setTextColor("#666666"), t.text(
-        n.lang,
-        e.X + e.options.page.maxContentWidth - t.getTextWidth(n.lang) - 4,
-        e.Y,
+        e.lang,
+        n.X + n.options.page.maxContentWidth - t.getTextWidth(e.lang) - 4,
+        n.Y,
         { baseline: "top" }
-      ), t.setFontSize(I), t.setTextColor("#000000");
+      ), t.setFontSize(P), t.setTextColor("#000000");
     }
-    let D = e.Y;
-    for (const I of N)
-      t.text(I, e.X + 4, D, { baseline: "top" }), D += p;
-    e.updateY(P, "add"), e.recordContentY(e.Y + (z ? m : 0)), z && e.updateY(m, "add"), F += Y, F < o.length && w(t);
+    let N = n.Y;
+    for (const P of J)
+      t.text(P, n.X + 4, N, { baseline: "top" }), N += c;
+    n.updateY(B, "add"), n.recordContentY(n.Y + (X ? m : 0)), X && n.updateY(m, "add"), b += S, b < p.length && Y(t);
   }
-  t.setFont(c.fontName, c.fontStyle), t.setFontSize(l);
-}, Q = (t, n, s) => {
-  const g = t.getFont().fontName, c = t.getFont().fontStyle, l = t.getFontSize(), r = (a) => {
-    switch (a) {
+  t.setFont(h.fontName, h.fontStyle), t.setFontSize(o);
+}, lt = (t, e, i) => {
+  const r = t.getFont().fontName, h = t.getFont().fontStyle, o = t.getFontSize(), l = (s) => {
+    switch (s) {
       case "normal":
         return 0;
       case "bold":
@@ -671,52 +925,52 @@ const _ = (t, n, s, g) => {
       default:
         return 0;
     }
-  }, i = (a, h) => {
-    h === "bold" ? t.setFont(
-      e.options.font.bold.name && e.options.font.bold.name !== "" ? e.options.font.bold.name : g,
-      e.options.font.bold.style || "bold"
-    ) : h === "italic" ? t.setFont(e.options.font.regular.name, "italic") : h === "bolditalic" ? t.setFont(
-      e.options.font.bold.name && e.options.font.bold.name !== "" ? e.options.font.bold.name : g,
+  }, a = (s, g) => {
+    g === "bold" ? t.setFont(
+      n.options.font.bold.name && n.options.font.bold.name !== "" ? n.options.font.bold.name : r,
+      n.options.font.bold.style || "bold"
+    ) : g === "italic" ? t.setFont(n.options.font.regular.name, "italic") : g === "bolditalic" ? t.setFont(
+      n.options.font.bold.name && n.options.font.bold.name !== "" ? n.options.font.bold.name : r,
       "bolditalic"
-    ) : h === "codespan" ? (t.setFont("courier", "normal"), t.setFontSize(l * 0.9)) : t.setFont(
-      e.options.font.regular.name,
-      c
+    ) : g === "codespan" ? (t.setFont("courier", "normal"), t.setFontSize(o * 0.9)) : t.setFont(
+      n.options.font.regular.name,
+      h
     );
-    const p = e.options.page.maxContentWidth - s - e.X, f = t.splitTextToSize(a, p), d = h === "codespan", o = 1, m = "#EEEEEE";
-    if (e.isInlineLockActive)
+    const c = n.options.page.maxContentWidth - i - n.X, f = t.splitTextToSize(s, c), d = g === "codespan", p = 1, m = "#EEEEEE";
+    if (n.isInlineLockActive)
       for (let x = 0; x < f.length; x++) {
         if (d) {
-          const C = t.getTextWidth(f[x]) + y(t), F = b(t);
+          const F = t.getTextWidth(f[x]) + y(t), b = C(t);
           t.setFillColor(m), t.roundedRect(
-            e.X + s - o,
-            e.Y - o,
-            C + o * 2,
-            F + o * 2,
+            n.X + i - p,
+            n.Y - p,
+            F + p * 2,
+            b + p * 2,
             2,
             2,
             "F"
           ), t.setFillColor("#000000");
         }
-        t.text(f[x], e.X + s, e.Y, {
+        t.text(f[x], n.X + i, n.Y, {
           baseline: "top",
-          maxWidth: p
-        }), e.updateX(
-          t.getTextDimensions(f[x]).w + (d ? o * 2 : 1),
+          maxWidth: c
+        }), n.updateX(
+          t.getTextDimensions(f[x]).w + (d ? p * 2 : 1),
           "add"
-        ), x < f.length - 1 && (e.updateY(b(t), "add"), e.updateX(
-          e.options.page.xpading,
+        ), x < f.length - 1 && (n.updateY(C(t), "add"), n.updateX(
+          n.options.page.xpading,
           "set"
         ));
       }
     else if (f.length > 1) {
-      const x = f[0], C = f?.slice(1)?.join(" ");
+      const x = f[0], F = f?.slice(1)?.join(" ");
       if (d) {
-        const S = t.getTextWidth(x) + y(t), L = b(t);
+        const w = t.getTextWidth(x) + y(t), L = C(t);
         t.setFillColor(m), t.roundedRect(
-          e.X + (s >= 2 ? s + 2 : 0) - o,
-          e.Y - o,
-          S + o * 2,
-          L + o * 2,
+          n.X + (i >= 2 ? i + 2 : 0) - p,
+          n.Y - p,
+          w + p * 2,
+          L + p * 2,
           2,
           2,
           "F"
@@ -724,244 +978,240 @@ const _ = (t, n, s, g) => {
       }
       t.text(
         x,
-        e.X + (s >= 2 ? s + 2 * r(h) : 0),
-        e.Y,
+        n.X + (i >= 2 ? i + 2 * l(g) : 0),
+        n.Y,
         {
           baseline: "top",
-          maxWidth: p
+          maxWidth: c
         }
-      ), e.updateX(e.options.page.xpading + s), e.updateY(b(t), "add");
-      const F = e.options.page.maxContentWidth - s - e.options.page.xpading;
+      ), n.updateX(n.options.page.xpading + i), n.updateY(C(t), "add");
+      const b = n.options.page.maxContentWidth - i - n.options.page.xpading;
       t.splitTextToSize(
-        C,
-        F
-      ).forEach((S) => {
+        F,
+        b
+      ).forEach((w) => {
         if (d) {
-          const L = t.getTextWidth(S) + y(t), Y = b(t);
+          const L = t.getTextWidth(w) + y(t), S = C(t);
           t.setFillColor(m), t.roundedRect(
-            e.X + y(t) - o,
-            e.Y - o,
-            L + o * 2,
-            Y + o * 2,
+            n.X + y(t) - p,
+            n.Y - p,
+            L + p * 2,
+            S + p * 2,
             2,
             2,
             "F"
           ), t.setFillColor("#000000");
         }
         t.text(
-          S,
-          e.X + y(t),
-          e.Y,
+          w,
+          n.X + y(t),
+          n.Y,
           {
             baseline: "top",
-            maxWidth: F
+            maxWidth: b
           }
         );
       });
     } else {
       if (d) {
-        const x = t.getTextWidth(a) + y(t), C = b(t);
+        const x = t.getTextWidth(s) + y(t), F = C(t);
         t.setFillColor(m), t.roundedRect(
-          e.X + s - o,
-          e.Y - o,
-          x + o * 2,
-          C + o * 2,
+          n.X + i - p,
+          n.Y - p,
+          x + p * 2,
+          F + p * 2,
           2,
           2,
           "F"
         ), t.setFillColor("#000000");
       }
-      t.text(a, e.X + s, e.Y, {
+      t.text(s, n.X + i, n.Y, {
         baseline: "top",
-        maxWidth: p
-      }), e.updateX(
-        t.getTextDimensions(a).w + (s >= 2 ? a.split(" ").length + 2 : 2) * r(h) * 0.5 + (d ? o * 2 : 0),
+        maxWidth: c
+      }), n.updateX(
+        t.getTextDimensions(s).w + (i >= 2 ? s.split(" ").length + 2 : 2) * l(g) * 0.5 + (d ? p * 2 : 0),
         "add"
       );
     }
   };
-  if (n.type === "text" && n.items && n.items.length > 0)
-    for (const a of n.items)
-      if (a.type === "codespan")
-        i(a.content || "", "codespan");
-      else if (a.type === "em" || a.type === "strong") {
-        const h = a.type === "em" ? "italic" : "bold";
-        if (a.items && a.items.length > 0)
-          for (const p of a.items)
-            p.type === "strong" && h === "italic" || p.type === "em" && h === "bold" ? i(
-              p.content || "",
+  if (e.type === "text" && e.items && e.items.length > 0)
+    for (const s of e.items)
+      if (s.type === "codespan")
+        a(s.content || "", "codespan");
+      else if (s.type === "em" || s.type === "strong") {
+        const g = s.type === "em" ? "italic" : "bold";
+        if (s.items && s.items.length > 0)
+          for (const c of s.items)
+            c.type === "strong" && g === "italic" || c.type === "em" && g === "bold" ? a(
+              c.content || "",
               "bolditalic"
-            ) : i(
-              p.content || "",
-              h
+            ) : a(
+              c.content || "",
+              g
             );
         else
-          i(a.content || "", h);
+          a(s.content || "", g);
       } else
-        i(a.content || "", "normal");
-  else n.type === "em" ? i(n.content || "", "italic") : n.type === "strong" ? i(n.content || "", "bold") : n.type === "codespan" ? i(n.content || "", "codespan") : i(n.content || "", "normal");
-  t.setFont(g, c), t.setFontSize(l);
-}, V = (t, n, s) => {
-  const g = t.getFont().fontName, c = t.getFont().fontStyle, l = t.getFontSize(), r = t.getTextColor(), i = e.options.link?.linkColor || [0, 0, 255];
-  t.setTextColor(...i);
-  const a = e.options.page.maxContentWidth - s - e.X, h = n.text || n.content || "", p = n.href || "", f = t.splitTextToSize(h, a);
-  if (e.isInlineLockActive)
+        a(s.content || "", "normal");
+  else e.type === "em" ? a(e.content || "", "italic") : e.type === "strong" ? a(e.content || "", "bold") : e.type === "codespan" ? a(e.content || "", "codespan") : a(e.content || "", "normal");
+  t.setFont(r, h), t.setFontSize(o);
+}, gt = (t, e, i) => {
+  const r = t.getFont().fontName, h = t.getFont().fontStyle, o = t.getFontSize(), l = t.getTextColor(), a = n.options.link?.linkColor || [0, 0, 255];
+  t.setTextColor(...a);
+  const s = n.options.page.maxContentWidth - i - n.X, g = e.text || e.content || "", c = e.href || "", f = t.splitTextToSize(g, s);
+  if (n.isInlineLockActive)
     for (let d = 0; d < f.length; d++) {
-      const o = t.getTextDimensions(f[d]).w, m = b(t) / 2;
+      const p = t.getTextDimensions(f[d]).w, m = C(t) / 2;
       t.link(
-        e.X + s,
-        e.Y,
-        o,
+        n.X + i,
+        n.Y,
+        p,
         m,
-        { url: p }
-      ), t.text(f[d], e.X + s, e.Y, {
+        { url: c }
+      ), t.text(f[d], n.X + i, n.Y, {
         baseline: "top",
-        maxWidth: a
-      }), e.updateX(o + 1, "add"), e.X + o > e.options.page.maxContentWidth - s && (e.updateY(m, "add"), e.updateX(
-        e.options.page.xpading + s,
+        maxWidth: s
+      }), n.updateX(p + 1, "add"), n.X + p > n.options.page.maxContentWidth - i && (n.updateY(m, "add"), n.updateX(
+        n.options.page.xpading + i,
         "set"
-      )), d < f.length - 1 && (e.updateY(m, "add"), e.updateX(
-        e.options.page.xpading + s,
+      )), d < f.length - 1 && (n.updateY(m, "add"), n.updateX(
+        n.options.page.xpading + i,
         "set"
       ));
     }
   else if (f.length > 1) {
-    const d = f[0], o = f?.slice(1)?.join(" "), m = t.getTextDimensions(d).w, x = b(t) / 2;
+    const d = f[0], p = f?.slice(1)?.join(" "), m = t.getTextDimensions(d).w, x = C(t) / 2;
     t.link(
-      e.X + s,
-      e.Y,
+      n.X + i,
+      n.Y,
       m,
       x,
-      { url: p }
-    ), t.text(d, e.X + s, e.Y, {
+      { url: c }
+    ), t.text(d, n.X + i, n.Y, {
       baseline: "top",
-      maxWidth: a
-    }), e.updateX(e.options.page.xpading + s), e.updateY(x, "add");
-    const C = e.options.page.maxContentWidth - s - e.options.page.xpading;
-    t.splitTextToSize(o, C).forEach((k) => {
-      const S = t.getTextDimensions(k).w;
+      maxWidth: s
+    }), n.updateX(n.options.page.xpading + i), n.updateY(x, "add");
+    const F = n.options.page.maxContentWidth - i - n.options.page.xpading;
+    t.splitTextToSize(p, F).forEach((H) => {
+      const w = t.getTextDimensions(H).w;
       t.link(
-        e.X + y(t),
-        e.Y,
-        S,
+        n.X + y(t),
+        n.Y,
+        w,
         x,
-        { url: p }
+        { url: c }
       ), t.text(
-        k,
-        e.X + y(t),
-        e.Y,
+        H,
+        n.X + y(t),
+        n.Y,
         {
           baseline: "top",
-          maxWidth: C
+          maxWidth: F
         }
       );
     });
   } else {
-    const d = t.getTextDimensions(h).w, o = b(t) / 2;
+    const d = t.getTextDimensions(g).w, p = C(t) / 2;
     t.link(
-      e.X + s,
-      e.Y,
+      n.X + i,
+      n.Y,
       d,
-      o,
-      { url: p }
-    ), t.text(h, e.X + s, e.Y, {
+      p,
+      { url: c }
+    ), t.text(g, n.X + i, n.Y, {
       baseline: "top",
-      maxWidth: a
-    }), e.updateX(d + 2, "add");
+      maxWidth: s
+    }), n.updateX(d + 2, "add");
   }
-  t.setFont(g, c), t.setFontSize(l), t.setTextColor(r);
-}, Z = (t, n, s, g) => {
-  const c = e.options, l = s + 1, r = e.X + s * c.page.indent, i = e.Y, a = r + c.page.indent / 2, h = i, p = t.internal.getCurrentPageInfo().pageNumber;
-  n.items && n.items.length > 0 && n.items.forEach((o) => {
-    g(o, l);
+  t.setFont(r, h), t.setFontSize(o), t.setTextColor(l);
+}, ct = (t, e, i, r) => {
+  const h = n.options, o = i + 1, l = n.X + i * h.page.indent, a = n.Y, s = l + h.page.indent / 2, g = a, c = t.internal.getCurrentPageInfo().pageNumber;
+  e.items && e.items.length > 0 && e.items.forEach((p) => {
+    r(p, o);
   });
-  const f = e.Y, d = t.internal.getCurrentPageInfo().pageNumber;
+  const f = n.Y, d = t.internal.getCurrentPageInfo().pageNumber;
   t.setDrawColor(100), t.setLineWidth(1);
-  for (let o = p; o <= d; o++) {
-    t.setPage(o);
-    const m = o === p, x = o === d, C = m ? h : c.page.topmargin, F = x ? f : c.page.maxContentHeight;
-    t.line(a, C, a, F);
+  for (let p = c; p <= d; p++) {
+    t.setPage(p);
+    const m = p === c, x = p === d, F = m ? g : h.page.topmargin, b = x ? f : h.page.maxContentHeight;
+    t.line(s, F, s, b);
+  }
+  n.recordContentY(), t.setPage(d);
+}, ht = (t) => {
+  if (t.data) {
+    if (t.data.startsWith("data:image/png")) return "PNG";
+    if (t.data.startsWith("data:image/jpeg") || t.data.startsWith("data:image/jpg"))
+      return "JPEG";
+    if (t.data.startsWith("data:image/webp") || t.data.startsWith("data:image/webp")) return "WEBP";
+    if (t.data.startsWith("data:image/gif")) return "GIF";
   }
-  e.recordContentY(), t.setPage(d);
-}, M = (t, n, s) => {
-  if (!n.data)
+  if (t.src) {
+    const i = t.src.split("?")[0].split("#")[0].split(".").pop()?.toUpperCase();
+    if (i && ["PNG", "JPEG", "JPG", "WEBP", "GIF"].includes(i))
+      return i === "JPG" ? "JPEG" : i;
+  }
+  return "JPEG";
+}, pt = (t, e, i) => {
+  if (!e.data)
     return;
-  const g = e.options, c = e.X + s * g.page.indent;
-  let l = e.Y;
-  const r = g.page.maxContentWidth - s * g.page.indent;
+  const r = n.options, h = r.page.unit || "mm", o = i * r.page.indent, l = r.page.maxContentWidth - o, a = n.X + o;
+  let s = n.Y;
   try {
-    const i = t.getImageProperties(n.data), a = i.width, h = i.height;
-    let p = a, f = h;
-    const d = a / h;
-    p > 0 && (p = r, f = p / d), l + f > g.page.maxContentHeight && (t.addPage(), l = g.page.topmargin, e.updateY(l));
-    let o = n.src?.split(".").pop()?.toUpperCase() || "JPEG";
-    n.data.startsWith("data:image/png") ? o = "PNG" : n.data.startsWith("data:image/jpeg") || n.data.startsWith("data:image/jpg") ? o = "JPEG" : n.data.startsWith("data:image/webp") && (o = "WEBP"), t.addImage(
-      n.data,
-      o,
-      c,
+    const g = r.page.maxContentHeight - r.page.topmargin, { finalWidth: c, finalHeight: f } = _(
+      t,
+      e,
       l,
+      g,
+      h
+    );
+    s + f > r.page.maxContentHeight && (Y(t), s = n.Y);
+    const d = e.align || r.image?.defaultAlign || "left";
+    let p;
+    switch (d) {
+      case "right":
+        p = a + l - c;
+        break;
+      case "center":
+        p = a + (l - c) / 2;
+        break;
+      default:
+        p = a;
+        break;
+    }
+    const m = ht(e);
+    c > 0 && f > 0 && t.addImage(
+      e.data,
+      m,
       p,
+      s,
+      c,
       f
-    ), e.updateY(f, "add"), e.recordContentY();
-  } catch (i) {
-    console.warn("Failed to render image", i);
+    ), n.updateY(f, "add"), n.recordContentY();
+  } catch (g) {
+    console.warn("Failed to render image", g);
   }
-}, tt = (t, n, s) => {
-  if (!n.header || !n.rows)
+}, ft = (t, e, i) => {
+  if (!e.header || !e.rows)
     return;
-  const g = e.options, c = g.page.xmargin + s * g.page.indent, l = [n.header.map((a) => a.content || "")], r = n.rows.map(
-    (a) => a.map((h) => h.content || "")
-  ), i = g.table || {};
-  A(t, {
-    head: l,
-    body: r,
-    startY: e.Y,
-    margin: { left: c, right: g.page.xmargin },
-    ...i,
-    didDrawPage: (a) => {
-      i.didDrawPage && i.didDrawPage(a);
+  const r = n.options, h = r.page.xmargin + i * r.page.indent, o = [e.header.map((s) => s.content || "")], l = e.rows.map(
+    (s) => s.map((g) => g.content || "")
+  ), a = r.table || {};
+  O(t, {
+    head: o,
+    body: l,
+    startY: n.Y,
+    margin: { left: h, right: r.page.xmargin },
+    ...a,
+    didDrawPage: (s) => {
+      a.didDrawPage && a.didDrawPage(s);
     },
-    didDrawCell: (a) => {
-      i.didDrawCell && i.didDrawCell(a), e.setCursor({
-        x: e.X,
-        y: a.cell.y + 2 * g.page.lineSpace
+    didDrawCell: (s) => {
+      a.didDrawCell && a.didDrawCell(s), n.setCursor({
+        x: n.X,
+        y: s.cell.y + s.cell.height + 2 * r.page.lineSpace
       });
     }
   });
-}, B = async (t) => {
-  for (const n of t) {
-    if (n.type === u.Image && n.src)
-      try {
-        if (n.src.startsWith("data:"))
-          n.data = n.src;
-        else {
-          const s = await fetch(n.src);
-          if (!s.ok)
-            throw new Error(
-              `Failed to fetch image: ${s.statusText}`
-            );
-          const g = await s.blob(), c = await new Promise(
-            (l, r) => {
-              const i = new FileReader();
-              i.onloadend = () => {
-                typeof i.result == "string" ? l(i.result) : r(
-                  new Error(
-                    "Failed to convert image to base64 string"
-                  )
-                );
-              }, i.onerror = r, i.readAsDataURL(g);
-            }
-          );
-          n.data = c;
-        }
-      } catch (s) {
-        console.warn(
-          `[jspdf-md-renderer] Warning: Failed to load image at ${n.src}. It will be skipped.`,
-          s
-        );
-      }
-    n.items && n.items.length > 0 && await B(n.items);
-  }
 }, v = {
   page: {
     indent: 10,
@@ -981,83 +1231,87 @@ const _ = (t, n, s, g) => {
     bold: { name: "helvetica", style: "bold" },
     regular: { name: "helvetica", style: "normal" },
     light: { name: "helvetica", style: "light" }
+  },
+  image: {
+    defaultAlign: "left"
   }
-}, et = (t) => {
+}, dt = (t) => {
   if (!t)
     throw new Error("RenderOption is required");
-  const n = { ...v.page, ...t.page }, s = { ...v.font, ...t.font };
-  return n.maxContentWidth || (n.maxContentWidth = 190), n.maxContentHeight || (n.maxContentHeight = 277), {
+  const e = { ...v.page, ...t.page }, i = { ...v.font, ...t.font }, r = { ...v.image, ...t.image };
+  return e.maxContentWidth || (e.maxContentWidth = 190), e.maxContentHeight || (e.maxContentHeight = 277), {
     ...t,
-    page: n,
-    font: s
+    page: e,
+    font: i,
+    image: r
   };
-}, it = async (t, n, s) => {
-  const g = et(s);
-  e.initialize(g);
-  const c = await j(n);
-  await B(c);
-  const l = (r, i = 0, a = !1, h = 0, p = !1, f = !0) => {
-    const d = i * g.page.indent;
-    switch (r.type) {
+}, xt = async (t, e, i) => {
+  const r = dt(i);
+  n.initialize(r);
+  const h = await M(e);
+  await $(h);
+  const o = (l, a = 0, s = !1, g = 0, c = !1, f = !0) => {
+    const d = a * r.page.indent;
+    switch (l.type) {
       case u.Heading:
-        q(t, r, d, l);
+        et(t, l, d, o);
         break;
       case u.Paragraph:
-        _(t, r, d, l);
+        nt(t, l, d, o);
         break;
       case u.List:
-        $(t, r, i, l);
+        it(t, l, a, o);
         break;
       case u.ListItem:
-        J(
+        st(
           t,
-          r,
-          i,
           l,
-          h,
-          p
+          a,
+          o,
+          g,
+          c
         );
         break;
       case u.Hr:
-        U(t);
+        ot(t);
         break;
       case u.Code:
-        K(t, r, i);
+        rt(t, l, a);
         break;
       case u.Strong:
       case u.Em:
       case u.CodeSpan:
-        Q(t, r, d);
+        lt(t, l, d);
         break;
       case u.Link:
-        V(t, r, d);
+        gt(t, l, d);
         break;
       case u.Blockquote:
-        Z(t, r, i, l);
+        ct(t, l, a, o);
         break;
       case u.Image:
-        M(t, r, i);
+        pt(t, l, a);
         break;
       case u.Table:
-        tt(t, r, i);
+        ft(t, l, a);
         break;
       case u.Raw:
       case u.Text:
-        G(
+        at(
           t,
-          r,
-          i,
-          a,
           l,
-          h,
-          p,
-          g.page.defaultFontSize > 0
+          a,
+          s,
+          o,
+          g,
+          c,
+          r.page.defaultFontSize > 0
           // Using validOptions here if needed, or just true for justify
         );
         break;
       default:
         console.warn(
-          `Warning: Unsupported element type encountered: ${r.type}. 
+          `Warning: Unsupported element type encountered: ${l.type}. 
                     If you believe this element type should be supported, please create an issue at:
                     https://github.com/JeelGajera/jspdf-md-renderer/issues
                     with details of the element and expected behavior. Thanks for helping to improve this library!`
@@ -1065,11 +1319,11 @@ const _ = (t, n, s, g) => {
         break;
     }
   };
-  for (const r of c)
-    l(r);
-  g.endCursorYHandler(e.Y);
+  for (const l of h)
+    o(l);
+  r.endCursorYHandler(n.Y);
 };
 export {
-  j as MdTextParser,
-  it as MdTextRender
+  M as MdTextParser,
+  xt as MdTextRender
 };