fix wrong diacritics and spot next fix

nclslbrn · May 19, 2024 · 57db8bc · 57db8bc
1 parent b8cd224
commit 57db8bc
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 59 deletions.
diff --git a/demo/src/index.ts b/demo/src/index.ts
@@ -3,25 +3,24 @@ import { Glyph, Line, Vec } from "../../src/type";
 import letters from "./letters";
 
 const DEBUG = true;
-//
-// const rotateGlyph = (g: Glyph) =>
-//   g.map((l: Line) => l.map((p: Vec) => [1 - p[0], 1 - p[1]]));
-// const upscaleGlyph = (g: Glyph) =>
-//   g.map((l: Line) =>
-//     l.map((p: Vec) => [p[0] * 1.33 - 0.166, p[1] * 1.33 - 0.33]),
-//   );
-//
-// const scaleGlyph = (g: Glyph) =>
-//   g.map((l: Line) =>
-//     l.map((p: Vec) => [0.166 + p[0] * 0.66, 0.166 + p[1] * 0.66]),
-//   );
-// const mirrorXGlyph = (g: Glyph) =>
-//   g.map((l: Line) => l.map((p: Vec) => [p[0], 1 - p[1]]));
-// const mirrorYGlyph = (g: Glyph) =>
-//   g.map((l: Line) => l.map((p: Vec) => [1 - p[0], p[1]]));
-//
-// font["ɜ"] = mirrorYGlyph(font["ɛ"])
-// alert(`Ɣ: ${JSON.stringify(upscaleGlyph(font["ɣ"]))},`);
+
+const rotateGlyph = (g: Glyph) =>
+  g.map((l: Line) => l.map((p: Vec) => [1 - p[0], 1 - p[1]]));
+const upscaleGlyph = (g: Glyph) =>
+  g.map((l: Line) =>
+    l.map((p: Vec) => [p[0] * 1.33 - 0.166, p[1] * 1.33 - 0.33]),
+  );
+
+const scaleGlyph = (g: Glyph) =>
+  g.map((l: Line) =>
+    l.map((p: Vec) => [0.166 + p[0] * 0.66, 0.166 + p[1] * 0.66]),
+  );
+const mirrorXGlyph = (g: Glyph) =>
+  g.map((l: Line) => l.map((p: Vec) => [p[0], 1 - p[1]]));
+const mirrorYGlyph = (g: Glyph) =>
+  g.map((l: Line) => l.map((p: Vec) => [1 - p[0], p[1]]));
+
+//alert(`ɐ: ${JSON.stringify(rotateGlyph(font["a"]))},`);
 
 const fontFamily =
   'ui-monospace, Menlo, Monaco,"Cascadia Mono", "Segoe UI Mono", "Roboto Mono","Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", monospace;';

diff --git a/src/lowercase/base.ts b/src/lowercase/base.ts
@@ -37,10 +37,13 @@ const base = {
   ],
   ɐ: [
     [
-      [0.15, 0.557],
-      [0.85, 0.557],
-      [0.85, 0.414],
       [0.15, 0.414],
+      [0.85, 0.414],
+      [0.85, 0.557],
+      [0.15, 0.557],
+    ],
+    [
+      [0.15, 0.4],
       [0.15, 0.7],
       [0.7, 0.7],
     ],
@@ -1817,7 +1820,7 @@ const base = {
       [0.15, 0.7],
     ],
     [
-      [0.65, 0.7],
+      [0.65, 0.85],
       [0.65, 0.414],
       [0.15, 0.414],
     ],

diff --git a/src/lowercase/diaBaseAssociation.ts b/src/lowercase/diaBaseAssociation.ts
@@ -21,8 +21,8 @@ const diaBaseAssociation = {
   ä: ["a", ["dr"]],
   ǟ: ["a", ["dr", "mc"]],
   ã: ["a", ["tl"]],
-  ȧ: ["a", ["gs"]],
-  ǡ: ["a", ["gs", "mc"]],
+  ȧ: ["a", ["da"]],
+  ǡ: ["a", ["da", "mc"]],
   ą: ["a", ["cdr"]],
   ā: ["a", ["mc"]],
   ả: ["a", ["ha"]],
@@ -31,7 +31,7 @@ const diaBaseAssociation = {
   ạ: ["a", ["db"]],
   ặ: ["a", ["br", "db"]],
   ậ: ["a", ["cr", "db"]],
-  ḁ: ["a", ["db"]],
+  ḁ: ["a", ["gsb"]],
   ǽ: ["æ", ["ct"]],
   ǣ: ["æ", ["mc"]],
   ẚ: ["a", ["hcr"]],
@@ -234,8 +234,8 @@ const diaBaseAssociation = {
   ș: ["s", ["cm"]],
   ẛ: ["ſ", ["da"]],
   ʂ: ["s", ["hbl"]],
-  
-  // t 
+
+  // t
   ť: ["t", ["ct"]],
   ẗ: ["t", ["dr"]],
   ṫ: ["t", ["da"]],
@@ -281,21 +281,20 @@ const diaBaseAssociation = {
   // v
   ṽ: ["v", ["tl"]],
   ṿ: ["v", ["db"]],
-  
-  // w 
+
+  // 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"]],
@@ -308,7 +307,7 @@ const diaBaseAssociation = {
   ỵ: ["y", ["db"]],
   ỷ: ["y", ["ha"]],
 
-  // z 
+  // z
   ź: ["z", ["ct"]],
   ẑ: ["z", ["cr"]],
   ž: ["z", ["hc"]],
@@ -320,7 +319,6 @@ const diaBaseAssociation = {
 
   //ž: ["z", ["hc"]],
   //ž: ["z", ["hc"]],
-
 } as ExtendedTable;
 
 export { diaBaseAssociation };
diff --git a/src/poncuation.ts b/src/poncuation.ts
@@ -95,10 +95,10 @@ const ponctuation = {
   ],
   "?": [
     [
-      [0.35, 0.2],
-      [0.5, 0.165],
-      [0.65, 0.2],
-      [0.65, 0.4],
+      [0.3, 0.3],
+      [0.3, 0.2],
+      [0.7, 0.2],
+      [0.7, 0.4],
       [0.5, 0.5],
       [0.5, 0.6],
     ],
@@ -109,10 +109,10 @@ const ponctuation = {
   ],
   "¿": [
     [
-      [0.65, 0.7],
-      [0.5, 0.735],
-      [0.35, 0.7],
-      [0.35, 0.5],
+      [0.3, 0.6],
+      [0.3, 0.7],
+      [0.7, 0.7],
+      [0.7, 0.5],
       [0.5, 0.4],
       [0.5, 0.3],
     ],
@@ -481,9 +481,23 @@ const ponctuation = {
     [
       [0.5125, 0.2],
       [0.4875, 0.3],
+      [0.4925, 0.3],
+    ],
+  ],
+  "’": [
+    [
+      [0.5125, 0.2],
+      [0.4875, 0.3],
+      [0.4825, 0.3],
+    ],
+  ],
+  "‚": [
+    [
+      [0.5, 0.736],
+      [0.49, 0.764],
+      [0.45, 0.771],
     ],
   ],
-  //"’": [],
   "«": [
     [
       [0.5, 0.3],

diff --git a/src/uppercase/base.ts b/src/uppercase/base.ts
@@ -34,39 +34,39 @@ const base = {
 
   B: [
     [
-      [0.6, 0.557],
+      [0.6, 0.45],
       [0.6, 0.271],
       [0.15, 0.271],
       [0.15, 0.7],
       [0.85, 0.7],
-      [0.85, 0.557],
-      [0.15, 0.557],
+      [0.85, 0.45],
+      [0.15, 0.45],
     ],
   ],
   Ƀ: [
     [
-      [0.6, 0.557],
+      [0.6, 0.45],
       [0.6, 0.271],
       [0.25, 0.271],
       [0.25, 0.7],
       [0.85, 0.7],
-      [0.85, 0.557],
-      [0.25, 0.557],
+      [0.85, 0.45],
+      [0.25, 0.45],
     ],
     [
-      [0.15, 0.629],
-      [0.35, 0.629],
+      [0.15, 0.58],
+      [0.35, 0.58],
     ],
   ],
   Ɓ: [
     [
-      [0.6, 0.557],
+      [0.6, 0.45],
       [0.6, 0.271],
       [0.25, 0.271],
       [0.25, 0.7],
       [0.85, 0.7],
-      [0.85, 0.557],
-      [0.25, 0.557],
+      [0.85, 0.45],
+      [0.25, 0.45],
     ],
     [
       [0.3, 0.271],
@@ -80,8 +80,8 @@ const base = {
       [0.25, 0.271],
       [0.25, 0.7],
       [0.85, 0.7],
-      [0.85, 0.557],
-      [0.25, 0.557],
+      [0.85, 0.45],
+      [0.25, 0.45],
     ],
   ],
   C: [

diff --git a/src/uppercase/diaBaseAssociation.ts b/src/uppercase/diaBaseAssociation.ts
@@ -183,7 +183,7 @@ const diaBaseAssociation = {
   Ṏ: ["O", ["tl", "dr"]],
   Ȭ: ["O", ["tl", "mc"]],
   Ȯ: ["O", ["da"]],
-  Ȱ: ["O", ["db", "mc"]],
+  Ȱ: ["O", ["da", "mc"]],
   Ø: ["O", ["brd"]],
   Ǿ: ["O", ["brd", "ct"]],
   Ǫ: ["O", ["gnkc"]],
@@ -220,7 +220,7 @@ const diaBaseAssociation = {
 
   // S
   Ś: ["S", ["ct"]],
-  Ṥ: ["S", ["ct", "da"]],
+  Ṥ: ["S", ["ct", "da"]], // these two diacritics overlap
   Ŝ: ["S", ["cr"]],
   Š: ["S", ["hc"]],
   Ṧ: ["S", ["hc", "da"]],
@@ -304,7 +304,7 @@ const diaBaseAssociation = {
   Ẑ: ["Z", ["cr"]],
   Ž: ["Z", ["hc"]],
   Ż: ["Z", ["da"]],
-  Ẓ: ["Z", ["da"]],
+  Ẓ: ["Z", ["db"]],
   Ẕ: ["Z", ["lb"]],
   Ȥ: ["Z", ["hbr"]],
   Ǯ: ["Ʒ", ["hc"]],