@chialab/pdfjs-lib 1.0.0-alpha.34 → 1.0.0-alpha.36

package/dist/browser/index.js

@@ -42318,6 +42318,24 @@ var loadTextLayerFontsMap = /* @__PURE__ */ (() => {
     return promise;
   };
 })();
+var getTextDirection = (text) => {
+  const rtlChars = /[\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]/;
+  const ltrChars = /[A-Za-z]/;
+  let rtlCount = 0;
+  let ltrCount = 0;
+  for (const char of text) {
+    if (rtlChars.test(char)) {
+      rtlCount++;
+    }
+    if (ltrChars.test(char)) {
+      ltrCount++;
+    }
+  }
+  return rtlCount > ltrCount ? "rtl" : "ltr";
+};
+var isNameObject = (obj) => {
+  return obj !== null && typeof obj === "object" && "name" in obj;
+};
 async function createTextLayerV2(page, {
   graphics,
   annotations: _annotations
@@ -42341,6 +42359,7 @@ async function createTextLayerV2(page, {
   const markedContentStack = [rootContainer];
   let markedContent = rootContainer;
   let currentTextItem = null;
+  let transformMatrix = [1, 0, 0, 1, 0, 0];
   let textMatrix = [1, 0, 0, 1, 0, 0];
   let lineMatrix = [1, 0, 0, 1, 0, 0];
   let fontSize = 0;
@@ -42367,7 +42386,10 @@ async function createTextLayerV2(page, {
     const { font, glyphs: glyphsList } = currentTextItem;
     const textFont = fonts[font.bold || font.black ? font.italic ? 3 : 2 : font.italic ? 1 : 0];
     const riseMatrix = [1, 0, 0, 1, 0, textRise];
-    const finalMatrix = Util.transform(textMatrix, riseMatrix);
+    const finalMatrix = Util.transform(
+      transformMatrix,
+      Util.transform(textMatrix, riseMatrix)
+    );
     const [, , , , x, y] = Util.transform(transform, finalMatrix);
     const finalFontSize = fontSize * Math.sqrt(finalMatrix[2] ** 2 + finalMatrix[3] ** 2);
     const angle = -Math.atan2(finalMatrix[1], finalMatrix[0]);
@@ -42391,12 +42413,14 @@ async function createTextLayerV2(page, {
     );
     const chunks = [];
     let currentLeft = 0;
+    let computedText = "";
     for (let i = 0; i < glyphsBlocks.length; i++) {
       const glyphs = glyphsBlocks[i];
       if (glyphs.length === 0) {
         continue;
       }
       const text = glyphs.map((g) => g[0].unicode).join("");
+      computedText += text;
       const textWidth = textFont.getAdvanceWidth(text, fontSize);
       if (!textWidth) {
         continue;
@@ -42430,6 +42454,7 @@ async function createTextLayerV2(page, {
       }
       chunks.push({
         text,
+        width: textWidth,
         margin: margin * finalFontSize,
         scale: graphicWidth / textWidth
       });
@@ -42446,7 +42471,7 @@ async function createTextLayerV2(page, {
       fontSize: finalFontSize,
       fontWeight: font?.black ? 900 : font?.bold ? 700 : 400,
       fontStyle: font?.italic ? "italic" : "normal",
-      dir: "ltr",
+      dir: getTextDirection(computedText),
       scale: 1,
       angle: angle * (180 / Math.PI)
     });
@@ -42599,9 +42624,15 @@ async function createTextLayerV2(page, {
       case OPS.beginMarkedContentProps: {
         const [role, idRef, props] = args;
         const id2 = normalizeMarkedContentId(idRef);
+        let normalizedRole = isNameObject(role) ? role.name.toLowerCase() : role?.toString().toLowerCase();
+        switch (normalizedRole) {
+          case "placedgraphic":
+            normalizedRole = "figure";
+            break;
+        }
         markedContent.children.push({
           id: id2,
-          role: role?.toString().toLowerCase() || "span",
+          role: normalizedRole || "span",
           attrs: props ?? void 0,
           children: []
         });
@@ -42619,9 +42650,16 @@ async function createTextLayerV2(page, {
         }
         break;
       }
+      case OPS.transform: {
+        closeTextItem();
+        const [a, b, c, d, e, f] = args;
+        transformMatrix = Util.transform(transformMatrix, [a, b, c, d, e, f]);
+        break;
+      }
       case OPS.restore: {
         const state = stateStack.pop();
         if (state) {
+          transformMatrix = state.transformMatrix;
           textMatrix = state.textMatrix;
           lineMatrix = state.lineMatrix;
           fontSize = state.fontSize;
@@ -42636,6 +42674,7 @@ async function createTextLayerV2(page, {
       }
       case OPS.save: {
         stateStack.push({
+          transformMatrix: [...transformMatrix],
           textMatrix: [...textMatrix],
           lineMatrix: [...lineMatrix],
           fontSize,

package/dist/lib/AnnotationData.d.ts

@@ -42,6 +42,10 @@ export interface AnnotationData {
         str: string;
         dir: Dir;
     };
+    contentsObj?: {
+        str: string;
+        dir: Dir;
+    };
     popupRef?: string | null;
     [key: string]: unknown;
 }

package/dist/lib/TextLayer.d.ts

@@ -22,6 +22,7 @@ export interface TextLayerAnchor extends TextLayerElement {
 }
 export interface TextLayerChunk {
     text: string;
+    width: number;
     margin: number;
     scale?: number;
 }

package/dist/node/index.js

@@ -40960,6 +40960,24 @@ var loadTextLayerFontsMap = /* @__PURE__ */ (() => {
     return promise;
   };
 })();
+var getTextDirection = (text) => {
+  const rtlChars = /[\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]/;
+  const ltrChars = /[A-Za-z]/;
+  let rtlCount = 0;
+  let ltrCount = 0;
+  for (const char of text) {
+    if (rtlChars.test(char)) {
+      rtlCount++;
+    }
+    if (ltrChars.test(char)) {
+      ltrCount++;
+    }
+  }
+  return rtlCount > ltrCount ? "rtl" : "ltr";
+};
+var isNameObject = (obj) => {
+  return obj !== null && typeof obj === "object" && "name" in obj;
+};
 async function createTextLayerV2(page, {
   graphics,
   annotations: _annotations
@@ -40983,6 +41001,7 @@ async function createTextLayerV2(page, {
   const markedContentStack = [rootContainer];
   let markedContent = rootContainer;
   let currentTextItem = null;
+  let transformMatrix = [1, 0, 0, 1, 0, 0];
   let textMatrix = [1, 0, 0, 1, 0, 0];
   let lineMatrix = [1, 0, 0, 1, 0, 0];
   let fontSize = 0;
@@ -41009,7 +41028,10 @@ async function createTextLayerV2(page, {
     const { font, glyphs: glyphsList } = currentTextItem;
     const textFont = fonts[font.bold || font.black ? font.italic ? 3 : 2 : font.italic ? 1 : 0];
     const riseMatrix = [1, 0, 0, 1, 0, textRise];
-    const finalMatrix = Util.transform(textMatrix, riseMatrix);
+    const finalMatrix = Util.transform(
+      transformMatrix,
+      Util.transform(textMatrix, riseMatrix)
+    );
     const [, , , , x, y] = Util.transform(transform, finalMatrix);
     const finalFontSize = fontSize * Math.sqrt(finalMatrix[2] ** 2 + finalMatrix[3] ** 2);
     const angle = -Math.atan2(finalMatrix[1], finalMatrix[0]);
@@ -41033,12 +41055,14 @@ async function createTextLayerV2(page, {
     );
     const chunks = [];
     let currentLeft = 0;
+    let computedText = "";
     for (let i = 0; i < glyphsBlocks.length; i++) {
       const glyphs = glyphsBlocks[i];
       if (glyphs.length === 0) {
         continue;
       }
       const text = glyphs.map((g) => g[0].unicode).join("");
+      computedText += text;
       const textWidth = textFont.getAdvanceWidth(text, fontSize);
       if (!textWidth) {
         continue;
@@ -41072,6 +41096,7 @@ async function createTextLayerV2(page, {
       }
       chunks.push({
         text,
+        width: textWidth,
         margin: margin * finalFontSize,
         scale: graphicWidth / textWidth
       });
@@ -41088,7 +41113,7 @@ async function createTextLayerV2(page, {
       fontSize: finalFontSize,
       fontWeight: font?.black ? 900 : font?.bold ? 700 : 400,
       fontStyle: font?.italic ? "italic" : "normal",
-      dir: "ltr",
+      dir: getTextDirection(computedText),
       scale: 1,
       angle: angle * (180 / Math.PI)
     });
@@ -41241,9 +41266,15 @@ async function createTextLayerV2(page, {
       case OPS.beginMarkedContentProps: {
         const [role, idRef, props] = args;
         const id2 = normalizeMarkedContentId(idRef);
+        let normalizedRole = isNameObject(role) ? role.name.toLowerCase() : role?.toString().toLowerCase();
+        switch (normalizedRole) {
+          case "placedgraphic":
+            normalizedRole = "figure";
+            break;
+        }
         markedContent.children.push({
           id: id2,
-          role: role?.toString().toLowerCase() || "span",
+          role: normalizedRole || "span",
           attrs: props ?? void 0,
           children: []
         });
@@ -41261,9 +41292,16 @@ async function createTextLayerV2(page, {
         }
         break;
       }
+      case OPS.transform: {
+        closeTextItem();
+        const [a, b, c, d, e, f] = args;
+        transformMatrix = Util.transform(transformMatrix, [a, b, c, d, e, f]);
+        break;
+      }
       case OPS.restore: {
         const state = stateStack.pop();
         if (state) {
+          transformMatrix = state.transformMatrix;
           textMatrix = state.textMatrix;
           lineMatrix = state.lineMatrix;
           fontSize = state.fontSize;
@@ -41278,6 +41316,7 @@ async function createTextLayerV2(page, {
       }
       case OPS.save: {
         stateStack.push({
+          transformMatrix: [...transformMatrix],
           textMatrix: [...textMatrix],
           lineMatrix: [...lineMatrix],
           fontSize,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@chialab/pdfjs-lib",
 	"description": "A custom Mozilla's PDF.js build with better Node support and extras.",
-	"version": "1.0.0-alpha.34",
+	"version": "1.0.0-alpha.36",
 	"type": "module",
 	"author": "Chialab <dev@chialab.it>",
 	"license": "MIT",