Fix pattern-filled text (embedded fonts only) #9090

janpe2 · 2017-10-31T16:53:37Z

Fixes #8940
Fixes #5432 (AkzoNobel file)
Fixes #3988 (texts now have gradient fill instead of solid color)

This PR fixes the rendering of texts that have a tiling or shading pattern as a fill color and an embedded font is used.

The problems in the reported issues are caused by ctx.fillText(). The glyphs and the pattern would need their own transforms but ctx.fillText() uses the same transform for them both. Thus either the text or the pattern gets incorrectly transformed. My solution is to draw glyphs as paths, so I can use a different transform for the pattern and the glyphs. However I can't fix texts that use system fonts because it's impossible to get glyphs as paths from system fonts.

The file test/pdfs/ShowText-ShadingPattern.pdf (test case ShowText-ShadingPattern) is rendered better now. The "Arial" text is correct because it uses an embedded font. The "Helvetica" text is still wrong since it uses a system font.

This PR continues the work that was started in PR #6820.

timvandermeij · 2017-10-31T20:24:36Z

Thank you for looking into this! I'm just adding that at #3988 a new link to the PDF file has been put in the comments.

timvandermeij · 2017-11-01T22:02:57Z

/botio-linux preview

pdfjsbot · 2017-11-01T22:02:58Z

From: Bot.io (Linux m4)

Received

Command cmd_preview from @timvandermeij received. Current queue size: 0

Live output at: http://54.67.70.0:8877/fd85f4d3c7a93a6/output.txt

pdfjsbot · 2017-11-01T22:05:26Z

From: Bot.io (Linux m4)

Success

Full output at http://54.67.70.0:8877/fd85f4d3c7a93a6/output.txt

Total script time: 2.45 mins

Published

Snuffleupagus · 2017-11-28T16:33:29Z

/botio test

pdfjsbot · 2017-11-28T16:33:29Z

From: Bot.io (Linux m4)

Received

Command cmd_test from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.67.70.0:8877/59d8d498cf861cc/output.txt

pdfjsbot · 2017-11-28T16:33:30Z

From: Bot.io (Windows)

Received

Command cmd_test from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.215.176.217:8877/c90791774c74c38/output.txt

pdfjsbot · 2017-11-28T16:50:46Z

From: Bot.io (Linux m4)

Failed

Full output at http://54.67.70.0:8877/59d8d498cf861cc/output.txt

Total script time: 17.27 mins

Font tests: Passed
Unit tests: Passed
Regression tests: FAILED

Image differences available at: http://54.67.70.0:8877/59d8d498cf861cc/reftest-analyzer.html#web=eq.log

Snuffleupagus

Sorry for the review delay here!

This looks like a great improvement over the current state; thank you for the patch!
I've left a couple of comments, basically nits, but other than that the general approach seem fine to me :-)

Snuffleupagus · 2017-11-28T16:43:16Z

src/core/evaluator.js

@@ -584,7 +584,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
      var glyphs = font.charsToGlyphs(chars);
      var isAddToPathSet = !!(state.textRenderingMode &
                              TextRenderingMode.ADD_TO_PATH_FLAG);
-      if (font.data && (isAddToPathSet || this.options.disableFontFace)) {
+      if (font.data && (isAddToPathSet || this.options.disableFontFace ||
+          state.fillColorSpace.name === 'Pattern')) {


Nit: To make it easier to interpret this condition, can you please re-align it as follows instead?

if (font.data && (isAddToPathSet || this.options.disableFontFace || state.fillColorSpace.name === 'Pattern')) {

Snuffleupagus · 2017-11-28T16:44:46Z

src/display/canvas.js

@@ -1347,7 +1347,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
      this.moveText(0, this.current.leading);
    },

-    paintChar: function CanvasGraphics_paintChar(character, x, y) {
+    paintChar: function CanvasGraphics_paintChar(character, x, y,


Nit: Taking full advantage of ES6 syntax, the entire method signature can be simplified to just:

paintChar(character, x, y, patternTransform) {

Snuffleupagus · 2017-11-28T16:46:15Z

src/display/canvas.js

            if (accent) {
              scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
              scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
-              this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY);
+              this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY,
+                patternTransform);


Nit: Let's align this with the arguments above instead.

this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY, patternTransform);

Snuffleupagus · 2017-11-28T16:48:19Z

src/display/canvas.js

-        // TODO: Some shading patterns are not applied correctly to text,
-        //       e.g. issues 3988 and 5432, and ShowText-ShadingPattern.pdf.
-        ctx.fillStyle = current.fillColor.getPattern(ctx, this);
+        // TODO: Patterns are not applied correctly to text if a system font


Nit: Let's replace system font with non-embedded font instead here, since that's more inline with the notation used elsewhere in PDF.js.

pdfjsbot · 2017-11-28T16:58:03Z

From: Bot.io (Windows)

Failed

Full output at http://54.215.176.217:8877/c90791774c74c38/output.txt

Total script time: 24.53 mins

Font tests: Passed
Unit tests: Passed
Regression tests: FAILED

Image differences available at: http://54.215.176.217:8877/c90791774c74c38/reftest-analyzer.html#web=eq.log

Snuffleupagus · 2017-11-28T18:45:10Z

/botio test

pdfjsbot · 2017-11-28T18:45:11Z

From: Bot.io (Linux m4)

Received

Command cmd_test from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.67.70.0:8877/92c21060baa45b8/output.txt

pdfjsbot · 2017-11-28T18:45:12Z

From: Bot.io (Windows)

Received

Command cmd_test from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.215.176.217:8877/fc697e83aaed119/output.txt

pdfjsbot · 2017-11-28T19:02:32Z

From: Bot.io (Linux m4)

Failed

Full output at http://54.67.70.0:8877/92c21060baa45b8/output.txt

Total script time: 17.34 mins

Font tests: Passed
Unit tests: Passed
Regression tests: FAILED

Image differences available at: http://54.67.70.0:8877/92c21060baa45b8/reftest-analyzer.html#web=eq.log

pdfjsbot · 2017-11-28T19:09:05Z

From: Bot.io (Windows)

Failed

Full output at http://54.215.176.217:8877/fc697e83aaed119/output.txt

Total script time: 23.87 mins

Font tests: Passed
Unit tests: Passed
Regression tests: FAILED

Image differences available at: http://54.215.176.217:8877/fc697e83aaed119/reftest-analyzer.html#web=eq.log

Snuffleupagus · 2017-11-28T19:10:16Z

/botio makeref

pdfjsbot · 2017-11-28T19:10:17Z

From: Bot.io (Linux m4)

Received

Command cmd_makeref from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.67.70.0:8877/52f8bd48d88aef9/output.txt

pdfjsbot · 2017-11-28T19:10:17Z

From: Bot.io (Windows)

Received

Command cmd_makeref from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.215.176.217:8877/4898f4b4b973534/output.txt

pdfjsbot · 2017-11-28T19:26:26Z

From: Bot.io (Linux m4)

Success

Full output at http://54.67.70.0:8877/52f8bd48d88aef9/output.txt

Total script time: 16.14 mins

Lint: Passed
Make references: Passed
Check references: Passed

pdfjsbot · 2017-11-28T19:32:01Z

From: Bot.io (Windows)

Success

Full output at http://54.215.176.217:8877/4898f4b4b973534/output.txt

Total script time: 21.73 mins

Lint: Passed
Make references: Passed
Check references: Passed

alafr · 2017-12-06T22:19:57Z

Is it possible to do the same for pattern-stroked text?
pattern stroked text.pdf

Fix pattern-filled text (embedded fonts only)

timvandermeij added shading-pattern tiling-type labels Oct 31, 2017

Snuffleupagus approved these changes Nov 28, 2017

View reviewed changes

Fix pattern-filled text

06d083b

janpe2 force-pushed the pattern-text branch from eddf58d to 06d083b Compare November 28, 2017 17:43

Snuffleupagus merged commit e78fe84 into mozilla:master Nov 28, 2017

Snuffleupagus mentioned this pull request Nov 29, 2017

Wrong positioning of text when using a tiling pattern #9217

Closed

janpe2 deleted the pattern-text branch December 19, 2017 19:35

movsb pushed a commit to movsb/pdf.js that referenced this pull request Jul 14, 2018

Merge pull request mozilla#9090 from janpe2/pattern-text

25cf28c

Fix pattern-filled text (embedded fonts only)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix pattern-filled text (embedded fonts only) #9090

Fix pattern-filled text (embedded fonts only) #9090

janpe2 commented Oct 31, 2017 •

edited

timvandermeij commented Oct 31, 2017

timvandermeij commented Nov 1, 2017

pdfjsbot commented Nov 1, 2017

pdfjsbot commented Nov 1, 2017

Snuffleupagus commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

Snuffleupagus left a comment •

edited

Snuffleupagus Nov 28, 2017

Snuffleupagus Nov 28, 2017 •

edited

Snuffleupagus Nov 28, 2017

Snuffleupagus Nov 28, 2017

pdfjsbot commented Nov 28, 2017

Snuffleupagus commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

Snuffleupagus commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

alafr commented Dec 6, 2017

Fix pattern-filled text (embedded fonts only) #9090

Fix pattern-filled text (embedded fonts only) #9090

Conversation

janpe2 commented Oct 31, 2017 • edited

timvandermeij commented Oct 31, 2017

timvandermeij commented Nov 1, 2017

pdfjsbot commented Nov 1, 2017

From: Bot.io (Linux m4)

Received

pdfjsbot commented Nov 1, 2017

From: Bot.io (Linux m4)

Success

Published

Snuffleupagus commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

From: Bot.io (Linux m4)

Received

pdfjsbot commented Nov 28, 2017

From: Bot.io (Windows)

Received

pdfjsbot commented Nov 28, 2017

From: Bot.io (Linux m4)

Failed

Snuffleupagus left a comment • edited

Choose a reason for hiding this comment

Snuffleupagus Nov 28, 2017

Choose a reason for hiding this comment

Snuffleupagus Nov 28, 2017 • edited

Choose a reason for hiding this comment

Snuffleupagus Nov 28, 2017

Choose a reason for hiding this comment

Snuffleupagus Nov 28, 2017

Choose a reason for hiding this comment

pdfjsbot commented Nov 28, 2017

From: Bot.io (Windows)

Failed

Snuffleupagus commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

From: Bot.io (Linux m4)

Received

pdfjsbot commented Nov 28, 2017

From: Bot.io (Windows)

Received

pdfjsbot commented Nov 28, 2017

From: Bot.io (Linux m4)

Failed

pdfjsbot commented Nov 28, 2017

From: Bot.io (Windows)

Failed

Snuffleupagus commented Nov 28, 2017

pdfjsbot commented Nov 28, 2017

From: Bot.io (Linux m4)

Received

pdfjsbot commented Nov 28, 2017

From: Bot.io (Windows)

Received

pdfjsbot commented Nov 28, 2017

From: Bot.io (Linux m4)

Success

pdfjsbot commented Nov 28, 2017

From: Bot.io (Windows)

Success

alafr commented Dec 6, 2017

janpe2 commented Oct 31, 2017 •

edited

Snuffleupagus left a comment •

edited

Snuffleupagus Nov 28, 2017 •

edited