diff --git a/demo/src/index.ts b/demo/src/index.ts index abcefa4..f2e1614 100644 --- a/demo/src/index.ts +++ b/demo/src/index.ts @@ -44,7 +44,7 @@ const mirrorXGlyph = (g: Glyph) => g.map((l: Line) => l.map((p: Vec) => [1 - p[0], p[1]])); // font["ɜ"] = mirrorYGlyph(font["ɛ"]) -//alert(`ɯ: ${JSON.stringify(mirrorXGlyph(font["w"]))},`); +// alert(`ʏ: ${JSON.stringify(scaleGlyph(font["Y"]))},`); for (let l = 0; l < lowercase.length; l++) { if (font[lowercase[l]] === undefined) { @@ -99,13 +99,14 @@ const update = () => { rect.setAttribute("width", `${textSize[0]}`); rect.setAttribute("height", `${textSize[1]}`); rect.setAttribute("title", char); + /* const label = document.createElementNS(namespace, "text"); label.setAttribute("x", `${margin[0] + x * textSize[0] + 10}`); label.setAttribute("y", `${margin[1] + y * textSize[1] + 20}`); label.setAttribute("font-size", `${fontScale*20}em`) label.textContent = char; group.appendChild(label); - + */ lines.map((d: string) => { const path = document.createElementNS(namespace, "path"); path.setAttribute("d", d); diff --git a/src/glyphs/lowercase/base.ts b/src/glyphs/lowercase/base.ts index db7d274..90eb2a8 100644 --- a/src/glyphs/lowercase/base.ts +++ b/src/glyphs/lowercase/base.ts @@ -433,66 +433,69 @@ const base = { ], ɜ: [ [ - [0.25, 0.35], - [0.4, 0.3], - [0.75, 0.4], - [0.4, 0.5], - [0.75, 0.6], - [0.4, 0.7], - [0.25, 0.65], + [0.15, 0.3], + [0.85, 0.3], + [0.85, 0.7], + [0.15, 0.7], + ], + [ + [0.5, 0.5], + [0.85, 0.5], ], ], ɝ: [ [ - [0.25, 0.35], - [0.4, 0.3], - [0.75, 0.4], - [0.4, 0.5], - [0.75, 0.6], - [0.4, 0.7], - [0.25, 0.65], + [0.15, 0.3], + [0.7, 0.3], + [0.7, 0.7], + [0.15, 0.7], + ], + [ + [0.5, 0.5], + [0.73, 0.5], ], [ [0.85, 0.5], - [0.75, 0.45], - [0.75, 0.4], + [0.8, 0.45], + [0.8, 0.4], + [0.7, 0.4], ], ], ɞ: [ [ - [0.25, 0.65], - [0.2, 0.55], - [0.2, 0.45], - [0.25, 0.35], - [0.4, 0.3], - [0.75, 0.4], - [0.4, 0.5], - [0.75, 0.6], - [0.4, 0.7], - [0.25, 0.65], + [0.2, 0.3], + [0.8, 0.3], + [0.8, 0.7], + [0.2, 0.7], + [0.2, 0.3], + ], + [ + [0.5, 0.5], + [0.8, 0.5], ], ], ʚ: [ [ - [0.75, 0.65], - [0.8, 0.55], - [0.8, 0.45], - [0.75, 0.35], - [0.6, 0.3], - [0.25, 0.4], - [0.6, 0.5], - [0.25, 0.6], - [0.6, 0.7], - [0.75, 0.65], + [0.2, 0.3], + [0.8, 0.3], + [0.8, 0.7], + [0.2, 0.7], + [0.2, 0.3], + ], + [ + [0.2, 0.5], + [0.5, 0.5], ], ], ɤ: [ [ - [0.15, 0.3], + [0.15, 0.4], + [0.25, 0.3], [0.65, 0.6], [0.5, 0.7], [0.35, 0.6], - [0.85, 0.3], + [0.75, 0.3], + [0.85, 0.4], ], ], @@ -1936,11 +1939,10 @@ const base = { [0.25, 0.7], [0.75, 0.7], [0.55, 0.3], - [0.85, 0.3] - ] + [0.85, 0.3], + ], ], - v: [ [ [0.15, 0.3], @@ -1948,6 +1950,30 @@ const base = { [0.85, 0.3], ], ], + ʋ: [ + [ + [0.15, 0.3], + [0.5, 0.7], + [0.85, 0.3], + [0.65, 0.3], + ], + ], + ỽ: [ + [ + [0.15, 0.15], + [0.5, 0.7], + [0.85, 0.4], + [0.65, 0.4], + ], + ], + ʌ: [ + [ + [0.15, 0.7], + [0.5, 0.3], + [0.85, 0.7], + ], + ], + w: [ [ [0.15, 0.3], @@ -1963,6 +1989,22 @@ const base = { [0.5, 0.7], ], ], + ʍ: [ + [ + [0.85, 0.7], + [0.85, 0.275], + ], + [ + [0.85, 0.3], + [0.15, 0.3], + [0.15, 0.7], + ], + [ + [0.5, 0.7], + [0.5, 0.3], + ], + ], + x: [ [ [0.15, 0.3], @@ -1973,6 +2015,7 @@ const base = { [0.15, 0.7], ], ], + y: [ [ [0.15, 0.3], @@ -1985,6 +2028,72 @@ const base = { [0.5, 0.9], ], ], + ʏ: [ + [ + [0.265,0.3], + [0.5, 0.5], + [0.73, 0.3] + ], + [ + [0.5, 0.5], + [0.5,0.628] + ] + ], + ɏ: [ + [ + [0.25, 0.3], + [0.25, 0.7], + [0.775, 0.7], + ], + [ + [0.75, 0.3], + [0.75, 0.9], + [0.5, 0.9], + ], + [ + [0.15, 0.5], + [0.85, 0.5] + ] + ], + ƴ: [ + [ + [0.15, 0.3], + [0.15, 0.7], + [0.775, 0.7], + ], + [ + [0.85, 0.3], + [0.75, 0.3], + [0.75, 0.9], + [0.5, 0.9], + ], + ], + ỿ: [ + [ + [0.15, 0.3], + [0.15, 0.7], + [0.775, 0.7], + ], + [ + [0.75, 0.3], + [0.75, 0.9], + [0.5, 0.9], + [0.85, 0.7] + ], + ], + ȝ: [ + [ + [0.25, 0.4], + [0.75, 0.3], + [0.75, 0.65], + [0.25, 0.75], + ], + [ + [0.5, 0.55], + [0.75, 0.5], + ], + ], + z: [ [ [0.15, 0.3], diff --git a/src/glyphs/lowercase/diaBaseAssociation.ts b/src/glyphs/lowercase/diaBaseAssociation.ts index e421b3b..96efc29 100644 --- a/src/glyphs/lowercase/diaBaseAssociation.ts +++ b/src/glyphs/lowercase/diaBaseAssociation.ts @@ -277,15 +277,37 @@ const diaBaseAssociation = { ṳ: ["u", ["drb"]], ṷ: ["u", ["crb"]], ṵ: ["u", ["tlb"]], - + // v ṽ: ["v", ["tl"]], ṿ: ["v", ["db"]], + + // w + ẃ: ["w", ["ct"]], + ẁ: ["w", ["gr"]], + ŵ: ["w", ["cr"]], + ẘ: ["w", ["gs"]], + ẅ: ["w", ["dr"]], + ẇ: ["w", ["da"]], + ẉ: ["w", ["db"]], + + // x + ẍ: ["x", ["dr"]], + ẋ: ["x", ["da"]], + + // y + ý: ["y", ["ct"]], ỳ: ["y", ["gr"]], + ŷ: ["y", ["cr"]], + ẙ: ["y", ["gs"]], + ÿ: ["y", ["dr"]], + ỹ: ["y", ["tl"]], + ẏ: ["y", ["da"]], + ȳ: ["y", ["mc"]], + ỵ: ["y", ["db"]], ỷ: ["y", ["ha"]], - ỹ: ["y", ["tl"]], } as ExtendedTable; export { diaBaseAssociation };