Skip to content

Commit 30f07c8

Browse files
aradziearadzie
committed
feat: fix exising and add new layouts
closes #93
1 parent 0471805 commit 30f07c8

29 files changed

+825
-44
lines changed

‎packages/keybr-keyboard-generator/lib/index.ts

+14-4
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ import { convertKalamine } from "./conv/kalamine.ts";
99
import LAYOUT_DE_BONE from "./layout/de_bone.ts";
1010
import LAYOUT_DE_MINE from "./layout/de_mine.ts";
1111
import LAYOUT_DE_NEO_2 from "./layout/de_neo_2.ts";
12+
import LAYOUT_DE_NOTED from "./layout/de_noted.ts";
13+
import LAYOUT_EN_CANARY from "./layout/en_canary.ts";
1214
import LAYOUT_EN_CANARY_MATRIX from "./layout/en_canary_matrix.ts";
1315
import LAYOUT_EN_COLEMAK from "./layout/en_colemak.ts";
1416
import LAYOUT_EN_COLEMAK_DH from "./layout/en_colemak_dh.ts";
1517
import LAYOUT_EN_COLEMAK_DH_MATRIX from "./layout/en_colemak_dh_matrix.ts";
18+
import LAYOUT_EN_DVORAK_PROG from "./layout/en_dvorak_prog.ts";
1619
import LAYOUT_EN_WORKMAN from "./layout/en_workman.ts";
20+
import LAYOUT_EN_WORKMAN_PROG from "./layout/en_workman_prog.ts";
1721
import LAYOUT_FR_BEPO from "./layout/fr_bepo.json";
1822
import LAYOUT_FR_ERGLACE from "./layout/fr_erglace.json";
19-
import LAYOUT_FR_ERGO_L from "./layout/fr_ergol.json";
23+
import LAYOUT_FR_ERGO_L from "./layout/fr_ergo_l.json";
2024
import LAYOUT_FR_OPTIMOT_ERGO from "./layout/fr_optimot_ergo.ts";
2125
import LAYOUT_JA_JP_JIS from "./layout/ja_jp_jis.ts";
2226
import { writeGeneratedFile } from "./util/generate.ts";
@@ -30,21 +34,27 @@ for (const [output, keymap] of [
3034
["de_de-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/de-t-k0-windows.xml")],
3135
["de_mine.ts", LAYOUT_DE_MINE],
3236
["de_neo_2.ts", LAYOUT_DE_NEO_2],
37+
["de_noted.ts", LAYOUT_DE_NOTED],
3338
["el_gr-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/el-t-k0-windows.xml")],
39+
["en_canary.ts", LAYOUT_EN_CANARY],
3440
["en_canary_matrix.ts", LAYOUT_EN_CANARY_MATRIX],
35-
["en_colemak_dh_matrix.ts", LAYOUT_EN_COLEMAK_DH_MATRIX],
36-
["en_colemak_dh.ts", LAYOUT_EN_COLEMAK_DH],
3741
["en_colemak.ts", LAYOUT_EN_COLEMAK],
42+
["en_colemak_dh.ts", LAYOUT_EN_COLEMAK_DH],
43+
["en_colemak_dh_matrix.ts", LAYOUT_EN_COLEMAK_DH_MATRIX],
3844
["en_dvorak-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows-dvorak.xml")],
45+
["en_dvorak_prog.ts", LAYOUT_EN_DVORAK_PROG],
46+
["en_dvorakl-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows-dvorakl.xml")],
47+
["en_dvorakr-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows-dvorakr.xml")],
3948
["en_uk-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-GB-t-k0-windows.xml")],
4049
["en_us-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows.xml")],
4150
["en_workman.ts", LAYOUT_EN_WORKMAN],
51+
["en_workman_prog.ts", LAYOUT_EN_WORKMAN_PROG],
4252
["es_es-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/es-t-k0-windows.xml")],
4353
["fr_bepo.ts", convertKalamine(LAYOUT_FR_BEPO)],
4454
["fr_ca-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/fr-CA-t-k0-windows-var.xml")],
4555
["fr_ch-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/fr-CH-t-k0-windows.xml")],
4656
["fr_erglace.ts", convertKalamine(LAYOUT_FR_ERGLACE)],
47-
["fr_ergol.ts", convertKalamine(LAYOUT_FR_ERGO_L)],
57+
["fr_ergo_l.ts", convertKalamine(LAYOUT_FR_ERGO_L)],
4858
["fr_fr-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/fr-t-k0-windows.xml")],
4959
["fr_optimot_ergo.ts", LAYOUT_FR_OPTIMOT_ERGO],
5060
["he_il-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/he-t-k0-windows.xml")],

‎packages/keybr-keyboard-generator/lib/layout/de_bone.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
Backquote: "^ˇ",
2+
Backquote: ["*^", "*ˇ"],
33
Digit1: "1°",
44
Digit2: "2§",
55
Digit3: "3ℓ",
@@ -11,7 +11,7 @@ export default {
1111
Digit9: "9“",
1212
Digit0: "0”",
1313
Minus: "-—",
14-
Equal: "`¸",
14+
Equal: ["*`", "*¸", "*¨"],
1515
KeyQ: "jJ",
1616
KeyW: "dD",
1717
KeyE: "uU",
@@ -23,7 +23,7 @@ export default {
2323
KeyO: "mM",
2424
KeyP: "wW",
2525
BracketLeft: "ßẞ",
26-
BracketRight: "´˜",
26+
BracketRight: ["*´", "*~"],
2727
Backslash: "",
2828
KeyA: "cC",
2929
KeyS: "tT",

‎packages/keybr-keyboard-generator/lib/layout/de_mine.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
Backquote: "^ˇ",
2+
Backquote: ["*^", "*ˇ"],
33
Digit1: "1°",
44
Digit2: "2§",
55
Digit3: "3ℓ",
@@ -11,7 +11,7 @@ export default {
1111
Digit9: "9“",
1212
Digit0: "0”",
1313
Minus: "-—",
14-
Equal: "`¸",
14+
Equal: ["*`", "*¸", "*¨"],
1515
KeyQ: "jJ",
1616
KeyW: "lL",
1717
KeyE: "uU",
@@ -21,10 +21,10 @@ export default {
2121
KeyU: "bB",
2222
KeyI: "dD",
2323
KeyO: "gG",
24-
KeyP: "YY",
24+
KeyP: "yY",
2525
BracketLeft: "zZ",
2626
BracketRight: "ßẞ",
27-
Backslash: "",
27+
Backslash: ["*´", "*~"],
2828
KeyA: "cC",
2929
KeyS: "rR",
3030
KeyD: "iI",
@@ -36,7 +36,7 @@ export default {
3636
KeyL: "sS",
3737
Semicolon: "hH",
3838
Quote: "",
39-
IntlBackslash: "´˜",
39+
IntlBackslash: "",
4040
KeyZ: "vV",
4141
KeyX: "xX",
4242
KeyC: "üÜ",

‎packages/keybr-keyboard-generator/lib/layout/de_neo_2.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
Backquote: "^ˇ",
2+
Backquote: ["*^", "*ˇ"],
33
Digit1: "1°",
44
Digit2: "2§",
55
Digit3: "3ℓ",
@@ -11,7 +11,7 @@ export default {
1111
Digit9: "9“",
1212
Digit0: "0”",
1313
Minus: "-—",
14-
Equal: "`¸",
14+
Equal: ["*`", "*¸", "*¨"],
1515
KeyQ: "xX",
1616
KeyW: "vV",
1717
KeyE: "lL",
@@ -23,7 +23,7 @@ export default {
2323
KeyO: "fF",
2424
KeyP: "qQ",
2525
BracketLeft: "ßẞ",
26-
BracketRight: "´˜",
26+
BracketRight: ["*´", "*~"],
2727
Backslash: "",
2828
KeyA: "uU",
2929
KeyS: "iI",

‎packages/keybr-keyboard-generator/lib/layout/de_noted.ts

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
export default {
2+
Backquote: ["*^", "*ˇ"],
3+
Digit1: "1°",
4+
Digit2: "2§",
5+
Digit3: "3ℓ",
6+
Digit4: "4»",
7+
Digit5: "5«",
8+
Digit6: "6$",
9+
Digit7: "7€",
10+
Digit8: "8„",
11+
Digit9: "9“",
12+
Digit0: "0”",
13+
Minus: "-—",
14+
Equal: ["*`", "*¸", "*¨"],
15+
KeyQ: "zZ",
16+
KeyW: "yY",
17+
KeyE: "uU",
18+
KeyR: "aA",
19+
KeyT: "qQ",
20+
KeyY: "pP",
21+
KeyU: "bB",
22+
KeyI: "mM",
23+
KeyO: "lL",
24+
KeyP: "fF",
25+
BracketLeft: "jJ",
26+
BracketRight: "ßẞ",
27+
Backslash: ["*´", "*~"],
28+
KeyA: "cC",
29+
KeyS: "sS",
30+
KeyD: "iI",
31+
KeyF: "eE",
32+
KeyG: "oO",
33+
KeyH: "dD",
34+
KeyJ: "tT",
35+
KeyK: "nN",
36+
KeyL: "rR",
37+
Semicolon: "hH",
38+
Quote: "",
39+
IntlBackslash: "",
40+
KeyZ: "vV",
41+
KeyX: "xX",
42+
KeyC: "üÜ",
43+
KeyV: "äÄ",
44+
KeyB: "öÖ",
45+
KeyN: "wW",
46+
KeyM: "gG",
47+
Comma: ",–",
48+
Period: ".•",
49+
Slash: "kK",
50+
Space: " ",
51+
};

‎packages/keybr-keyboard-generator/lib/layout/en_canary.ts

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
export default {
2+
Backquote: "`~",
3+
Digit1: "1!",
4+
Digit2: "2@",
5+
Digit3: "3#",
6+
Digit4: "4$",
7+
Digit5: "5%",
8+
Digit6: "6^",
9+
Digit7: "7&",
10+
Digit8: "8*",
11+
Digit9: "9(",
12+
Digit0: "0)",
13+
Minus: "-_",
14+
Equal: "=+",
15+
KeyQ: "wW",
16+
KeyW: "lL",
17+
KeyE: "yY",
18+
KeyR: "pP",
19+
KeyT: "kK",
20+
KeyY: "zZ",
21+
KeyU: "xX",
22+
KeyI: "oO",
23+
KeyO: "uU",
24+
KeyP: ";:",
25+
BracketLeft: "[{",
26+
BracketRight: "]}",
27+
Backslash: "\\|",
28+
KeyA: "cC",
29+
KeyS: "rR",
30+
KeyD: "sS",
31+
KeyF: "tT",
32+
KeyG: "bB",
33+
KeyH: "fF",
34+
KeyJ: "nN",
35+
KeyK: "eE",
36+
KeyL: "iI",
37+
Semicolon: "aA",
38+
Quote: "'\"",
39+
IntlBackslash: "\\|",
40+
KeyZ: "jJ",
41+
KeyX: "vV",
42+
KeyC: "dD",
43+
KeyV: "gG",
44+
KeyB: "qQ",
45+
KeyN: "mM",
46+
KeyM: "hH",
47+
Comma: "/?",
48+
Period: ",<",
49+
Slash: ".>",
50+
Space: " ",
51+
};

‎packages/keybr-keyboard-generator/lib/layout/en_colemak.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
KeyK: "eE",
3636
KeyL: "iI",
3737
Semicolon: "oO",
38-
Quote: `'"`,
38+
Quote: "'\"",
3939
IntlBackslash: "\\|",
4040
KeyZ: "zZ",
4141
KeyX: "xX",

‎packages/keybr-keyboard-generator/lib/layout/en_colemak_dh.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
KeyK: "eE",
3636
KeyL: "iI",
3737
Semicolon: "oO",
38-
Quote: `'"`,
38+
Quote: "'\"",
3939
IntlBackslash: "\\|",
4040
KeyZ: "xX",
4141
KeyX: "cC",

‎packages/keybr-keyboard-generator/lib/layout/en_colemak_dh_matrix.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
KeyK: "eE",
3636
KeyL: "iI",
3737
Semicolon: "oO",
38-
Quote: `'"`,
38+
Quote: "'\"",
3939
IntlBackslash: "\\|",
4040
KeyZ: "zZ",
4141
KeyX: "xX",

‎packages/keybr-keyboard-generator/lib/layout/en_dvorak_prog.ts

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
export default {
2+
Backquote: "$~",
3+
Digit1: "&%",
4+
Digit2: "[7",
5+
Digit3: "{5",
6+
Digit4: "}3",
7+
Digit5: "(1",
8+
Digit6: "=9",
9+
Digit7: "*0",
10+
Digit8: ")2",
11+
Digit9: "+4",
12+
Digit0: "]6",
13+
Minus: "!8",
14+
Equal: "#`",
15+
KeyQ: ";:",
16+
KeyW: ",<",
17+
KeyE: ".>",
18+
KeyR: "pP",
19+
KeyT: "yY",
20+
KeyY: "fF",
21+
KeyU: "gG",
22+
KeyI: "cC",
23+
KeyO: "rR",
24+
KeyP: "lL",
25+
BracketLeft: "/?",
26+
BracketRight: "@^",
27+
Backslash: "\\|",
28+
KeyA: "aA",
29+
KeyS: "oO",
30+
KeyD: "eE",
31+
KeyF: "uU",
32+
KeyG: "iI",
33+
KeyH: "dD",
34+
KeyJ: "hH",
35+
KeyK: "tT",
36+
KeyL: "nN",
37+
Semicolon: "sS",
38+
Quote: "-_",
39+
IntlBackslash: "\\|",
40+
KeyZ: "'\"",
41+
KeyX: "qQ",
42+
KeyC: "jJ",
43+
KeyV: "kK",
44+
KeyB: "xX",
45+
KeyN: "bB",
46+
KeyM: "mM",
47+
Comma: "wW",
48+
Period: "vV",
49+
Slash: "zZ",
50+
};

‎packages/keybr-keyboard-generator/lib/layout/en_workman.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
KeyK: "eE",
3636
KeyL: "oO",
3737
Semicolon: "iI",
38-
Quote: `'"`,
38+
Quote: "'\"",
3939
IntlBackslash: "\\|",
4040
KeyZ: "zZ",
4141
KeyX: "xX",

‎packages/keybr-keyboard-generator/lib/layout/en_workman_prog.ts

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
export default {
2+
Backquote: "`~",
3+
Digit1: "!1",
4+
Digit2: "@2",
5+
Digit3: "#3",
6+
Digit4: "$4",
7+
Digit5: "%5",
8+
Digit6: "^6",
9+
Digit7: "&7",
10+
Digit8: "*8",
11+
Digit9: "(9",
12+
Digit0: ")0",
13+
Minus: "-_",
14+
Equal: "=+",
15+
KeyQ: "qQ",
16+
KeyW: "dD",
17+
KeyE: "rR",
18+
KeyR: "wW",
19+
KeyT: "bB",
20+
KeyY: "jJ",
21+
KeyU: "fF",
22+
KeyI: "uU",
23+
KeyO: "pP",
24+
KeyP: ";:",
25+
BracketLeft: "{[",
26+
BracketRight: "}]",
27+
Backslash: "\\|",
28+
KeyA: "aA",
29+
KeyS: "sS",
30+
KeyD: "hH",
31+
KeyF: "tT",
32+
KeyG: "gG",
33+
KeyH: "yY",
34+
KeyJ: "nN",
35+
KeyK: "eE",
36+
KeyL: "oO",
37+
Semicolon: "iI",
38+
Quote: "'\"",
39+
IntlBackslash: "\\|",
40+
KeyZ: "zZ",
41+
KeyX: "xX",
42+
KeyC: "mM",
43+
KeyV: "cC",
44+
KeyB: "vV",
45+
KeyN: "kK",
46+
KeyM: "lL",
47+
Comma: ",<",
48+
Period: ".>",
49+
Slash: "/?",
50+
};

‎packages/keybr-keyboard-generator/lib/layout/fr_ergol.json ‎packages/keybr-keyboard-generator/lib/layout/fr_ergo_l.json

File renamed without changes.

‎packages/keybr-keyboard-generator/lib/layout/fr_optimot_ergo.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
KeyL: ["r", "R", "", "⬆"],
3636
Semicolon: ["n", "N", "*~", "⮕"],
3737
Quote: ["*^", "!", "*¨", "¡"],
38-
Backslash: ["ç", "Ç", "* ̛", "🄯"],
38+
Backslash: ["ç", "Ç", "*´", "🄯"],
3939
IntlBackslash: ["*¨", "‽", "ø", "Ø"],
4040
KeyZ: ["k", "K"],
4141
KeyX: ["y", "Y", "*˙", "⌥"],
@@ -44,7 +44,7 @@ export default {
4444
KeyB: ["w", "W", "•", "✗"],
4545
KeyN: ["g", "G", "", "✣"],
4646
KeyM: ["c", "C", "*¸", "♠"],
47-
Comma: ["m", "M", "* ̄", "♥"],
47+
Comma: ["m", "M", "*¯", "♥"],
4848
Period: ["h", "H", "*˘", "♦"],
4949
Slash: ["v", "V", "*ˇ", "♣"],
5050
Space: [" ", 0x202f, "_", 0x00a0],

0 commit comments

Comments
 (0)