mikeslab/Iosevka
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Use disjoint set to further avoid rounding errors (#1100)

Browse source
This commit is contained in:
be5invis 2021-06-05 19:14:19 -07:00
parent 1babc986cd
commit 4bf94aba27
2 changed files with 57 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
font-src/gen/caching/index.js
View file

@ -4,7 +4,7 @@ const fs = require("fs-extra");
const zlib = require("zlib"); const zlib = require("zlib");
const { encode, decode } = require("@msgpack/msgpack"); const { encode, decode } = require("@msgpack/msgpack");
const Edition = 8; const Edition = 9;
const MAX_AGE = 5; const MAX_AGE = 5;
class GfEntry { class GfEntry {

64
font-src/gen/finalize/glyphs.js
View file

@ -158,22 +158,24 @@ class FairizedShapeSink {
// Contour cleaning code // Contour cleaning code
alignHVKnots(c0) { alignHVKnots(c0) {
const c = c0.slice(0); const c = c0.slice(0);
const alignX = new CoordinateAligner(c, GetX, SetX);
const alignY = new CoordinateAligner(c, GetY, SetY);
for (let i = 0; i < c.length; i++) { for (let i = 0; i < c.length; i++) {
const zPrev = c[i], if (c[i].type === Point.Type.Corner) {
zCurr = c[(i + 1) % c.length]; alignX.tryAlign(i, (i + 1) % c.length);
if (zPrev.type === Point.Type.Corner) { alignY.tryAlign(i, (i + 1) % c.length);
if (occurrentPrecisionEqual(zPrev.x, zCurr.x)) zCurr.x = zPrev.x;
if (occurrentPrecisionEqual(zPrev.y, zCurr.y)) zCurr.y = zPrev.y;
} }
} }
for (let i = 0; i < c.length; i++) { for (let i = 0; i < c.length; i++) {
const zCurr = c[i], const zCurr = c[i],
zNext = c[(i + 1) % c.length]; zNext = c[(i + 1) % c.length];
if (zCurr.type === Point.Type.Quadratic && zNext.type === Point.Type.Corner) { if (zCurr.type === Point.Type.Quadratic && zNext.type === Point.Type.Corner) {
if (occurrentPrecisionEqual(zCurr.x, zNext.x)) zCurr.x = zNext.x; alignX.tryAlign(i, (i + 1) % c.length);
if (occurrentPrecisionEqual(zCurr.y, zNext.y)) zCurr.y = zNext.y; alignY.tryAlign(i, (i + 1) % c.length);
} }
} }
alignX.apply();
alignY.apply();
return c; return c;
} }
cleanupOccurrentKnots1(c0) { cleanupOccurrentKnots1(c0) {
@ -227,6 +229,52 @@ class FairizedShapeSink {
return c; return c;
} }
} }
// Disjoint set for coordinate alignment
class CoordinateAligner {
constructor(c, lens, lensSet) {
this.c = c;
this.lens = lens;
this.lensSet = lensSet;
this.rank = [];
this.up = [];
for (let i = 0; i < c.length; i++) {
const x = lens(c[i]);
this.up[i] = i;
this.rank[i] = Math.abs(x - Math.round(x));
}
}
find(i) {
if (this.up[i] !== i) {
this.up[i] = this.find(this.up[i]);
return this.up[i];
} else {
return i;
}
}
tryAlign(i, j) {
if (occurrentPrecisionEqual(this.lens(this.c[i]), this.lens(this.c[j]))) {
this.align(i, j);
}
}
align(i, j) {
i = this.find(i);
j = this.find(j);
if (this.rank[i] > this.rank[j]) [i, j] = [j, i];
this.up[j] = i;
}
apply() {
for (let i = 0; i < this.c.length; i++) {
this.lensSet(this.c[i], this.lens(this.c[this.find(i)]));
}
}
}
const GetX = z => z.x;
const SetX = (z, x) => (z.x = x);
const GetY = z => z.y;
const SetY = (z, y) => (z.y = y);
function isOccurrent(zFirst, zLast) { function isOccurrent(zFirst, zLast) {
return ( return (
zFirst.type === Point.Type.Corner && zFirst.type === Point.Type.Corner &&
@ -239,7 +287,7 @@ function occurrentPrecisionEqual(a, b) {
return Math.abs(a - b) < CurveUtil.OCCURRENT_PRECISION; return Math.abs(a - b) < CurveUtil.OCCURRENT_PRECISION;
} }
function aligned(a, b, c) { function aligned(a, b, c) {
return occurrentPrecisionEqual(a, b) && occurrentPrecisionEqual(b, c); return a === b && b === c;
} }
function between(a, b, c) { function between(a, b, c) {
return (a <= b && b <= c) || (a >= b && b >= c); return (a <= b && b <= c) || (a >= b && b >= c);