Fix issue with space offsets in TJs

mozilla · Oct 14, 2015 · 726beb4 · 726beb4
1 parent 2096a2a
commit 726beb4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -953,8 +953,9 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
           });
       }
 
-      function buildTextGeometry(chars, textChunk) {
+      function buildTextGeometry(chars, textChunk, previousChars) {
         var font = textState.font;
+        var offset = (isNum(previousChars) ? previousChars / 1000 : 0);
         textChunk = textChunk || newTextChunk();
         if (!textChunk.transform) {
           // 9.4.4 Text Space Details
@@ -1036,17 +1037,19 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
           var ty = 0;
           if (!font.vertical) {
             var w0 = glyphWidth * textState.fontMatrix[0];
-            tx = (w0 * textState.fontSize + charSpacing) *
+            tx = ((w0 - offset) * textState.fontSize + charSpacing) *
                  textState.textHScale;
             width += tx;
           } else {
             var w1 = glyphWidth * textState.fontMatrix[0];
-            ty = w1 * textState.fontSize + charSpacing;
+            ty = (w1 - offset) * textState.fontSize + charSpacing;
             height += ty;
           }
           textState.translateTextMatrix(tx, ty);
 
           textChunk.str.push(glyphUnicode);
+
+          offset = 0;
         }
 
         var a = textState.textLineMatrix[0];
@@ -1130,7 +1133,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
               var offset;
               for (var j = 0, jj = items.length; j < jj; j++) {
                 if (typeof items[j] === 'string') {
-                  buildTextGeometry(items[j], textChunk);
+                  buildTextGeometry(items[j], textChunk,
+                                   (j > 0 ? items[j - 1] : 0));
                 } else {
                   // PDF Specification 5.3.2 states:
                   // The number is expressed in thousandths of a unit of text

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -74,6 +74,7 @@
 !issue1171.pdf
 !smaskdim.pdf
 !endchar.pdf
+!pr6019.pdf
 !type4psfunc.pdf
 !issue1350.pdf
 !S2.pdf

diff --git a/test/pdfs/pr6019.pdf b/test/pdfs/pr6019.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -922,6 +922,13 @@
       "rounds": 1,
       "type": "eq"
     },
+    {  "id": "pr6019",
+      "file": "pdfs/pr6019.pdf",
+      "md5": "7a2e5dda3b0fc5c2e9060e378a8cdc4e",
+      "rounds": 1,
+      "type": "text",
+      "link": false
+    },
     {  "id": "type4psfunc",
       "file": "pdfs/type4psfunc.pdf",
       "md5": "7e6027a02ff78577f74dccdf84e37189",