feat: Change Alt to AltGr in Windows

Manoonchai · Jul 25, 2021 · 907690c · 907690c
1 parent 7d63a71
commit 907690c
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 132 deletions.
diff --git a/generateKeylayout.ts b/generateKeylayout.ts
@@ -28,6 +28,10 @@ export async function generateKeylayout(
       layerName: "Option",
       layerValue: "anyOption anyShift? anyControl? command?",
     },
+    {
+      layerName: "AltGr",
+      layerValue: "anyOption anyShift? anyControl? command?",
+    },
     {
       layerName: "Control",
       layerValue: "anyControl anyShift? anyOption? command?",

diff --git a/generateKlc.ts b/generateKlc.ts
@@ -37,7 +37,7 @@ export async function generateKlc(
     "Shift+Alt+Ctrl": 7,
     // From macOS config
     Command: 4, // Layer number 4 is not supported in KLC
-    AltGr: 7,
+    AltGr: 6,
     Option: 7,
     Control: 2,
   }

diff --git a/input/Manoonchai-ColemakDH-Mod.json b/input/Manoonchai-ColemakDH-Mod.json
@@ -1,8 +1,8 @@
 {
   "name": "Manoonchai",
-  "version": "1.0b",
+  "version": "1.0",
   "language": "Thai",
-  "layers": ["Base", "Shift", "Command", "Option", "Control"],
+  "layers": ["Base", "Shift", "Command", "AltGr", "Control"],
   "os": {
     "windows": {
       "installerName": "Mnc-DH",
@@ -30,31 +30,31 @@
     "r": ["ล", "ญ", "p", "p", "p"],
     "t": ["ส", "ฟ", "b", "b", "b"],
     "y": ["ป", "ฉ", "j", "j", "j"],
-    "u": ["ั", "ึ", "l", "l", "l"],
+    "u": ["ั", "ึ", "l", "ฺ", "l"],
     "i": ["ก", "ธ", "u", "u", "u"],
     "o": ["ิ", "ฐ", "y", "y", "y"],
     "p": ["บ", "ฎ", ";", ";", ";"],
     "[": ["็", "ฆ", "[", "[", "["],
     "]": ["ฬ", "ฑ", "]", "]", "]"],
     "\\": ["ฯ", "ฌ", "\\", "\\", "\\"],
-    "a": ["ง", "ษ", "a", "a", "a"],
-    "s": ["เ", "ถ", "r", "r", "r"],
-    "d": ["ร", "แ", "s", "s", "s"],
-    "f": ["น", "ช", "t", "t", "t"],
+    "a": ["ง", "ษ", "a", "◌", "a"],
+    "s": ["เ", "ถ", "r", "๏", "r"],
+    "d": ["ร", "แ", "s", "๛", "s"],
+    "f": ["น", "ช", "t", "฿", "t"],
     "g": ["ม", "พ", "g", "g", "g"],
-    "h": ["อ", "ผ", "m", "m", "m"],
-    "j": ["า", "ำ", "n", "n", "n"],
-    "k": ["่", "ข", "e", "e", "e"],
+    "h": ["อ", "ผ", "m", "ํ", "m"],
+    "j": ["า", "ำ", "n", "ๅ", "n"],
+    "k": ["่", "ข", "e", "ฃ", "e"],
     "l": ["้", "โ", "i", "i", "i"],
     ";": ["ว", "ภ", "o", "o", "o"],
     "'": ["ื", "\"", "'", "'", "'"],
-    "z": ["ุ", "ฤ", "z", "z", "z"],
+    "z": ["ุ", "ฤ", "z", "ฦ", "z"],
     "x": ["ไ", "ฝ", "x", "x", "x"],
-    "c": ["ท", "ๆ", "c", "c", "c"],
+    "c": ["ท", "ๆ", "c", "๚", "c"],
     "v": ["ย", "ณ", "v", "v", "v"],
     "b": ["จ", "๊", "d", "d", "d"],
-    "n": ["ค", "๋", "k", "k", "k"],
-    "m": ["ี", "์", "h", "h", "h"],
+    "n": ["ค", "๋", "k", "ฅ", "k"],
+    "m": ["ี", "์", "h", "๎", "h"],
     ",": ["ด", "ศ", ",", ",", ","],
     ".": ["ะ", "ฮ", ".", ".", "."],
     "/": ["ู", "?", "/", "/", "/"]

diff --git a/input/Manoonchai.json b/input/Manoonchai.json
@@ -1,8 +1,8 @@
 {
   "name": "Manoonchai",
-  "version": "1.0b",
+  "version": "1.0",
   "language": "Thai",
-  "layers": ["Base", "Shift", "Option"],
+  "layers": ["Base", "Shift", "AltGr"],
   "license": "MIT",
   "os": {
     "windows": {
@@ -25,39 +25,39 @@
     "0": ["0", ")", "๐"],
     "-": ["-", "_", "-"],
     "=": ["=", "+", "="],
-    "q": ["ใ", "ฒ", "ใ"],
-    "w": ["ต", "ฏ", "ต"],
-    "e": ["ห", "ซ", "ห"],
-    "r": ["ล", "ญ", "ล"],
-    "t": ["ส", "ฟ", "ส"],
-    "y": ["ป", "ฉ", "ป"],
-    "u": ["ั", "ึ", "ั"],
-    "i": ["ก", "ธ", "ก"],
-    "o": ["ิ", "ฐ", "ิ"],
-    "p": ["บ", "ฎ", "บ"],
-    "[": ["็", "ฆ", "็"],
-    "]": ["ฬ", "ฑ", "ฬ"],
-    "\\": ["ฯ", "ฌ", "ฯ"],
-    "a": ["ง", "ษ", "ง"],
-    "s": ["เ", "ถ", "เ"],
-    "d": ["ร", "แ", "ร"],
-    "f": ["น", "ช", "น"],
-    "g": ["ม", "พ", "ม"],
-    "h": ["อ", "ผ", "อ"],
-    "j": ["า", "ำ", "า"],
-    "k": ["่", "ข", "่"],
-    "l": ["้", "โ", "้"],
-    ";": ["ว", "ภ", "ว"],
-    "'": ["ื", "\"", "ื"],
-    "z": ["ุ", "ฤ", "ุ"],
-    "x": ["ไ", "ฝ", "ไ"],
-    "c": ["ท", "ๆ", "ท"],
-    "v": ["ย", "ณ", "ย"],
-    "b": ["จ", "๊", "จ"],
-    "n": ["ค", "๋", "ค"],
-    "m": ["ี", "์", "ี"],
-    ",": ["ด", "ศ", "ด"],
-    ".": ["ะ", "ฮ", "ะ"],
-    "/": ["ู", "?", "ู"]
+    "q": ["ใ", "ฒ", ""],
+    "w": ["ต", "ฏ", ""],
+    "e": ["ห", "ซ", ""],
+    "r": ["ล", "ญ", ""],
+    "t": ["ส", "ฟ", ""],
+    "y": ["ป", "ฉ", ""],
+    "u": ["ั", "ึ", "ฺ"],
+    "i": ["ก", "ธ", ""],
+    "o": ["ิ", "ฐ", ""],
+    "p": ["บ", "ฎ", ""],
+    "[": ["็", "ฆ", "["],
+    "]": ["ฬ", "ฑ", "]"],
+    "\\": ["ฯ", "ฌ", "\\"],
+    "a": ["ง", "ษ", "◌"],
+    "s": ["เ", "ถ", "๏"],
+    "d": ["ร", "แ", "๛"],
+    "f": ["น", "ช", "฿"],
+    "g": ["ม", "พ", ""],
+    "h": ["อ", "ผ", "ํ"],
+    "j": ["า", "ำ", "ๅ"],
+    "k": ["่", "ข", "ฃ"],
+    "l": ["้", "โ", ""],
+    ";": ["ว", "ภ", ";"],
+    "'": ["ื", "\"", "'"],
+    "z": ["ุ", "ฤ", "ฦ"],
+    "x": ["ไ", "ฝ", ""],
+    "c": ["ท", "ๆ", "๚"],
+    "v": ["ย", "ณ", ""],
+    "b": ["จ", "๊", ""],
+    "n": ["ค", "๋", "ฅ"],
+    "m": ["ี", "์", "๎"],
+    ",": ["ด", "ศ", ","],
+    ".": ["ะ", "ฮ", "."],
+    "/": ["ู", "?", "/"]
   }
 }
diff --git a/output/Manoonchai-ColemakDH-Mod.keylayout b/output/Manoonchai-ColemakDH-Mod.keylayout
@@ -350,15 +350,15 @@
       <key code="126" output="&#x001E;"/>
     </keyMap>
     <keyMap index="3">
-      <key code="0" output="a"/>
-      <key code="1" output="r"/>
-      <key code="2" output="s"/>
-      <key code="3" output="t"/>
-      <key code="4" output="m"/>
+      <key code="0" output="◌"/>
+      <key code="1" output="๏"/>
+      <key code="2" output="๛"/>
+      <key code="3" output="฿"/>
+      <key code="4" output="ํ"/>
       <key code="5" output="g"/>
-      <key code="6" output="z"/>
+      <key code="6" output="ฦ"/>
       <key code="7" output="x"/>
-      <key code="8" output="c"/>
+      <key code="8" output="๚"/>
       <key code="9" output="v"/>
       <key code="10" output="§"/>
       <key code="11" output="d"/>
@@ -382,21 +382,21 @@
       <key code="29" output="๐"/>
       <key code="30" output="]"/>
       <key code="31" output="y"/>
-      <key code="32" output="l"/>
+      <key code="32" output="ฺ"/>
       <key code="33" output="["/>
       <key code="34" output="u"/>
       <key code="35" output=";"/>
       <key code="36" output="&#x000D;"/>
       <key code="37" output="i"/>
-      <key code="38" output="n"/>
+      <key code="38" output="ๅ"/>
       <key code="39" output="'"/>
-      <key code="40" output="e"/>
+      <key code="40" output="ฃ"/>
       <key code="41" output="o"/>
       <key code="42" output="\"/>
       <key code="43" output=","/>
       <key code="44" output="/"/>
-      <key code="45" output="k"/>
-      <key code="46" output="h"/>
+      <key code="45" output="ฅ"/>
+      <key code="46" output="๎"/>
       <key code="47" output="."/>
       <key code="48" output="&#x0009;"/>
       <key code="49" output=" "/>

diff --git a/output/Manoonchai-ColemakDH-Mod.klc b/output/Manoonchai-ColemakDH-Mod.klc
diff --git a/output/Manoonchai.keylayout b/output/Manoonchai.keylayout
@@ -235,24 +235,24 @@
       <key code="126" output="&#x001E;"/>
     </keyMap>
     <keyMap index="2">
-      <key code="0" output="ง"/>
-      <key code="1" output="เ"/>
-      <key code="2" output="ร"/>
-      <key code="3" output="น"/>
-      <key code="4" output="อ"/>
-      <key code="5" output="ม"/>
-      <key code="6" output="ุ"/>
-      <key code="7" output="ไ"/>
-      <key code="8" output="ท"/>
-      <key code="9" output="ย"/>
+      <key code="0" output="◌"/>
+      <key code="1" output="๏"/>
+      <key code="2" output="๛"/>
+      <key code="3" output="฿"/>
+      <key code="4" output="ํ"/>
+      <key code="5" output="g"/>
+      <key code="6" output="ฦ"/>
+      <key code="7" output="x"/>
+      <key code="8" output="๚"/>
+      <key code="9" output="v"/>
       <key code="10" output="§"/>
-      <key code="11" output="จ"/>
-      <key code="12" output="ใ"/>
-      <key code="13" output="ต"/>
-      <key code="14" output="ห"/>
-      <key code="15" output="ล"/>
-      <key code="16" output="ป"/>
-      <key code="17" output="ส"/>
+      <key code="11" output="b"/>
+      <key code="12" output="q"/>
+      <key code="13" output="w"/>
+      <key code="14" output="e"/>
+      <key code="15" output="r"/>
+      <key code="16" output="y"/>
+      <key code="17" output="t"/>
       <key code="18" output="๑"/>
       <key code="19" output="๒"/>
       <key code="20" output="๓"/>
@@ -265,24 +265,24 @@
       <key code="27" output="-"/>
       <key code="28" output="๘"/>
       <key code="29" output="๐"/>
-      <key code="30" output="ฬ"/>
-      <key code="31" output="ิ"/>
-      <key code="32" output="ั"/>
-      <key code="33" output="็"/>
-      <key code="34" output="ก"/>
-      <key code="35" output="บ"/>
+      <key code="30" output="]"/>
+      <key code="31" output="o"/>
+      <key code="32" output="ฺ"/>
+      <key code="33" output="["/>
+      <key code="34" output="i"/>
+      <key code="35" output="p"/>
       <key code="36" output="&#x000D;"/>
-      <key code="37" output="้"/>
-      <key code="38" output="า"/>
-      <key code="39" output="ื"/>
-      <key code="40" output="่"/>
-      <key code="41" output="ว"/>
-      <key code="42" output="ฯ"/>
-      <key code="43" output="ด"/>
-      <key code="44" output="ู"/>
-      <key code="45" output="ค"/>
-      <key code="46" output="ี"/>
-      <key code="47" output="ะ"/>
+      <key code="37" output="l"/>
+      <key code="38" output="ๅ"/>
+      <key code="39" output="'"/>
+      <key code="40" output="ฃ"/>
+      <key code="41" output=";"/>
+      <key code="42" output="\"/>
+      <key code="43" output=","/>
+      <key code="44" output="/"/>
+      <key code="45" output="ฅ"/>
+      <key code="46" output="๎"/>
+      <key code="47" output="."/>
       <key code="48" output="&#x0009;"/>
       <key code="49" output=" "/>
       <key code="50" output="`"/>

diff --git a/output/Manoonchai.klc b/output/Manoonchai.klc
diff --git a/output/test.klc b/output/test.klc
diff --git a/output/tmp.keylayout b/output/tmp.keylayout
@@ -235,24 +235,24 @@
       <key code="126" output="&#x001E;"/>
     </keyMap>
     <keyMap index="2">
-      <key code="0" output="ง"/>
-      <key code="1" output="เ"/>
-      <key code="2" output="ร"/>
-      <key code="3" output="น"/>
-      <key code="4" output="อ"/>
-      <key code="5" output="ม"/>
-      <key code="6" output="ุ"/>
-      <key code="7" output="ไ"/>
-      <key code="8" output="ท"/>
-      <key code="9" output="ย"/>
+      <key code="0" output="◌"/>
+      <key code="1" output="๏"/>
+      <key code="2" output="๛"/>
+      <key code="3" output="฿"/>
+      <key code="4" output="ํ"/>
+      <key code="5" output="g"/>
+      <key code="6" output="ฦ"/>
+      <key code="7" output="x"/>
+      <key code="8" output="๚"/>
+      <key code="9" output="v"/>
       <key code="10" output="§"/>
-      <key code="11" output="จ"/>
-      <key code="12" output="ใ"/>
-      <key code="13" output="ต"/>
-      <key code="14" output="ห"/>
-      <key code="15" output="ล"/>
-      <key code="16" output="ป"/>
-      <key code="17" output="ส"/>
+      <key code="11" output="b"/>
+      <key code="12" output="q"/>
+      <key code="13" output="w"/>
+      <key code="14" output="e"/>
+      <key code="15" output="r"/>
+      <key code="16" output="y"/>
+      <key code="17" output="t"/>
       <key code="18" output="๑"/>
       <key code="19" output="๒"/>
       <key code="20" output="๓"/>
@@ -265,24 +265,24 @@
       <key code="27" output="-"/>
       <key code="28" output="๘"/>
       <key code="29" output="๐"/>
-      <key code="30" output="ฬ"/>
-      <key code="31" output="ิ"/>
-      <key code="32" output="ั"/>
-      <key code="33" output="็"/>
-      <key code="34" output="ก"/>
-      <key code="35" output="บ"/>
+      <key code="30" output="]"/>
+      <key code="31" output="o"/>
+      <key code="32" output="ฺ"/>
+      <key code="33" output="["/>
+      <key code="34" output="i"/>
+      <key code="35" output="p"/>
       <key code="36" output="&#x000D;"/>
-      <key code="37" output="้"/>
-      <key code="38" output="า"/>
-      <key code="39" output="ื"/>
-      <key code="40" output="่"/>
-      <key code="41" output="ว"/>
-      <key code="42" output="ฯ"/>
-      <key code="43" output="ด"/>
-      <key code="44" output="ู"/>
-      <key code="45" output="ค"/>
-      <key code="46" output="ี"/>
-      <key code="47" output="ะ"/>
+      <key code="37" output="l"/>
+      <key code="38" output="ๅ"/>
+      <key code="39" output="'"/>
+      <key code="40" output="ฃ"/>
+      <key code="41" output=";"/>
+      <key code="42" output="\"/>
+      <key code="43" output=","/>
+      <key code="44" output="/"/>
+      <key code="45" output="ฅ"/>
+      <key code="46" output="๎"/>
+      <key code="47" output="."/>
       <key code="48" output="&#x0009;"/>
       <key code="49" output=" "/>
       <key code="50" output="`"/>

diff --git a/test/main.test.ts b/test/main.test.ts
@@ -466,7 +466,7 @@ describe("generateKlc", () => {
     expect(lines[6]).toEqual(`SHIFTSTATE`)
     expect(lines[7]).toEqual(`0\t// Column 4 : Base`)
     expect(lines[8]).toEqual(`1\t// Column 5 : Shift`)
-    expect(lines[9]).toEqual(`7\t// Column 6 : Option`)
+    expect(lines[9]).toEqual(`6\t// Column 6 : AltGr`)
 
     // Assert Layout
     expect(lines[10]).toEqual(`LAYOUT`)