diff --git a/src/type/p5.Font.js b/src/type/p5.Font.js index b3d0504758..87123456f9 100644 --- a/src/type/p5.Font.js +++ b/src/type/p5.Font.js @@ -737,25 +737,14 @@ export class Font { /////////////////////////////// HELPERS //////////////////////////////// - _verticalAlign(size) { - const { sCapHeight } = this.data?.['OS/2'] || {}; - const { unitsPerEm = 1000 } = this.data?.head || {}; - const { ascender = 0, descender = 0 } = this.data?.hhea || {}; - const current = ascender / 2; - const target = (sCapHeight || (ascender + descender)) / 2; - const offset = target - current; - return offset * size / unitsPerEm; - } - /* Returns an array of line objects, each containing { text, x, y, glyphs: [ {g, path} ] } */ _lineateAndPathify(str, x, y, width, height, options = {}) { let renderer = options?.graphics?._renderer || this._pInst._renderer; - - // save the baseline - let setBaseline = renderer.drawingContext.textBaseline; + renderer.push(); + renderer.textFont(this); // lineate and compute bounds for the text let { lines, bounds } = renderer._computeBounds @@ -772,8 +761,7 @@ export class Font { const axs = this._currentAxes(renderer); let pathsForLine = lines.map(l => this._lineToGlyphs(l, { scale, axs })); - // restore the baseline - renderer.drawingContext.textBaseline = setBaseline; + renderer.pop(); return pathsForLine; } @@ -857,7 +845,7 @@ export class Font { _position(renderer, lines, bounds, width, height) { - let { textAlign, textLeading } = renderer.states; + let { textAlign, textLeading, textSize } = renderer.states; let metrics = this._measureTextDefault(renderer, 'X'); let ascent = metrics.fontBoundingBoxAscent; diff --git a/src/type/textCore.js b/src/type/textCore.js index 64ead5490f..03348b6b64 100644 --- a/src/type/textCore.js +++ b/src/type/textCore.js @@ -2688,6 +2688,13 @@ function textCore(p5, fn) { return this._yAlignOffset(lineData, adjustedH); }; + p5.RendererGL.prototype._verticalAlignFont = function() { + const ctx = this.textDrawingContext(); + const metrics = ctx.measureText('X'); + return -metrics.alphabeticBaseline || + (-metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent); + } + p5.RendererGL.prototype._yAlignOffset = function (dataArr, height) { if (typeof height === 'undefined') { @@ -2700,12 +2707,12 @@ function textCore(p5, fn) { ((textLeading - textSize) * (numLines - 1)); switch (textBaseline) { // drawingContext ? case fn.TOP: - yOff = textSize; + yOff = this._verticalAlignFont(); break; case fn.BASELINE: break; case textCoreConstants._CTX_MIDDLE: - yOff = -totalHeight / 2 + textSize + (height || 0) / 2; + yOff = (-totalHeight + textSize + (height || 0)) / 2 + this._verticalAlignFont(); break; case fn.BOTTOM: yOff = -(totalHeight - textSize) + (height || 0); @@ -2714,7 +2721,6 @@ function textCore(p5, fn) { console.warn(`${textBaseline} is not supported in WebGL mode.`); // FES? break; } - yOff += this.states.textFont.font?._verticalAlign(textSize) || 0; // Does this function exist? dataArr.forEach(ele => ele.y += yOff); return dataArr; }; diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/000.png index 0a9043c1ca..b135d720b5 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/000.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/001.png index 879a6e9678..620e82a43d 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/001.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/002.png index 2bb12c3214..745839c3de 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/002.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/003.png index 00d7a57aa1..f97931399d 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/003.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/004.png index cbc732111f..2a34465b89 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/004.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/004.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/005.png index 26cb31e561..69f3660fa4 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/005.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/005.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/006.png index 0a9213607b..66b8d9228b 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/006.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/006.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/007.png index a8c3a805cb..c8ea5bbce1 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/007.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/007.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/008.png index 645e938b09..04b978ce37 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/008.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text, no box dimensions/008.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png index 339f1bd5d0..8fab5d2bb6 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png index 90698c7f28..3bc9830e4d 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png index a5a9490fe8..e22c4797ec 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png index 1a9a110c48..9affb5cdaf 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png index 493cc85c51..283e4f21b2 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/004.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png index 1524a41e81..4eabc5f9e1 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/005.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png index 8e34453dbb..54aa0c7423 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/006.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png index b75b92977d..6a5618d1e1 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/007.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png index 12020de4a6..e842b5ab1f 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-line manual text/008.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png index 150c342587..2cf899bb7d 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png index b61a7788c9..a2a0adadde 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png index a353f6a37f..ee2250dc61 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png index 9012e58b30..a1f8c4451c 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png index 3e9fb83840..72bbb5a9ea 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/004.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png index f493557a75..fef7478527 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/005.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png index 128c72195b..421625f3ec 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/006.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png index 2c4f829b64..07bdcee2de 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/007.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png index 9239857a40..dbc0dbeb2b 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap char/008.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png index f571f42148..793be07e24 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png index 462e6e8df6..ec88060a44 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png index 496c73d326..c4de1570f7 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png index 2b72b85b6c..f568b1a120 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png index 174c540232..1a5dd17f2f 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/004.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png index 3f4b37651c..07ac94abc0 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/005.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png index e2fe3738a2..1634bca7b9 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/006.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png index 465d86afba..bf4e0ffdc9 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/007.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png index e7987b1e45..1e43df9d79 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with multi-lines and wrap word/008.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png index 5f67b23cd0..810fd6e490 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png index 2d80d846ad..2fffb0fa5f 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png index 9ee769a72c..e3e72daf79 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png index 4929fd0907..82dd31a9c2 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png index 99f991da03..8410d822ea 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/004.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png index c50b267675..2cbf890321 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/005.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png index f2ea8e27ca..b4a3c773b4 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/006.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png index 846a1bf51a..b19b180dae 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/007.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png index 5cc2a7fea3..10fe9936c7 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single line/008.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png index 23f2678a80..eb57f1c81c 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png index 4931c86268..d5e11fae81 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png index b321783592..ef24a1b795 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png index f4be694605..76eefb9b9d 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png index 0e5b6b0a03..bea64399ec 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/004.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png index 4638c4b353..a776538b8d 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/005.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png index 52c39dadb4..5b8ab60b43 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/006.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png index 0bf414478d..0d120183c2 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/007.png differ diff --git a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png index aba3082227..503f642ca8 100644 Binary files a/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png and b/test/unit/visual/screenshots/Typography/textAlign/webgl mode/all alignments with single word/008.png differ diff --git a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/000.png b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/000.png index 8a03d92c01..974aaf2dee 100644 Binary files a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/000.png and b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/000.png differ diff --git a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/001.png b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/001.png index 5097c020a7..613fbdc16e 100644 Binary files a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/001.png and b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/001.png differ diff --git a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/002.png b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/002.png index 877827a966..d790b66e74 100644 Binary files a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/002.png and b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/002.png differ diff --git a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/003.png b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/003.png index 1d3be64b57..83872c4fac 100644 Binary files a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/003.png and b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/003.png differ diff --git a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/004.png b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/004.png index eeaf58be78..12f1a47672 100644 Binary files a/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/004.png and b/test/unit/visual/screenshots/Typography/textWeight/can control variable fonts from files in WebGL/004.png differ