Use ActualText when getting the text for the text layer

Author: calixteman

src/core/evaluator.js

@@ -2406,6 +2406,7 @@ class PartialEvaluator {
       transform: null,
       fontName: null,
       hasEOL: false,
+      span: "",
     };
 
     // Use a circular buffer (length === 2) to save the last chars in the
@@ -3068,6 +3069,16 @@ class PartialEvaluator {
       textContent.items.push(runBidiTransform(textContentItem));
       textContentItem.initialized = false;
       textContentItem.str.length = 0;
+      textContentItem.span = "";
+    }
+
+    function replaceTextContentBySpan() {
+      const { span, str } = textContentItem;
+      if (!span || str.length === 0) {
+        return;
+      }
+      str.length = 0;
+      str.push(span);
     }
 
     function enqueueChunk(batch = false) {
@@ -3446,6 +3457,11 @@ class PartialEvaluator {
             return;
           case OPS.beginMarkedContent:
             flushTextContentItem();
+            if (args[0]?.name === "Span") {
+              textContentItem.span = stringToPDFString(
+                args[1]?.get("ActualText") || ""
+              );
+            }
             if (includeMarkedContent) {
               markedContentData.level++;
 
@@ -3457,6 +3473,11 @@ class PartialEvaluator {
             break;
           case OPS.beginMarkedContentProps:
             flushTextContentItem();
+            if (args[0]?.name === "Span") {
+              textContentItem.span = stringToPDFString(
+                args[1]?.get("ActualText") || ""
+              );
+            }
             if (includeMarkedContent) {
               markedContentData.level++;
 
@@ -3474,6 +3495,7 @@ class PartialEvaluator {
             }
             break;
           case OPS.endMarkedContent:
+            replaceTextContentBySpan();
             flushTextContentItem();
             if (includeMarkedContent) {
               if (markedContentData.level === 0) {

test/pdfs/.gitignore

@@ -726,3 +726,4 @@
 !chrome-text-selection-markedContent.pdf
 !bug1963407.pdf
 !issue19517.pdf
+!issue20007.pdf

test/pdfs/issue20007.pdf

@@ -3923,6 +3923,20 @@ Caron Broadcasting, Inc., an Ohio corporation (“Lessee”).`)
       expect(items[1].fontName).not.toEqual(items[0].fontName);
     });
 
+    it("get the text a content stream containing some ActualText", async function () {
+      const loadingTask = getDocument(buildGetDocumentParams("issue20007.pdf"));
+      const pdfDoc = await loadingTask.promise;
+      const pdfPage = await pdfDoc.getPage(1);
+
+      const { items } = await pdfPage.getTextContent({
+        disableNormalization: true,
+      });
+      const text = mergeText(items);
+      expect(text).toEqual("The quick brown fox jumps over the lazy dog");
+
+      await loadingTask.destroy();
+    });
+
     it("gets empty structure tree", async function () {
       const tree = await page.getStructTree();