Merge pull request mozilla#12270 from janpe2/type1-accents

Accent positioning in Type1 `seac` glyphs
Snuffleupagus · Aug 24, 2020 · 34cec29 · 34cec29
2 parents 0f4fc12 + e7febbf
commit 34cec29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/type1_parser.js b/src/core/type1_parser.js
@@ -232,7 +232,9 @@ var Type1CharString = (function Type1CharStringClosure() {
               // seac is like type 2's special endchar but it doesn't use the
               // first argument asb, so remove it.
               if (seacAnalysisEnabled) {
+                const asb = this.stack[this.stack.length - 5];
                 this.seac = this.stack.splice(-4, 4);
+                this.seac[0] += this.lsb - asb;
                 error = this.executeCommand(0, COMMAND_MAP.endchar);
               } else {
                 error = this.executeCommand(4, COMMAND_MAP.endchar);

diff --git a/src/display/canvas.js b/src/display/canvas.js
@@ -1798,8 +1798,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
           } else {
             this.paintChar(character, scaledX, scaledY, patternTransform);
             if (accent) {
-              scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
-              scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
+              scaledAccentX =
+                scaledX + (fontSize * accent.offset.x) / fontSizeScale;
+              scaledAccentY =
+                scaledY - (fontSize * accent.offset.y) / fontSizeScale;
               this.paintChar(
                 accent.fontChar,
                 scaledAccentX,