pdfnative 1.0.4 → 1.1.0

package/dist/worker/index.cjs

@@ -90,12 +90,12 @@ function shapeThaiText(str, fontData) {
   function getAdv(gid) {
     return widths[gid] !== void 0 ? widths[gid] : defaultWidth;
   }
-  function getBaseAnchor(baseGid, markClass) {
+  function getBaseAnchor2(baseGid, markClass) {
     const base = markAnchors && markAnchors.bases && markAnchors.bases[baseGid];
     if (!base) return null;
     return base[markClass] ?? null;
   }
-  function getMarkAnchor(markGid) {
+  function getMarkAnchor2(markGid) {
     const mark = markAnchors && markAnchors.marks && markAnchors.marks[markGid];
     if (!mark) return null;
     return { classIdx: mark[0], x: mark[1], y: mark[2] };
@@ -132,7 +132,7 @@ function shapeThaiText(str, fontData) {
     for (let ai = 0; ai < cluster.aboves.length; ai++) {
       const abvCp = cluster.aboves[ai];
       const markGid = resolveMarkGid(abvCp, isTallBase);
-      const markAnchor = getMarkAnchor(markGid);
+      const markAnchor = getMarkAnchor2(markGid);
       let dx = 0;
       let dy = 0;
       if (ai > 0 && prevAboveMarkGid !== null) {
@@ -141,7 +141,7 @@ function shapeThaiText(str, fontData) {
           dx = prevAboveMarkDx + m2mOffset.dx;
           dy = prevAboveMarkDy + m2mOffset.dy;
         } else if (markAnchor) {
-          const baseAnchor = getBaseAnchor(baseGid, markAnchor.classIdx);
+          const baseAnchor = getBaseAnchor2(baseGid, markAnchor.classIdx);
           if (baseAnchor) {
             dx = baseAnchor[0] - markAnchor.x - baseAdv;
             dy = baseAnchor[1] - markAnchor.y;
@@ -149,7 +149,7 @@ function shapeThaiText(str, fontData) {
         }
       } else {
         if (markAnchor) {
-          const baseAnchor = getBaseAnchor(baseGid, markAnchor.classIdx);
+          const baseAnchor = getBaseAnchor2(baseGid, markAnchor.classIdx);
           if (baseAnchor) {
             dx = baseAnchor[0] - markAnchor.x - baseAdv;
             dy = baseAnchor[1] - markAnchor.y;
@@ -163,11 +163,11 @@ function shapeThaiText(str, fontData) {
     }
     for (const blwCp of cluster.belows) {
       const markGid = cmap[blwCp] || 0;
-      const markAnchor = getMarkAnchor(markGid);
+      const markAnchor = getMarkAnchor2(markGid);
       let dx = 0;
       let dy = 0;
       if (markAnchor) {
-        const baseAnchor = getBaseAnchor(baseGid, markAnchor.classIdx);
+        const baseAnchor = getBaseAnchor2(baseGid, markAnchor.classIdx);
         if (baseAnchor) {
           dx = baseAnchor[0] - markAnchor.x - baseAdv;
           dy = baseAnchor[1] - markAnchor.y;
@@ -179,6 +179,112 @@ function shapeThaiText(str, fontData) {
   return shaped;
 }
 
+// src/shaping/script-registry.ts
+var ARABIC_START = 1536;
+var ARABIC_END = 1791;
+var ARABIC_SUPPLEMENT_START = 1872;
+var ARABIC_SUPPLEMENT_END = 1919;
+var ARABIC_EXTENDED_A_START = 2208;
+var ARABIC_EXTENDED_A_END = 2303;
+var ARABIC_PRES_A_START = 64336;
+var ARABIC_PRES_A_END = 65023;
+var ARABIC_PRES_B_START = 65136;
+var ARABIC_PRES_B_END = 65279;
+var THAI_START = 3584;
+var THAI_END = 3711;
+var DEVANAGARI_START = 2304;
+var DEVANAGARI_END = 2431;
+var DEVANAGARI_EXT_START = 43232;
+var DEVANAGARI_EXT_END = 43263;
+var BENGALI_START = 2432;
+var BENGALI_END = 2559;
+var TAMIL_START = 2944;
+var TAMIL_END = 3071;
+var EMOJI_RANGES = [
+  [127744, 128511],
+  // Miscellaneous Symbols and Pictographs
+  [128512, 128591],
+  // Emoticons
+  [128640, 128767],
+  // Transport and Map Symbols
+  [128768, 128895],
+  // Alchemical Symbols (partial)
+  [128896, 129023],
+  // Geometric Shapes Extended
+  [129024, 129279],
+  // Supplemental Arrows-C
+  [129280, 129535],
+  // Supplemental Symbols and Pictographs
+  [129536, 129647],
+  // Chess Symbols
+  [129648, 129791],
+  // Symbols and Pictographs Extended-A
+  [9728, 9983],
+  // Miscellaneous Symbols
+  [9984, 10175],
+  // Dingbats
+  [126976, 127023],
+  // Mahjong Tiles
+  [127136, 127231]
+  // Playing Cards
+];
+var FITZPATRICK_START = 127995;
+var FITZPATRICK_END = 127999;
+function isArabicCodepoint(cp) {
+  return cp >= ARABIC_START && cp <= ARABIC_END || cp >= ARABIC_SUPPLEMENT_START && cp <= ARABIC_SUPPLEMENT_END || cp >= ARABIC_EXTENDED_A_START && cp <= ARABIC_EXTENDED_A_END || cp >= ARABIC_PRES_A_START && cp <= ARABIC_PRES_A_END || cp >= ARABIC_PRES_B_START && cp <= ARABIC_PRES_B_END;
+}
+function isThaiCodepoint(cp) {
+  return cp >= THAI_START && cp <= THAI_END;
+}
+function isBengaliCodepoint(cp) {
+  return cp >= BENGALI_START && cp <= BENGALI_END;
+}
+function isTamilCodepoint(cp) {
+  return cp >= TAMIL_START && cp <= TAMIL_END;
+}
+function isDevanagariCodepoint(cp) {
+  return cp >= DEVANAGARI_START && cp <= DEVANAGARI_END || cp >= DEVANAGARI_EXT_START && cp <= DEVANAGARI_EXT_END;
+}
+function isEmojiCodepoint(cp) {
+  if (cp >= FITZPATRICK_START && cp <= FITZPATRICK_END) return true;
+  for (const [lo, hi] of EMOJI_RANGES) {
+    if (cp >= lo && cp <= hi) return true;
+  }
+  return false;
+}
+function containsArabic(text) {
+  for (let i = 0; i < text.length; ) {
+    const cp = text.codePointAt(i) ?? 0;
+    if (isArabicCodepoint(cp)) return true;
+    i += cp > 65535 ? 2 : 1;
+  }
+  return false;
+}
+function containsThai(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (isThaiCodepoint(str.charCodeAt(i))) return true;
+  }
+  return false;
+}
+function containsBengali(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (isBengaliCodepoint(str.charCodeAt(i))) return true;
+  }
+  return false;
+}
+function containsTamil(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (isTamilCodepoint(str.charCodeAt(i))) return true;
+  }
+  return false;
+}
+function containsDevanagari(str) {
+  for (let i = 0; i < str.length; i++) {
+    if (isDevanagariCodepoint(str.charCodeAt(i))) return true;
+  }
+  return false;
+}
+
 // src/shaping/script-detect.ts
 function detectCharLang(cp) {
   if (cp >= 880 && cp <= 1023 || cp >= 7936 && cp <= 8191) return "el";
@@ -195,6 +301,7 @@ function detectCharLang(cp) {
   if (cp >= 1024 && cp <= 1279 || cp >= 1280 && cp <= 1327) return "ru";
   if (cp >= 4256 && cp <= 4351 || cp >= 11520 && cp <= 11567) return "ka";
   if (cp >= 1328 && cp <= 1423 || cp >= 64275 && cp <= 64279) return "hy";
+  if (isEmojiCodepoint(cp)) return "emoji";
   return null;
 }
 
@@ -294,8 +401,8 @@ function pdfString(str) {
 }
 function truncate(str, max) {
   if (!str || str.length <= max) return str || "";
-  if (max <= 2) return "..";
-  return str.slice(0, max - 2) + "..";
+  if (max <= 1) return "\u2026";
+  return str.slice(0, max - 1) + "\u2026";
 }
 function helveticaWidth(str, sz) {
   let w = 0;
@@ -321,73 +428,25 @@ function helveticaWidth(str, sz) {
   return w * sz / 1e3;
 }
 
-// src/shaping/script-registry.ts
-var ARABIC_START = 1536;
-var ARABIC_END = 1791;
-var ARABIC_SUPPLEMENT_START = 1872;
-var ARABIC_SUPPLEMENT_END = 1919;
-var ARABIC_EXTENDED_A_START = 2208;
-var ARABIC_EXTENDED_A_END = 2303;
-var ARABIC_PRES_A_START = 64336;
-var ARABIC_PRES_A_END = 65023;
-var ARABIC_PRES_B_START = 65136;
-var ARABIC_PRES_B_END = 65279;
-var THAI_START = 3584;
-var THAI_END = 3711;
-var DEVANAGARI_START = 2304;
-var DEVANAGARI_END = 2431;
-var DEVANAGARI_EXT_START = 43232;
-var DEVANAGARI_EXT_END = 43263;
-var BENGALI_START = 2432;
-var BENGALI_END = 2559;
-var TAMIL_START = 2944;
-var TAMIL_END = 3071;
-function isArabicCodepoint(cp) {
-  return cp >= ARABIC_START && cp <= ARABIC_END || cp >= ARABIC_SUPPLEMENT_START && cp <= ARABIC_SUPPLEMENT_END || cp >= ARABIC_EXTENDED_A_START && cp <= ARABIC_EXTENDED_A_END || cp >= ARABIC_PRES_A_START && cp <= ARABIC_PRES_A_END || cp >= ARABIC_PRES_B_START && cp <= ARABIC_PRES_B_END;
-}
-function isThaiCodepoint(cp) {
-  return cp >= THAI_START && cp <= THAI_END;
-}
-function isBengaliCodepoint(cp) {
-  return cp >= BENGALI_START && cp <= BENGALI_END;
-}
-function isTamilCodepoint(cp) {
-  return cp >= TAMIL_START && cp <= TAMIL_END;
-}
-function isDevanagariCodepoint(cp) {
-  return cp >= DEVANAGARI_START && cp <= DEVANAGARI_END || cp >= DEVANAGARI_EXT_START && cp <= DEVANAGARI_EXT_END;
-}
-function containsArabic(text) {
-  for (let i = 0; i < text.length; ) {
-    const cp = text.codePointAt(i) ?? 0;
-    if (isArabicCodepoint(cp)) return true;
-    i += cp > 65535 ? 2 : 1;
-  }
-  return false;
-}
-function containsThai(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (isThaiCodepoint(str.charCodeAt(i))) return true;
-  }
-  return false;
-}
-function containsBengali(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (isBengaliCodepoint(str.charCodeAt(i))) return true;
-  }
-  return false;
-}
-function containsTamil(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (isTamilCodepoint(str.charCodeAt(i))) return true;
-  }
-  return false;
-}
-function containsDevanagari(str) {
-  for (let i = 0; i < str.length; i++) {
-    if (isDevanagariCodepoint(str.charCodeAt(i))) return true;
+// src/shaping/gsub-driver.ts
+function tryLigature(gids, ligatures) {
+  if (!ligatures || gids.length < 2) return null;
+  const firstGid = gids[0];
+  const entries = ligatures[firstGid];
+  if (!entries) return null;
+  for (const entry of entries) {
+    const compCount = entry.length - 1;
+    if (compCount > gids.length - 1) continue;
+    let match = true;
+    for (let ci = 0; ci < compCount; ci++) {
+      if (gids[1 + ci] !== entry[1 + ci]) {
+        match = false;
+        break;
+      }
+    }
+    if (match) return { resultGid: entry[0], consumed: compCount + 1 };
   }
-  return false;
+  return null;
 }
 
 // src/shaping/bengali-shaper.ts
@@ -516,43 +575,27 @@ function shapeBengaliText(str, fontData) {
     if (gsub[gid] !== void 0) return gsub[gid];
     return gid;
   }
-  function tryLigature(gids) {
-    if (!ligatures || gids.length < 2) return null;
-    const firstGid = gids[0];
-    const entries = ligatures[firstGid];
-    if (!entries) return null;
-    for (const entry of entries) {
-      const compCount = entry.length - 1;
-      if (compCount > gids.length - 1) continue;
-      let match = true;
-      for (let ci = 0; ci < compCount; ci++) {
-        if (gids[1 + ci] !== entry[1 + ci]) {
-          match = false;
-          break;
-        }
-      }
-      if (match) return { resultGid: entry[0], consumed: compCount + 1 };
-    }
-    return null;
+  function tryLig(gids) {
+    return tryLigature(gids, ligatures);
   }
   function getAdv(gid) {
     return widths[gid] !== void 0 ? widths[gid] : defaultWidth;
   }
-  function getBaseAnchor(baseGid, markClass) {
+  function getBaseAnchor2(baseGid, markClass) {
     const base = markAnchors && markAnchors.bases && markAnchors.bases[baseGid];
     if (!base) return null;
     return base[markClass] ?? null;
   }
-  function getMarkAnchor(markGid) {
+  function getMarkAnchor2(markGid) {
     const mark = markAnchors && markAnchors.marks && markAnchors.marks[markGid];
     if (!mark) return null;
     return { classIdx: mark[0], x: mark[1], y: mark[2] };
   }
   function emitGlyph(gid, isZero, baseGid) {
     if (isZero && baseGid !== void 0) {
-      const markAnchor = getMarkAnchor(gid);
+      const markAnchor = getMarkAnchor2(gid);
       if (markAnchor) {
-        const baseAnchorPt = getBaseAnchor(baseGid, markAnchor.classIdx);
+        const baseAnchorPt = getBaseAnchor2(baseGid, markAnchor.classIdx);
         if (baseAnchorPt) {
           const baseAdv = getAdv(baseGid);
           shaped.push({
@@ -613,7 +656,7 @@ function shapeBengaliText(str, fontData) {
       }
     }
     let ligConsumed = 0;
-    const ligResult = tryLigature(clusterGids);
+    const ligResult = tryLig(clusterGids);
     if (ligResult) {
       emitGlyph(ligResult.resultGid, false);
       baseGid = ligResult.resultGid;
@@ -621,7 +664,7 @@ function shapeBengaliText(str, fontData) {
       let gi = ligConsumed;
       while (gi < clusterGids.length) {
         const subSeq = clusterGids.slice(gi);
-        const subLig = tryLigature(subSeq);
+        const subLig = tryLig(subSeq);
         if (subLig) {
           emitGlyph(subLig.resultGid, false);
           gi += subLig.consumed;
@@ -784,43 +827,27 @@ function shapeTamilText(str, fontData) {
     const normCp = cp === 8239 || cp === 160 ? 32 : cp;
     return cmap[normCp] || 0;
   }
-  function tryLigature(gids) {
-    if (!ligatures || gids.length < 2) return null;
-    const firstGid = gids[0];
-    const entries = ligatures[firstGid];
-    if (!entries) return null;
-    for (const entry of entries) {
-      const compCount = entry.length - 1;
-      if (compCount > gids.length - 1) continue;
-      let match = true;
-      for (let ci = 0; ci < compCount; ci++) {
-        if (gids[1 + ci] !== entry[1 + ci]) {
-          match = false;
-          break;
-        }
-      }
-      if (match) return { resultGid: entry[0], consumed: compCount + 1 };
-    }
-    return null;
+  function tryLig(gids) {
+    return tryLigature(gids, ligatures);
   }
   function getAdv(gid) {
     return widths[gid] !== void 0 ? widths[gid] : defaultWidth;
   }
-  function getBaseAnchor(baseGid, markClass) {
+  function getBaseAnchor2(baseGid, markClass) {
     const base = markAnchors && markAnchors.bases && markAnchors.bases[baseGid];
     if (!base) return null;
     return base[markClass] ?? null;
   }
-  function getMarkAnchor(markGid) {
+  function getMarkAnchor2(markGid) {
     const mark = markAnchors && markAnchors.marks && markAnchors.marks[markGid];
     if (!mark) return null;
     return { classIdx: mark[0], x: mark[1], y: mark[2] };
   }
   function emitGlyph(gid, isZero, baseGid) {
     if (isZero && baseGid !== void 0) {
-      const markAnchor = getMarkAnchor(gid);
+      const markAnchor = getMarkAnchor2(gid);
       if (markAnchor) {
-        const baseAnchorPt = getBaseAnchor(baseGid, markAnchor.classIdx);
+        const baseAnchorPt = getBaseAnchor2(baseGid, markAnchor.classIdx);
         if (baseAnchorPt) {
           const baseAdv = getAdv(baseGid);
           shaped.push({
@@ -885,7 +912,7 @@ function shapeTamilText(str, fontData) {
       }
     }
     let ligConsumed = 0;
-    const ligResult = tryLigature(clusterGids);
+    const ligResult = tryLig(clusterGids);
     if (ligResult) {
       emitGlyph(ligResult.resultGid, false);
       baseGid = ligResult.resultGid;
@@ -893,7 +920,7 @@ function shapeTamilText(str, fontData) {
       let gi = ligConsumed;
       while (gi < clusterGids.length) {
         const subSeq = clusterGids.slice(gi);
-        const subLig = tryLigature(subSeq);
+        const subLig = tryLig(subSeq);
         if (subLig) {
           emitGlyph(subLig.resultGid, false);
           gi += subLig.consumed;
@@ -942,6 +969,30 @@ function shapeTamilText(str, fontData) {
   return shaped;
 }
 
+// src/shaping/gpos-positioner.ts
+function getBaseAnchor(markAnchors, baseGid, markClass) {
+  if (!markAnchors) return null;
+  const base = markAnchors.bases[baseGid];
+  if (!base) return null;
+  return base[markClass] ?? null;
+}
+function getMarkAnchor(markAnchors, markGid) {
+  if (!markAnchors) return null;
+  const mark = markAnchors.marks[markGid];
+  if (!mark) return null;
+  return { classIdx: mark[0], x: mark[1], y: mark[2] };
+}
+function positionMarkOnBase(markAnchors, markGid, baseGid, baseAdv) {
+  const mark = getMarkAnchor(markAnchors, markGid);
+  if (!mark) return null;
+  const base = getBaseAnchor(markAnchors, baseGid, mark.classIdx);
+  if (!base) return null;
+  return {
+    dx: base[0] - mark.x - baseAdv,
+    dy: base[1] - mark.y
+  };
+}
+
 // src/shaping/devanagari-shaper.ts
 var HALANT2 = 2381;
 var NUKTA2 = 2364;
@@ -1057,43 +1108,17 @@ function shapeDevanagariText(str, fontData) {
     const normCp = cp === 8239 || cp === 160 ? 32 : cp;
     return cmap[normCp] || 0;
   }
-  function tryLigature(gids) {
-    if (!ligatures || gids.length < 2) return null;
-    const firstGid = gids[0];
-    const entries = ligatures[firstGid];
-    if (!entries) return null;
-    for (const entry of entries) {
-      const compCount = entry.length - 1;
-      if (compCount > gids.length - 1) continue;
-      let match = true;
-      for (let ci = 0; ci < compCount; ci++) {
-        if (gids[1 + ci] !== entry[1 + ci]) {
-          match = false;
-          break;
-        }
-      }
-      if (match) return { resultGid: entry[0], consumed: compCount + 1 };
-    }
-    return null;
+  function tryLig(gids) {
+    return tryLigature(gids, ligatures);
   }
   function getAdv(gid) {
     return widths[gid] !== void 0 ? widths[gid] : defaultWidth;
   }
-  function getBaseAnchor(baseGid, markClass) {
-    const base = markAnchors && markAnchors.bases && markAnchors.bases[baseGid];
-    if (!base) return null;
-    return base[markClass] ?? null;
-  }
-  function getMarkAnchor(markGid) {
-    const mark = markAnchors && markAnchors.marks && markAnchors.marks[markGid];
-    if (!mark) return null;
-    return { classIdx: mark[0], x: mark[1], y: mark[2] };
-  }
   function emitGlyph(gid, isZero, baseGid) {
     if (isZero && baseGid !== void 0) {
-      const markAnchor = getMarkAnchor(gid);
+      const markAnchor = getMarkAnchor(markAnchors, gid);
       if (markAnchor) {
-        const baseAnchorPt = getBaseAnchor(baseGid, markAnchor.classIdx);
+        const baseAnchorPt = getBaseAnchor(markAnchors, baseGid, markAnchor.classIdx);
         if (baseAnchorPt) {
           const baseAdv = getAdv(baseGid);
           shaped.push({
@@ -1141,7 +1166,7 @@ function shapeDevanagariText(str, fontData) {
     if (hasReph) {
       const raGid = resolveGid(RA2);
       const halantGid = resolveGid(HALANT2);
-      const rephLig = tryLigature([raGid, halantGid]);
+      const rephLig = tryLig([raGid, halantGid]);
       if (rephLig) {
         emitGlyph(rephLig.resultGid, true, baseGid);
       } else {
@@ -1164,14 +1189,14 @@ function shapeDevanagariText(str, fontData) {
         break;
       }
     }
-    const ligResult = tryLigature(clusterGids);
+    const ligResult = tryLig(clusterGids);
     if (ligResult) {
       emitGlyph(ligResult.resultGid, false);
       baseGid = ligResult.resultGid;
       let gi = ligResult.consumed;
       while (gi < clusterGids.length) {
         const subSeq = clusterGids.slice(gi);
-        const subLig = tryLigature(subSeq);
+        const subLig = tryLig(subSeq);
         if (subLig) {
           emitGlyph(subLig.resultGid, false);
           gi += subLig.consumed;
@@ -1345,6 +1370,10 @@ function shapeArabicText(str, fontData) {
   const forms = resolvePositionalForms(codePoints);
   const glyphs = [];
   const cmap = fontData.cmap;
+  const widths = fontData.widths;
+  const defaultWidth = fontData.defaultWidth;
+  const markAnchors = fontData.markAnchors;
+  let lastBaseGid = 0;
   for (let i = 0; i < codePoints.length; i++) {
     const cp = codePoints[i];
     if (i < codePoints.length - 1 && isLamAlef(cp, codePoints[i + 1])) {
@@ -1355,6 +1384,7 @@ function shapeArabicText(str, fontData) {
         const ligGid = cmap[ligCP];
         if (ligGid) {
           glyphs.push({ gid: ligGid, dx: 0, dy: 0, isZeroAdvance: false });
+          lastBaseGid = ligGid;
           i++;
           continue;
         }
@@ -1376,7 +1406,16 @@ function shapeArabicText(str, fontData) {
     }
     const joining = getJoiningType(cp);
     const isZeroAdvance = joining === "T";
+    if (isZeroAdvance && lastBaseGid !== 0) {
+      const baseAdv = widths[lastBaseGid] !== void 0 ? widths[lastBaseGid] : defaultWidth;
+      const offset = positionMarkOnBase(markAnchors, gid, lastBaseGid, baseAdv);
+      if (offset) {
+        glyphs.push({ gid, dx: offset.dx, dy: offset.dy, isZeroAdvance: true });
+        continue;
+      }
+    }
     glyphs.push({ gid, dx: 0, dy: 0, isZeroAdvance });
+    if (!isZeroAdvance) lastBaseGid = gid;
   }
   return glyphs;
 }
@@ -1389,7 +1428,7 @@ function classifyBidiType(cp) {
   cp >= 1611 && cp <= 1631 || // Arabic harakat
   cp >= 1648 && cp <= 1648 || // Arabic superscript alef
   cp >= 1750 && cp <= 1756 || cp >= 1759 && cp <= 1764 || cp >= 1767 && cp <= 1768 || cp >= 1770 && cp <= 1773 || cp >= 65056 && cp <= 65071) return "NSM";
-  if (cp === 8203 || cp === 8204 || cp === 8205 || cp === 8206 || cp === 8207 || cp === 65279) return "BN";
+  if (cp === 8203 || cp === 8204 || cp === 8205 || cp === 8206 || cp === 8207 || cp === 65279 || cp === 8294 || cp === 8295 || cp === 8296 || cp === 8297) return "BN";
   if (cp >= 1632 && cp <= 1641) return "AN";
   if (cp >= 1776 && cp <= 1785) return "AN";
   if (cp >= 48 && cp <= 57) return "EN";
@@ -1603,18 +1642,153 @@ function fixBracketPairing(types, codePoints, len) {
     }
   }
 }
+function findOutermostIsolatePairs(codePoints) {
+  const pairs = [];
+  let i = 0;
+  while (i < codePoints.length) {
+    const cp = codePoints[i];
+    if (cp === 8294 || cp === 8295 || cp === 8296) {
+      let depth = 1;
+      let close = -1;
+      for (let j = i + 1; j < codePoints.length; j++) {
+        const cj = codePoints[j];
+        if (cj === 8294 || cj === 8295 || cj === 8296) depth++;
+        else if (cj === 8297) {
+          depth--;
+          if (depth === 0) {
+            close = j;
+            break;
+          }
+        }
+      }
+      if (close === -1) {
+        i++;
+        continue;
+      }
+      const kind = cp === 8294 ? "LRI" : cp === 8295 ? "RLI" : "FSI";
+      pairs.push({ open: i, close, kind });
+      i = close + 1;
+    } else {
+      i++;
+    }
+  }
+  return pairs;
+}
 function resolveBidiRuns(text) {
   if (!text) return [];
   const codePoints = [];
+  const cpToStr = [];
+  for (let i = 0; i < text.length; ) {
+    cpToStr.push(i);
+    const cp = text.codePointAt(i) ?? 0;
+    codePoints.push(cp);
+    i += cp > 65535 ? 2 : 1;
+  }
+  cpToStr.push(text.length);
+  const isolates = findOutermostIsolatePairs(codePoints);
+  if (isolates.length === 0) {
+    return resolveBidiCore(text, codePoints, cpToStr);
+  }
+  const insideIsolate = new Array(codePoints.length).fill(false);
+  for (const p of isolates) {
+    for (let k = p.open; k <= p.close; k++) insideIsolate[k] = true;
+  }
+  const outerTypes = codePoints.map((cp, idx) => insideIsolate[idx] ? "BN" : classifyBidiType(cp));
+  const parentLevel = detectParagraphLevel(outerTypes);
+  const out = [];
+  const emitSegment = (cpStart, cpEnd, forced) => {
+    if (cpStart >= cpEnd) return;
+    const segText = text.substring(cpToStr[cpStart], cpToStr[cpEnd]);
+    const segCps = codePoints.slice(cpStart, cpEnd);
+    const baseStrIdx = cpToStr[cpStart];
+    const segCpToStr = cpToStr.slice(cpStart, cpEnd + 1).map((x) => x - baseStrIdx);
+    const segRuns = forced === void 0 ? resolveBidiRuns(segText) : resolveBidiCore(segText, segCps, segCpToStr, forced);
+    for (const r of segRuns) {
+      out.push({ text: r.text, level: r.level, start: r.start + baseStrIdx });
+    }
+  };
+  let cursor = 0;
+  for (const pair of isolates) {
+    emitSegment(cursor, pair.open, parentLevel);
+    const innerStart = pair.open + 1;
+    const innerEnd = pair.close;
+    let innerLevel;
+    if (pair.kind === "LRI") innerLevel = 0;
+    else if (pair.kind === "RLI") innerLevel = 1;
+    else {
+      const innerTypes = codePoints.slice(innerStart, innerEnd).map(classifyBidiType);
+      innerLevel = detectParagraphLevel(innerTypes);
+    }
+    if (innerStart < innerEnd) {
+      const innerText = text.substring(cpToStr[innerStart], cpToStr[innerEnd]);
+      const innerRuns = resolveBidiRunsForced(innerText, innerLevel);
+      const baseStrIdx = cpToStr[innerStart];
+      for (const r of innerRuns) {
+        out.push({ text: r.text, level: r.level, start: r.start + baseStrIdx });
+      }
+    }
+    cursor = pair.close + 1;
+  }
+  emitSegment(cursor, codePoints.length, parentLevel);
+  return out;
+}
+function resolveBidiRunsForced(text, forcedLevel) {
+  if (!text) return [];
+  const codePoints = [];
+  const cpToStr = [];
   for (let i = 0; i < text.length; ) {
+    cpToStr.push(i);
     const cp = text.codePointAt(i) ?? 0;
     codePoints.push(cp);
     i += cp > 65535 ? 2 : 1;
   }
+  cpToStr.push(text.length);
+  const isolates = findOutermostIsolatePairs(codePoints);
+  if (isolates.length === 0) {
+    return resolveBidiCore(text, codePoints, cpToStr, forcedLevel);
+  }
+  const out = [];
+  const emit = (cpStart, cpEnd, forced) => {
+    if (cpStart >= cpEnd) return;
+    const segText = text.substring(cpToStr[cpStart], cpToStr[cpEnd]);
+    const segCps = codePoints.slice(cpStart, cpEnd);
+    const baseStrIdx = cpToStr[cpStart];
+    const segCpToStr = cpToStr.slice(cpStart, cpEnd + 1).map((x) => x - baseStrIdx);
+    const segRuns = resolveBidiCore(segText, segCps, segCpToStr, forced);
+    for (const r of segRuns) {
+      out.push({ text: r.text, level: r.level, start: r.start + baseStrIdx });
+    }
+  };
+  let cursor = 0;
+  for (const pair of isolates) {
+    emit(cursor, pair.open, forcedLevel);
+    const innerStart = pair.open + 1;
+    const innerEnd = pair.close;
+    let innerLevel;
+    if (pair.kind === "LRI") innerLevel = 0;
+    else if (pair.kind === "RLI") innerLevel = 1;
+    else {
+      const innerTypes = codePoints.slice(innerStart, innerEnd).map(classifyBidiType);
+      innerLevel = detectParagraphLevel(innerTypes);
+    }
+    if (innerStart < innerEnd) {
+      const innerText = text.substring(cpToStr[innerStart], cpToStr[innerEnd]);
+      const innerRuns = resolveBidiRunsForced(innerText, innerLevel);
+      const baseStrIdx = cpToStr[innerStart];
+      for (const r of innerRuns) {
+        out.push({ text: r.text, level: r.level, start: r.start + baseStrIdx });
+      }
+    }
+    cursor = pair.close + 1;
+  }
+  emit(cursor, codePoints.length, forcedLevel);
+  return out;
+}
+function resolveBidiCore(text, codePoints, cpToStr, forcedLevel) {
   const len = codePoints.length;
   if (len === 0) return [];
   const types = codePoints.map(classifyBidiType);
-  const paraLevel = detectParagraphLevel(types);
+  const paraLevel = forcedLevel !== void 0 ? forcedLevel : detectParagraphLevel(types);
   resolveWeakTypes(types, paraLevel);
   resolveNeutralTypes(types, paraLevel);
   if (paraLevel === 1) {
@@ -1625,13 +1799,6 @@ function resolveBidiRuns(text) {
   const runs = [];
   let runStart = 0;
   let runLevel = levels[0];
-  const cpToStr = [];
-  let strIdx = 0;
-  for (let i = 0; i < len; i++) {
-    cpToStr.push(strIdx);
-    strIdx += codePoints[i] > 65535 ? 2 : 1;
-  }
-  cpToStr.push(strIdx);
   for (let i = 1; i <= len; i++) {
     if (i === len || levels[i] !== runLevel) {
       const start = cpToStr[runStart];
@@ -1715,7 +1882,7 @@ function splitArabicNonArabic(text, fd) {
   if (cur) segments.push({ text: cur, arabic: curArabic });
   return segments;
 }
-function buildTextRunsWithFallback(text, fontRef, fd, sz, trackGid) {
+function buildTextRunsWithFallback(text, fontRef, fd, sz, trackGid, pdfA = false) {
   const upm = fd.metrics.unitsPerEm;
   const result = [];
   let mode = null;
@@ -1755,11 +1922,11 @@ function buildTextRunsWithFallback(text, fontRef, fd, sz, trackGid) {
     const cp = rawCp === 8239 || rawCp === 160 ? 32 : rawCp;
     const char = text.substring(i, i + charLen);
     const gid = fd.cmap[cp] ?? 0;
-    if (gid === 0 && isWinAnsi(cp)) {
+    if (gid === 0 && isWinAnsi(cp) && !pdfA) {
       if (mode === "cid") flushCid();
       mode = "hel";
       helChars += char;
-    } else if (mode === "hel" && isWinAnsi(cp)) {
+    } else if (mode === "hel" && isWinAnsi(cp) && !pdfA) {
       helChars += char;
     } else {
       if (mode === "hel") flushHel();
@@ -1776,7 +1943,7 @@ function buildTextRunsWithFallback(text, fontRef, fd, sz, trackGid) {
   if (mode === "hel") flushHel();
   return result;
 }
-function createEncodingContext(fontEntries) {
+function createEncodingContext(fontEntries, pdfA = false) {
   if (!fontEntries || fontEntries.length === 0) {
     return {
       isUnicode: false,
@@ -1832,12 +1999,12 @@ function createEncodingContext(fontEntries) {
                   }
                   result.push({ text: seg.text, fontRef, fontData: fd, shaped: visual, hexStr: null, widthPt: designW * sz / upm });
                 } else {
-                  const subRuns = buildTextRunsWithFallback(seg.text, fontRef, fd, sz, _trackGid);
+                  const subRuns = buildTextRunsWithFallback(seg.text, fontRef, fd, sz, _trackGid, pdfA);
                   result.push(...subRuns);
                 }
               }
             } else if (isRTL) {
-              const subRuns = buildTextRunsWithFallback(fRun.text, fontRef, fd, sz, _trackGid);
+              const subRuns = buildTextRunsWithFallback(fRun.text, fontRef, fd, sz, _trackGid, pdfA);
               result.push(...subRuns);
             } else {
               if (containsThai(fRun.text)) {
@@ -1881,7 +2048,7 @@ function createEncodingContext(fontEntries) {
                 }
                 result.push({ text: fRun.text, fontRef, fontData: fd, shaped, hexStr: null, widthPt: designW * sz / upm });
               } else {
-                const subRuns = buildTextRunsWithFallback(fRun.text, fontRef, fd, sz, _trackGid);
+                const subRuns = buildTextRunsWithFallback(fRun.text, fontRef, fd, sz, _trackGid, pdfA);
                 result.push(...subRuns);
               }
             }
@@ -1938,7 +2105,7 @@ function createEncodingContext(fontEntries) {
           }
           return [{ text: run.text, fontRef, fontData: fd, shaped, hexStr: null, widthPt: designW * sz / upm }];
         }
-        return buildTextRunsWithFallback(run.text, fontRef, fd, sz, _trackGid);
+        return buildTextRunsWithFallback(run.text, fontRef, fd, sz, _trackGid, pdfA);
       });
     },
     ps(str) {
@@ -2410,7 +2577,7 @@ function buildPdfMetadata(now = /* @__PURE__ */ new Date()) {
   const xmpDate = `${yyyy}-${mm}-${dd}T${hh}:${mi}:${ss}${tzSign}${tzH}:${tzM}`;
   return { pdfDate, xmpDate };
 }
-function buildXMPMetadata(title, createDate, pdfaPart = 2, pdfaConformance = "B", author) {
+function buildXMPMetadata(title, createDate, pdfaPart = 2, pdfaConformance = "B", author, subject, keywords) {
   const escapedTitle = escapeXml(title);
   const lines = [
     '<?xpacket begin="\xEF\xBB\xBF" id="W5M0MpCehiHzreSzNTczkc9d"?>',
@@ -2429,7 +2596,9 @@ function buildXMPMetadata(title, createDate, pdfaPart = 2, pdfaConformance = "B"
     `   <xmp:ModifyDate>${createDate}</xmp:ModifyDate>`,
     `   <xmp:MetadataDate>${createDate}</xmp:MetadataDate>`,
     `   <pdfaid:part>${pdfaPart}</pdfaid:part>`,
-    `   <pdfaid:conformance>${pdfaConformance}</pdfaid:conformance>`,
+    `   <pdfaid:conformance>${pdfaConformance}</pdfaid:conformance>`
+  );
+  lines.push(
     "  </rdf:Description>",
     " </rdf:RDF>",
     "</x:xmpmeta>",
@@ -2437,6 +2606,35 @@ function buildXMPMetadata(title, createDate, pdfaPart = 2, pdfaConformance = "B"
   );
   return lines.join("\n");
 }
+function utf8EncodeBinaryString(str) {
+  let out = "";
+  for (let i = 0; i < str.length; i++) {
+    let cp = str.charCodeAt(i);
+    if (cp >= 55296 && cp <= 56319 && i + 1 < str.length) {
+      const lo = str.charCodeAt(i + 1);
+      if (lo >= 56320 && lo <= 57343) {
+        cp = (cp - 55296 << 10) + (lo - 56320) + 65536;
+        i++;
+      }
+    }
+    if (cp < 128) {
+      out += String.fromCharCode(cp);
+    } else if (cp < 2048) {
+      out += String.fromCharCode(192 | cp >> 6);
+      out += String.fromCharCode(128 | cp & 63);
+    } else if (cp < 65536) {
+      out += String.fromCharCode(224 | cp >> 12);
+      out += String.fromCharCode(128 | cp >> 6 & 63);
+      out += String.fromCharCode(128 | cp & 63);
+    } else {
+      out += String.fromCharCode(240 | cp >> 18);
+      out += String.fromCharCode(128 | cp >> 12 & 63);
+      out += String.fromCharCode(128 | cp >> 6 & 63);
+      out += String.fromCharCode(128 | cp & 63);
+    }
+  }
+  return out;
+}
 function buildOutputIntentDict(iccStreamObjNum, subtype = "GTS_PDFA1") {
   return `<< /Type /OutputIntent /S /${subtype} /OutputConditionIdentifier (sRGB IEC61966-2.1) /RegistryName (http://www.color.org) /DestOutputProfile ${iccStreamObjNum} 0 R >>`;
 }
@@ -2683,13 +2881,42 @@ var DEFAULT_COLUMNS = [
   { f: 0.18, a: "c", mx: 20, mxH: 20 }
 ];
 function computeColumnPositions(columns, marginLeft, contentWidth) {
-  const cx = [];
-  const cwi = [];
+  const n = columns.length;
+  const cwi = new Array(n).fill(0);
+  const fixed = new Array(n).fill(false);
+  let totalFixed = 0;
+  let freeWeight = 0;
+  for (let i = 0; i < n; i++) {
+    const col = columns[i];
+    let w = col.f * contentWidth;
+    let clamped = false;
+    if (col.minWidth !== void 0 && w < col.minWidth) {
+      w = col.minWidth;
+      clamped = true;
+    }
+    if (col.maxWidth !== void 0 && w > col.maxWidth) {
+      w = col.maxWidth;
+      clamped = true;
+    }
+    if (clamped) {
+      cwi[i] = w;
+      fixed[i] = true;
+      totalFixed += w;
+    } else {
+      freeWeight += col.f;
+    }
+  }
+  const remaining = contentWidth - totalFixed;
+  if (freeWeight > 0) {
+    for (let i = 0; i < n; i++) {
+      if (!fixed[i]) cwi[i] = columns[i].f / freeWeight * remaining;
+    }
+  }
+  const cx = new Array(n);
   let x = marginLeft;
-  for (const col of columns) {
-    cx.push(x);
-    cwi.push(col.f * contentWidth);
-    x += col.f * contentWidth;
+  for (let i = 0; i < n; i++) {
+    cx[i] = x;
+    x += cwi[i];
   }
   return { cx, cwi };
 }
@@ -3159,7 +3386,9 @@ function buildPDF(params, layoutOptions) {
   const fs = DEFAULT_FONT_SIZES;
   const { cx, cwi } = computeColumnPositions(columns, mg.l, cw);
   const fontEntries = params.fontEntries || (fontData ? [{ fontData, fontRef: "/F3", lang: "unknown" }] : []);
-  const enc = createEncodingContext(fontEntries);
+  const pdfaConfig = resolvePdfAConfig();
+  const tagged = pdfaConfig.enabled;
+  const enc = createEncodingContext(fontEntries, tagged);
   const footerTpl = {
     left: footerText || void 0,
     right: "{page}/{pages}"
@@ -3180,8 +3409,6 @@ function buildPDF(params, layoutOptions) {
     totalPages = 1 + Math.ceil((totalRows - rowsPage1) / rowsPerPage);
   }
   if (totalPages < 1) totalPages = 1;
-  const pdfaConfig = resolvePdfAConfig();
-  const tagged = pdfaConfig.enabled;
   const encState = null;
   const wmExtraObjs = 0;
   const mcidAlloc = tagged ? createMCIDAllocator() : void 0;
@@ -3311,8 +3538,17 @@ function buildPDF(params, layoutOptions) {
       kids.push(`${pageObjStart + p * 2} 0 R`);
     }
     emitObj(2, `<< /Type /Pages /Kids [${kids.join(" ")}] /Count ${totalPages} >>`);
-    emitObj(3, "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >>");
-    emitObj(4, "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding >>");
+    if (tagged) {
+      const pf = fontEntries[0];
+      const bfName = `/${pf.fontData.fontName.replace(/[^A-Za-z0-9-]/g, "")}`;
+      const primaryBase = 5;
+      const refDict = `<< /Type /Font /Subtype /Type0 /BaseFont ${bfName} /Encoding /Identity-H /DescendantFonts [${primaryBase + 1} 0 R] /ToUnicode ${primaryBase + 4} 0 R >>`;
+      emitObj(3, refDict);
+      emitObj(4, refDict);
+    } else {
+      emitObj(3, "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >>");
+      emitObj(4, "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding >>");
+    }
     for (let fi = 0; fi < fontEntries.length; fi++) {
       const fe = fontEntries[fi];
       const fd = fe.fontData;
@@ -3406,7 +3642,7 @@ function buildPDF(params, layoutOptions) {
     structTreeRootObjNum = tree.structTreeRootObjNum;
     totalObjs = treeStart + tree.totalObjects - 1;
     xmpObjNum = totalObjs + 1;
-    const xmpContent = buildXMPMetadata(infoTitle, isoDate, pdfaConfig.pdfaPart, pdfaConfig.pdfaConformance);
+    const xmpContent = utf8EncodeBinaryString(buildXMPMetadata(infoTitle, isoDate, pdfaConfig.pdfaPart, pdfaConfig.pdfaConformance));
     emitStreamObj(
       xmpObjNum,
       `<< /Type /Metadata /Subtype /XML /Length ${xmpContent.length}`,