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

Add Fraktur e/o/ø (#2445)

Browse source 
* Add
  - LATIN SMALL LETTER BLACKLETTER E (`U+AB32`).
  - LATIN SMALL LETTER BLACKLETTER O (`U+AB3D`).
  - LATIN SMALL LETTER BLACKLETTER O WITH STROKE (`U+AB3E`).
  - MATHEMATICAL FRAKTUR SMALL E (`U+1D522`).
  - MATHEMATICAL FRAKTUR SMALL O (`U+1D52C`).

* Notes (#2443, #444)

* Refine
This commit is contained in:
Belleve 2024-07-30 02:28:53 -10:00 • committed by GitHub
parent edfd04dae6
commit 67f12d42af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 382 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/geometry/src/box.mjs
View file

@ -3,7 +3,7 @@ import { mix } from "@iosevka/util";
export class Box {
constructor(t, b, l, r) {
this.top = t;
this.bottom = this.bot = b;
this.bot = this.bottom = b;
this.left = l;
this.right = r;
this.xMid = this.xMiddle = mix(l, r, 0.5);
@ -43,6 +43,10 @@ export class Box {
this.right,
);
}
xp(t) {
return this.mixX(t);
}
mixX(t) {
return mix(this.left, this.right, t);
}
@ -52,6 +56,10 @@ export class Box {
mixXMidRight(t) {
return mix(this.xMid, this.right, t);
}
yp(t) {
return this.mixY(t);
}
mixY(t) {
return mix(this.bottom, this.top, t);
}

82
packages/geometry/src/spiro-control.mjs
View file

@ -182,12 +182,17 @@ class CoordinatePropagator {
const stateC = ic ? this.stateY : this.stateX;
if (stateC[i] === CR_RESOLVED) return;
if (stateC[i] === CR_RESOLVING) throw new Error("Circular dependency detected");
if (stateC[i] === CR_RESOLVING) {
console.log(this);
throw new Error("Circular dependency detected");
}
stateC[i] = CR_RESOLVING;
if (depC[i] & DEP_PRE_X) this.solve(this.cycI(i - 1), 0);
if (depC[i] & DEP_PRE_Y) this.solve(this.cycI(i - 1), 1);
if (depC[i] & DEP_SAME_X) this.solve(this.cycI(i), 0);
if (depC[i] & DEP_SAME_Y) this.solve(this.cycI(i), 1);
if (depC[i] & DEP_POST_X) this.solve(this.cycI(i + 1), 0);
if (depC[i] & DEP_POST_Y) this.solve(this.cycI(i + 1), 1);
@ -215,8 +220,10 @@ const RES_DEP_STAGE_INTERPOLATION = 2;
export const DEP_SKIP = 0x1;
export const DEP_PRE_X = 0x2;
export const DEP_PRE_Y = 0x4;
export const DEP_POST_X = 0x8;
export const DEP_POST_Y = 0x10;
export const DEP_SAME_X = 0x8;
export const DEP_SAME_Y = 0x10;
export const DEP_POST_X = 0x20;
export const DEP_POST_Y = 0x40;
const DEP_PRE = DEP_PRE_X | DEP_PRE_Y;
const DEP_POST = DEP_POST_X | DEP_POST_Y;
@ -239,9 +246,9 @@ export class UserControlKnot {
getDependency(stage) {
switch (stage) {
case RES_DEP_STAGE_COORDINATE_PROPOGATION_X:
return typeof this.x === "number" ? 0 : this.x.getDependency(stage);
return typeof this.x === "number" ? 0 : this.x.getDependencyForX();
case RES_DEP_STAGE_COORDINATE_PROPOGATION_Y:
return typeof this.y === "number" ? 0 : this.y.getDependency(stage);
return typeof this.y === "number" ? 0 : this.y.getDependencyForY();
case RES_DEP_STAGE_INTERPOLATION:
return 0;
default:
@ -256,10 +263,10 @@ export class UserControlKnot {
// console.log(this, ic, pre, post);
switch (ic) {
case 0:
this.x = this.x.resolve(pre, this, post);
this.x = this.x.resolveX(pre, this, post);
break;
case 1:
this.y = this.y.resolve(pre, this, post);
this.y = this.y.resolveY(pre, this, post);
break;
}
}
@ -292,7 +299,7 @@ export class UserCloseKnotPair {
}
getKernelKnot() {
return this.center;
return this.center.getKernelKnot();
}
resolveCoordiantePropogation(ic, pre, post) {
this.center.resolveCoordiantePropogation(ic, pre, post);
@ -333,11 +340,10 @@ export class InterpolatorBase {
return 0;
}
}
getKernelKnot() {
throw new Error("Unreachable");
}
resolveCoordiantePropogation(pre, post) {
resolveCoordiantePropogation() {
throw new Error("Unreachable");
}
@ -349,6 +355,16 @@ export class InterpolatorBase {
}
}
export class DecorInterpolator extends InterpolatorBase {
constructor(items) {
super();
this.items = items;
}
resolveInterpolation(pre, post) {
return this.items;
}
}
class FunctionInterpolator extends InterpolatorBase {
constructor(blendFn, extraArgs) {
super();
@ -359,9 +375,45 @@ class FunctionInterpolator extends InterpolatorBase {
return this.blendFn(pre, post, this.extraArgs);
}
}
/**
* This class denotes an interpolator that has a proxy knot. The proxy could be used in the
* coordinate propagation stage to resolve dependencies.
*/
export class KnotProxyInterpolator extends InterpolatorBase {
constructor(proxy, actual) {
super();
this.knotProxy = proxy;
this.actual = actual;
}
getDependency(stage) {
switch (stage) {
case RES_DEP_STAGE_COORDINATE_PROPOGATION_X:
case RES_DEP_STAGE_COORDINATE_PROPOGATION_Y:
return this.knotProxy.getDependency(stage);
default:
return this.actual.getDependency(stage);
}
}
getKernelKnot() {
return this.knotProxy.getKernelKnot();
}
resolveCoordiantePropogation(ic, pre, post) {
this.knotProxy.resolveCoordiantePropogation(ic, pre, post);
}
resolveInterpolation(pre, post) {
return this.actual.resolveInterpolation(pre, post);
}
}
export function Interpolator(blender, restParameters) {
return new FunctionInterpolator(blender, restParameters);
}
export function WithKnotProxy(proxy, actual) {
return new KnotProxyInterpolator(proxy, actual);
}
export class TerminateInstruction {
constructor(type, af) {
@ -378,10 +430,16 @@ export class TerminateInstruction {
///////////////////////////////////////////////////////////////////////////////////////////////////
export class DerivedCoordinateBase {
getDependency() {
getDependencyForX() {
throw new Error("Unimplemented");
}
resolve(pre, curr, post) {
getDependencyForY() {
throw new Error("Unimplemented");
}
resolveX(pre, curr, post) {
throw new Error("Unimplemented");
}
resolveY(pre, curr, post) {
throw new Error("Unimplemented");
}
}