Skip to content

Commit

Permalink
Merge pull request #10 from JeffDess/spanish-accents
Browse files Browse the repository at this point in the history
Spanish accents
  • Loading branch information
JeffDess authored Oct 30, 2024
2 parents 8ad5f4d + 6002652 commit 95cfe20
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 32 deletions.
18 changes: 12 additions & 6 deletions behaviors/mod-morph.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ ZMK_MOD_MORPH(num_esc_clk,
mods = <(MOD_LSFT|MOD_LCTL)>;
)

// hold: symbol layer | tap: space | shift + tap: non-breaking space
ZMK_MOD_MORPH(sp_nbsp_sym,
bindings = <&lt SYM SPACE>, <&kp RALT(SPACE)>;
mods = <(MOD_LSFT)>;
)

// tap: period | shift + tap: colon
ZMK_MOD_MORPH(dot_col,
bindings = <&kp DOT>, <&kp COLON>;
Expand All @@ -75,3 +69,15 @@ ZMK_MOD_MORPH(sap_dap,
bindings = <&kp SAPOS>, <&kp DAPOS>;
mods = <(MOD_LSFT|MOD_RSFT)>;
)

// tap: question mark | shift + tap: inverted question mark
ZMK_MOD_MORPH(ques_iques,
bindings = <&kp QUEST>, <&kp INV_QUEST>;
mods = <(MOD_LSFT|MOD_RSFT)>;
)

// tap: exclamation mark | shift + tap: inverted exclamation mark
ZMK_MOD_MORPH(excl_iexcl,
bindings = <&kp EXCL>, <&kp INV_EXCL>;
mods = <(MOD_LSFT|MOD_RSFT)>;
)
2 changes: 1 addition & 1 deletion config/corne.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ZMK_LAYER(Colemak,
// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
&kp Z &kp X &kp C &kp D &kp V &kp K &kp H &kp COMMA &kp DOT &to CAC
// ╰───────────┴───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┴────────────╯
&to MOU &lt NAV RET &num_esc_clk &bspc_del &sp_nbsp_sym &mt RALT TAB
&to MOU &lt NAV RET &num_esc_clk &bspc_del &lt SYM SPACE &mt RALT TAB
// ╰───────────┴────────────┴────────────╯ ╰───────────┴─────────────┴─────────────╯
)

Expand Down
6 changes: 3 additions & 3 deletions config/urchin.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ ZMK_LAYER(Colemak,
// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
&kp Z &kp X &kp C &kp D &kp V &kp K &kp H &kp COMMA &kp DOT &to CAC
// ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯
&lt NAV RET &num_esc_clk &bspc_del &sp_nbsp_sym
&lt NAV RET &num_esc_clk &bspc_del &lt SYM SPACE
// ╰────────────┴────────────╯ ╰───────────┴─────────────╯
)

ZMK_LAYER(ColeAcc,
// ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
XXX XXX &E_TR COL XXX XXX XXX &I_TR COL &O_TR COL &U_TR COL &KPT ACC_TR COL
&KPT ACC_TI COL &KPT ACC_AC COL &E_TR COL XXX XXX XXX &I_TR COL &O_TR COL &U_TR COL &KPT ACC_TR COL
// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
&A_GR COL &E_CI COL &E_CU COL &hrmeg SL COL XXX XXX &hrmic SL COL &O_CI COL &U_CI COL &KPT ACC_GR COL
// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
Expand Down Expand Up @@ -95,7 +95,7 @@ ZMK_LAYER(Symbols,
// ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
&kp HASH &kp AT &kp LBRAC &kp RBRAC &kp PLUS XXX &kp TILDS &GRA &kp DLLR &soft_off
// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
&slsh_bslsh &dash_tilde &kp LPAR &hml SL RPAR &kp EQUAL &CAR &kp QUEST &kp EXCL &kp AMPS &kp PIP
&slsh_bslsh &dash_tilde &kp LPAR &hml SL RPAR &kp EQUAL &CAR &ques_iques &excl_iexcl &kp AMPS &kp PIP
// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
&kp STAR &kp PRCNT &kp LBKET &kp RBKET &kp UNDER XXX &kp LETHAN &kp GRTHAN &kp LAQUO &kp RAQUO
// ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯
Expand Down
4 changes: 4 additions & 0 deletions images/keymaps/urchin_keymap.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions keymap-drawer/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,10 @@ parse_config:
"&E_TR 0": "Ë",
"&I_CI 0": "Î",
"&I_TR 0": "Ï",
"&KPT ACC_AC 0": "´",
"&KPT ACC_CI 0": "^",
"&KPT ACC_GR 0": "`",
"&KPT ACC_TI 0": "~",
"&KPT ACC_TR 0": "¨",
"&OE_L 0": "Œ",
"&O_CI 0": "Ô",
Expand Down Expand Up @@ -450,6 +452,8 @@ parse_config:
"&KPT ACC_CI 4": "^",
"&KPT ACC_GR 4": "`",
"&KPT ACC_TR 4": "¨",
"&kp INV_QUEST": "¿",
"&kp INV_EXCL": "¡",
"&OE_L 4": "Œ",
"&O_CI 4": "Ô",
"&O_TR 4": "Ö",
Expand Down
8 changes: 4 additions & 4 deletions keymap-drawer/urchin_keymap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ layers:
- {t: '$$material:backspace$$', s: $$delete$$}
- {t: '$$tabler:space$$', h: Symbols, s: $$nbsp$$}
Colemak Accents:
- ''
- ''
- '~'
- ´
- Ë
- ''
- ''
Expand Down Expand Up @@ -227,8 +227,8 @@ layers:
- {t: ), h: SHIFT}
- '='
- ^
- '?'
- '!'
- {t: '?', s: ¿}
- {t: '!', s: ¡}
- '&'
- '|'
- '*'
Expand Down
40 changes: 22 additions & 18 deletions layouts/canadian-multilingual-standard.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@

/* Canadian Multilingual Standard Mappings */

#define SLSH GRAVE // /
#define ASLSH RA(SLASH) // / on iOS
#define SAPOS LS(COMMA) // '
#define DAPOS LS(DOT) // "
#define DEG RA(SEMI) // °
#define LBRAC RA(N7) // {
#define RBRAC RA(N8) // }
#define LBKET RA(N9) // [
#define RBKET RA(N0) // ]
#define QUEST LS(N6) // ?
#define PIP RA(GRAVE) // |
#define TILDS RA(RBKT) // ~
#define LETHAN RA(COMMA) //
#define GRTHAN RA(DOT) //
#define ACC_AI RA(SLASH) // ´
#define ACC_CI LBKT // ^
#define ACC_GR RA(LBKT) // `
#define ACC_TR LS(LBKT) // ¨
#define SLSH GRAVE // /
#define ASLSH RA(SLASH) // / on iOS
#define SAPOS LS(COMMA) // '
#define DAPOS LS(DOT) // "
#define DEG RA(SEMI) // °
#define LBRAC RA(N7) // {
#define RBRAC RA(N8) // }
#define LBKET RA(N9) // [
#define RBKET RA(N0) // ]
#define QUEST LS(N6) // ?
#define PIP RA(GRAVE) // |
#define TILDS RA(RBKT) // ~
#define LETHAN RA(COMMA) //
#define GRTHAN RA(DOT) //
#define ACC_AC RC(SEMI) // ´
#define ACC_AI RA(SLASH) // ´
#define ACC_CI LBKT // ^
#define ACC_GR RA(LBKT) // `
#define ACC_TI RC(RBKT) // ~
#define ACC_TR LS(LBKT) // ¨
#define INV_QUEST RC(UNDER) // ¿
#define INV_EXCL RC(EXCL) // ¡

/* Fractions */
#define MATH_1_4 RC(N4) // ¼
Expand Down

0 comments on commit 95cfe20

Please sign in to comment.