From 6c9d082bf4b2ebb88557b45dc6e827ef6ab3263e Mon Sep 17 00:00:00 2001
From: Manassarn Manoonchai <manassarn@gmail.com>
Date: Mon, 26 Jul 2021 12:35:05 +0700
Subject: [PATCH] feat: Support blank keys

---
 generateKeylayout.ts        |   3 ++-
 generateKlc.ts              |   4 +++-
 output/Manoonchai.keylayout |  28 ++++++++++++++--------------
 output/Manoonchai.klc       | Bin 1896 -> 1952 bytes
 output/test.klc             | Bin 1896 -> 1952 bytes
 output/tmp.keylayout        |  28 ++++++++++++++--------------
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/generateKeylayout.ts b/generateKeylayout.ts
index e26b475..4b760e4 100644
--- a/generateKeylayout.ts
+++ b/generateKeylayout.ts
@@ -243,7 +243,8 @@ export async function generateKeylayout(
                 // Override only index 0-50
                 // Since some symbols are the same in numpad's position and should not be overridden
                 if (code <= 50) {
-                  overrideKey = layout.keys[output]?.[idx] || output
+                  const key = layout.keys[output]?.[idx]
+                  overrideKey = typeof key !== "undefined" ? key : output
                 } else {
                   overrideKey = output
                 }
diff --git a/generateKlc.ts b/generateKlc.ts
index 1b7d910..ecdb9e3 100644
--- a/generateKlc.ts
+++ b/generateKlc.ts
@@ -128,7 +128,9 @@ export async function generateKlc(
   const layoutLines = ["LAYOUT"]
 
   Object.entries(klfDefaultLayout).forEach(([key, value]) => {
-    const extensions = layout.layers.map((_, idx) => layout.keys[key][idx])
+    const extensions = layout.layers.map((_, idx) => {
+      return layout.keys[key][idx] || "-1"
+    })
     layoutLines.push([value, "0", ...extensions].join("\t"))
   })
 
diff --git a/output/Manoonchai.keylayout b/output/Manoonchai.keylayout
index 735d22c..9b44806 100644
--- a/output/Manoonchai.keylayout
+++ b/output/Manoonchai.keylayout
@@ -240,19 +240,19 @@
       <key code="2" output="๛"/>
       <key code="3" output="฿"/>
       <key code="4" output="ํ"/>
-      <key code="5" output="g"/>
+      <key code="5" output=""/>
       <key code="6" output="ฦ"/>
-      <key code="7" output="x"/>
+      <key code="7" output=""/>
       <key code="8" output="๚"/>
-      <key code="9" output="v"/>
+      <key code="9" output=""/>
       <key code="10" 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="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="18" output="๑"/>
       <key code="19" output="๒"/>
       <key code="20" output="๓"/>
@@ -266,13 +266,13 @@
       <key code="28" output="๘"/>
       <key code="29" output="๐"/>
       <key code="30" output="]"/>
-      <key code="31" output="o"/>
+      <key code="31" output=""/>
       <key code="32" output="ฺ"/>
       <key code="33" output="["/>
-      <key code="34" output="i"/>
-      <key code="35" output="p"/>
+      <key code="34" output=""/>
+      <key code="35" output=""/>
       <key code="36" output="&#x000D;"/>
-      <key code="37" output="l"/>
+      <key code="37" output=""/>
       <key code="38" output="ๅ"/>
       <key code="39" output="'"/>
       <key code="40" output="ฃ"/>
diff --git a/output/Manoonchai.klc b/output/Manoonchai.klc
index 44781647b4a7900708e5ba06029272eb449329a1..badcd67773def354d9051a19ed5d66ba8443d048 100644
GIT binary patch
delta 163
zcmaFCw}5{`1hb+pgCPSi0~e4qWZ+~72Vw&t7Ukn);0I!$?BqgbX=V`J%`A<i+61U7
z1gcsKs8SxPdOuY4O=fejE`An>ZcQld%yJnlF3Oq@rkh!hgK1ATi28aqi29jq=K+*@
B8$192

delta 151
zcmZ3$|AKEr1oPw=W~s?l%u>F*3|tI`48{zc3_(C_0K}?%oD94m43;qgiiALAw1A@W
za2ZpeXe3ld8Ys%i$2s{Uv-xBl7OBZzK%BvHX|f$_-sBCe$0k>?nMs1oGX~q>1l7d>
M)a3=#b&>5n0EGw_i~s-t

diff --git a/output/test.klc b/output/test.klc
index 44781647b4a7900708e5ba06029272eb449329a1..badcd67773def354d9051a19ed5d66ba8443d048 100644
GIT binary patch
delta 163
zcmaFCw}5{`1hb+pgCPSi0~e4qWZ+~72Vw&t7Ukn);0I!$?BqgbX=V`J%`A<i+61U7
z1gcsKs8SxPdOuY4O=fejE`An>ZcQld%yJnlF3Oq@rkh!hgK1ATi28aqi29jq=K+*@
B8$192

delta 151
zcmZ3$|AKEr1oPw=W~s?l%u>F*3|tI`48{zc3_(C_0K}?%oD94m43;qgiiALAw1A@W
za2ZpeXe3ld8Ys%i$2s{Uv-xBl7OBZzK%BvHX|f$_-sBCe$0k>?nMs1oGX~q>1l7d>
M)a3=#b&>5n0EGw_i~s-t

diff --git a/output/tmp.keylayout b/output/tmp.keylayout
index 735d22c..9b44806 100644
--- a/output/tmp.keylayout
+++ b/output/tmp.keylayout
@@ -240,19 +240,19 @@
       <key code="2" output="๛"/>
       <key code="3" output="฿"/>
       <key code="4" output="ํ"/>
-      <key code="5" output="g"/>
+      <key code="5" output=""/>
       <key code="6" output="ฦ"/>
-      <key code="7" output="x"/>
+      <key code="7" output=""/>
       <key code="8" output="๚"/>
-      <key code="9" output="v"/>
+      <key code="9" output=""/>
       <key code="10" 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="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="18" output="๑"/>
       <key code="19" output="๒"/>
       <key code="20" output="๓"/>
@@ -266,13 +266,13 @@
       <key code="28" output="๘"/>
       <key code="29" output="๐"/>
       <key code="30" output="]"/>
-      <key code="31" output="o"/>
+      <key code="31" output=""/>
       <key code="32" output="ฺ"/>
       <key code="33" output="["/>
-      <key code="34" output="i"/>
-      <key code="35" output="p"/>
+      <key code="34" output=""/>
+      <key code="35" output=""/>
       <key code="36" output="&#x000D;"/>
-      <key code="37" output="l"/>
+      <key code="37" output=""/>
       <key code="38" output="ๅ"/>
       <key code="39" output="'"/>
       <key code="40" output="ฃ"/>