Skip to content

Commit

Permalink
feat: fix exising and add new layouts
Browse files Browse the repository at this point in the history
closes #93
  • Loading branch information
aradzie committed Apr 8, 2024
1 parent 0471805 commit 30f07c8
Show file tree
Hide file tree
Showing 29 changed files with 825 additions and 44 deletions.
18 changes: 14 additions & 4 deletions packages/keybr-keyboard-generator/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ import { convertKalamine } from "./conv/kalamine.ts";
import LAYOUT_DE_BONE from "./layout/de_bone.ts";
import LAYOUT_DE_MINE from "./layout/de_mine.ts";
import LAYOUT_DE_NEO_2 from "./layout/de_neo_2.ts";
import LAYOUT_DE_NOTED from "./layout/de_noted.ts";
import LAYOUT_EN_CANARY from "./layout/en_canary.ts";
import LAYOUT_EN_CANARY_MATRIX from "./layout/en_canary_matrix.ts";
import LAYOUT_EN_COLEMAK from "./layout/en_colemak.ts";
import LAYOUT_EN_COLEMAK_DH from "./layout/en_colemak_dh.ts";
import LAYOUT_EN_COLEMAK_DH_MATRIX from "./layout/en_colemak_dh_matrix.ts";
import LAYOUT_EN_DVORAK_PROG from "./layout/en_dvorak_prog.ts";
import LAYOUT_EN_WORKMAN from "./layout/en_workman.ts";
import LAYOUT_EN_WORKMAN_PROG from "./layout/en_workman_prog.ts";
import LAYOUT_FR_BEPO from "./layout/fr_bepo.json";
import LAYOUT_FR_ERGLACE from "./layout/fr_erglace.json";
import LAYOUT_FR_ERGO_L from "./layout/fr_ergol.json";
import LAYOUT_FR_ERGO_L from "./layout/fr_ergo_l.json";
import LAYOUT_FR_OPTIMOT_ERGO from "./layout/fr_optimot_ergo.ts";
import LAYOUT_JA_JP_JIS from "./layout/ja_jp_jis.ts";
import { writeGeneratedFile } from "./util/generate.ts";
Expand All @@ -30,21 +34,27 @@ for (const [output, keymap] of [
["de_de-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/de-t-k0-windows.xml")],
["de_mine.ts", LAYOUT_DE_MINE],
["de_neo_2.ts", LAYOUT_DE_NEO_2],
["de_noted.ts", LAYOUT_DE_NOTED],
["el_gr-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/el-t-k0-windows.xml")],
["en_canary.ts", LAYOUT_EN_CANARY],
["en_canary_matrix.ts", LAYOUT_EN_CANARY_MATRIX],
["en_colemak_dh_matrix.ts", LAYOUT_EN_COLEMAK_DH_MATRIX],
["en_colemak_dh.ts", LAYOUT_EN_COLEMAK_DH],
["en_colemak.ts", LAYOUT_EN_COLEMAK],
["en_colemak_dh.ts", LAYOUT_EN_COLEMAK_DH],
["en_colemak_dh_matrix.ts", LAYOUT_EN_COLEMAK_DH_MATRIX],
["en_dvorak-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows-dvorak.xml")],
["en_dvorak_prog.ts", LAYOUT_EN_DVORAK_PROG],
["en_dvorakl-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows-dvorakl.xml")],
["en_dvorakr-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows-dvorakr.xml")],
["en_uk-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-GB-t-k0-windows.xml")],
["en_us-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/en-t-k0-windows.xml")],
["en_workman.ts", LAYOUT_EN_WORKMAN],
["en_workman_prog.ts", LAYOUT_EN_WORKMAN_PROG],
["es_es-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/es-t-k0-windows.xml")],
["fr_bepo.ts", convertKalamine(LAYOUT_FR_BEPO)],
["fr_ca-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/fr-CA-t-k0-windows-var.xml")],
["fr_ch-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/fr-CH-t-k0-windows.xml")],
["fr_erglace.ts", convertKalamine(LAYOUT_FR_ERGLACE)],
["fr_ergol.ts", convertKalamine(LAYOUT_FR_ERGO_L)],
["fr_ergo_l.ts", convertKalamine(LAYOUT_FR_ERGO_L)],
["fr_fr-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/fr-t-k0-windows.xml")],
["fr_optimot_ergo.ts", LAYOUT_FR_OPTIMOT_ERGO],
["he_il-win.ts", convertCldr("cldr-keyboards-43.0/keyboards/windows/he-t-k0-windows.xml")],
Expand Down
6 changes: 3 additions & 3 deletions packages/keybr-keyboard-generator/lib/layout/de_bone.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
Backquote: "^ˇ",
Backquote: ["*^", "*ˇ"],
Digit1: "1°",
Digit2: "2§",
Digit3: "3ℓ",
Expand All @@ -11,7 +11,7 @@ export default {
Digit9: "9“",
Digit0: "0”",
Minus: "-—",
Equal: "`¸",
Equal: ["*`", "*¸", "*¨"],
KeyQ: "jJ",
KeyW: "dD",
KeyE: "uU",
Expand All @@ -23,7 +23,7 @@ export default {
KeyO: "mM",
KeyP: "wW",
BracketLeft: "ßẞ",
BracketRight: "´˜",
BracketRight: ["*´", "*~"],
Backslash: "",
KeyA: "cC",
KeyS: "tT",
Expand Down
10 changes: 5 additions & 5 deletions packages/keybr-keyboard-generator/lib/layout/de_mine.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
Backquote: "^ˇ",
Backquote: ["*^", "*ˇ"],
Digit1: "1°",
Digit2: "2§",
Digit3: "3ℓ",
Expand All @@ -11,7 +11,7 @@ export default {
Digit9: "9“",
Digit0: "0”",
Minus: "-—",
Equal: "`¸",
Equal: ["*`", "*¸", "*¨"],
KeyQ: "jJ",
KeyW: "lL",
KeyE: "uU",
Expand All @@ -21,10 +21,10 @@ export default {
KeyU: "bB",
KeyI: "dD",
KeyO: "gG",
KeyP: "YY",
KeyP: "yY",
BracketLeft: "zZ",
BracketRight: "ßẞ",
Backslash: "",
Backslash: ["*´", "*~"],
KeyA: "cC",
KeyS: "rR",
KeyD: "iI",
Expand All @@ -36,7 +36,7 @@ export default {
KeyL: "sS",
Semicolon: "hH",
Quote: "",
IntlBackslash: "´˜",
IntlBackslash: "",
KeyZ: "vV",
KeyX: "xX",
KeyC: "üÜ",
Expand Down
6 changes: 3 additions & 3 deletions packages/keybr-keyboard-generator/lib/layout/de_neo_2.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
Backquote: "^ˇ",
Backquote: ["*^", "*ˇ"],
Digit1: "1°",
Digit2: "2§",
Digit3: "3ℓ",
Expand All @@ -11,7 +11,7 @@ export default {
Digit9: "9“",
Digit0: "0”",
Minus: "-—",
Equal: "`¸",
Equal: ["*`", "*¸", "*¨"],
KeyQ: "xX",
KeyW: "vV",
KeyE: "lL",
Expand All @@ -23,7 +23,7 @@ export default {
KeyO: "fF",
KeyP: "qQ",
BracketLeft: "ßẞ",
BracketRight: "´˜",
BracketRight: ["*´", "*~"],
Backslash: "",
KeyA: "uU",
KeyS: "iI",
Expand Down
51 changes: 51 additions & 0 deletions packages/keybr-keyboard-generator/lib/layout/de_noted.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
export default {
Backquote: ["*^", "*ˇ"],
Digit1: "1°",
Digit2: "2§",
Digit3: "3ℓ",
Digit4: "4»",
Digit5: "5«",
Digit6: "6$",
Digit7: "7€",
Digit8: "8„",
Digit9: "9“",
Digit0: "0”",
Minus: "-—",
Equal: ["*`", "*¸", "*¨"],
KeyQ: "zZ",
KeyW: "yY",
KeyE: "uU",
KeyR: "aA",
KeyT: "qQ",
KeyY: "pP",
KeyU: "bB",
KeyI: "mM",
KeyO: "lL",
KeyP: "fF",
BracketLeft: "jJ",
BracketRight: "ßẞ",
Backslash: ["*´", "*~"],
KeyA: "cC",
KeyS: "sS",
KeyD: "iI",
KeyF: "eE",
KeyG: "oO",
KeyH: "dD",
KeyJ: "tT",
KeyK: "nN",
KeyL: "rR",
Semicolon: "hH",
Quote: "",
IntlBackslash: "",
KeyZ: "vV",
KeyX: "xX",
KeyC: "üÜ",
KeyV: "äÄ",
KeyB: "öÖ",
KeyN: "wW",
KeyM: "gG",
Comma: ",–",
Period: ".•",
Slash: "kK",
Space: " ",
};
51 changes: 51 additions & 0 deletions packages/keybr-keyboard-generator/lib/layout/en_canary.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
export default {
Backquote: "`~",
Digit1: "1!",
Digit2: "2@",
Digit3: "3#",
Digit4: "4$",
Digit5: "5%",
Digit6: "6^",
Digit7: "7&",
Digit8: "8*",
Digit9: "9(",
Digit0: "0)",
Minus: "-_",
Equal: "=+",
KeyQ: "wW",
KeyW: "lL",
KeyE: "yY",
KeyR: "pP",
KeyT: "kK",
KeyY: "zZ",
KeyU: "xX",
KeyI: "oO",
KeyO: "uU",
KeyP: ";:",
BracketLeft: "[{",
BracketRight: "]}",
Backslash: "\\|",
KeyA: "cC",
KeyS: "rR",
KeyD: "sS",
KeyF: "tT",
KeyG: "bB",
KeyH: "fF",
KeyJ: "nN",
KeyK: "eE",
KeyL: "iI",
Semicolon: "aA",
Quote: "'\"",
IntlBackslash: "\\|",
KeyZ: "jJ",
KeyX: "vV",
KeyC: "dD",
KeyV: "gG",
KeyB: "qQ",
KeyN: "mM",
KeyM: "hH",
Comma: "/?",
Period: ",<",
Slash: ".>",
Space: " ",
};
2 changes: 1 addition & 1 deletion packages/keybr-keyboard-generator/lib/layout/en_colemak.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
KeyK: "eE",
KeyL: "iI",
Semicolon: "oO",
Quote: `'"`,
Quote: "'\"",
IntlBackslash: "\\|",
KeyZ: "zZ",
KeyX: "xX",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
KeyK: "eE",
KeyL: "iI",
Semicolon: "oO",
Quote: `'"`,
Quote: "'\"",
IntlBackslash: "\\|",
KeyZ: "xX",
KeyX: "cC",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
KeyK: "eE",
KeyL: "iI",
Semicolon: "oO",
Quote: `'"`,
Quote: "'\"",
IntlBackslash: "\\|",
KeyZ: "zZ",
KeyX: "xX",
Expand Down
50 changes: 50 additions & 0 deletions packages/keybr-keyboard-generator/lib/layout/en_dvorak_prog.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
export default {
Backquote: "$~",
Digit1: "&%",
Digit2: "[7",
Digit3: "{5",
Digit4: "}3",
Digit5: "(1",
Digit6: "=9",
Digit7: "*0",
Digit8: ")2",
Digit9: "+4",
Digit0: "]6",
Minus: "!8",
Equal: "#`",
KeyQ: ";:",
KeyW: ",<",
KeyE: ".>",
KeyR: "pP",
KeyT: "yY",
KeyY: "fF",
KeyU: "gG",
KeyI: "cC",
KeyO: "rR",
KeyP: "lL",
BracketLeft: "/?",
BracketRight: "@^",
Backslash: "\\|",
KeyA: "aA",
KeyS: "oO",
KeyD: "eE",
KeyF: "uU",
KeyG: "iI",
KeyH: "dD",
KeyJ: "hH",
KeyK: "tT",
KeyL: "nN",
Semicolon: "sS",
Quote: "-_",
IntlBackslash: "\\|",
KeyZ: "'\"",
KeyX: "qQ",
KeyC: "jJ",
KeyV: "kK",
KeyB: "xX",
KeyN: "bB",
KeyM: "mM",
Comma: "wW",
Period: "vV",
Slash: "zZ",
};
2 changes: 1 addition & 1 deletion packages/keybr-keyboard-generator/lib/layout/en_workman.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
KeyK: "eE",
KeyL: "oO",
Semicolon: "iI",
Quote: `'"`,
Quote: "'\"",
IntlBackslash: "\\|",
KeyZ: "zZ",
KeyX: "xX",
Expand Down
50 changes: 50 additions & 0 deletions packages/keybr-keyboard-generator/lib/layout/en_workman_prog.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
export default {
Backquote: "`~",
Digit1: "!1",
Digit2: "@2",
Digit3: "#3",
Digit4: "$4",
Digit5: "%5",
Digit6: "^6",
Digit7: "&7",
Digit8: "*8",
Digit9: "(9",
Digit0: ")0",
Minus: "-_",
Equal: "=+",
KeyQ: "qQ",
KeyW: "dD",
KeyE: "rR",
KeyR: "wW",
KeyT: "bB",
KeyY: "jJ",
KeyU: "fF",
KeyI: "uU",
KeyO: "pP",
KeyP: ";:",
BracketLeft: "{[",
BracketRight: "}]",
Backslash: "\\|",
KeyA: "aA",
KeyS: "sS",
KeyD: "hH",
KeyF: "tT",
KeyG: "gG",
KeyH: "yY",
KeyJ: "nN",
KeyK: "eE",
KeyL: "oO",
Semicolon: "iI",
Quote: "'\"",
IntlBackslash: "\\|",
KeyZ: "zZ",
KeyX: "xX",
KeyC: "mM",
KeyV: "cC",
KeyB: "vV",
KeyN: "kK",
KeyM: "lL",
Comma: ",<",
Period: ".>",
Slash: "/?",
};
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
KeyL: ["r", "R", "", "⬆"],
Semicolon: ["n", "N", "*~", "⮕"],
Quote: ["*^", "!", "*¨", "¡"],
Backslash: ["ç", "Ç", "* ̛", "🄯"],
Backslash: ["ç", "Ç", "*´", "🄯"],
IntlBackslash: ["*¨", "‽", "ø", "Ø"],
KeyZ: ["k", "K"],
KeyX: ["y", "Y", "*˙", "⌥"],
Expand All @@ -44,7 +44,7 @@ export default {
KeyB: ["w", "W", "•", "✗"],
KeyN: ["g", "G", "", "✣"],
KeyM: ["c", "C", "*¸", "♠"],
Comma: ["m", "M", "* ̄", "♥"],
Comma: ["m", "M", "*¯", "♥"],
Period: ["h", "H", "*˘", "♦"],
Slash: ["v", "V", "*ˇ", "♣"],
Space: [" ", 0x202f, "_", 0x00a0],
Expand Down
Loading

0 comments on commit 30f07c8

Please sign in to comment.