From 4098522029677e04e4f9bdb2015f46fb7ad74f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= Date: Mon, 5 Aug 2024 00:44:26 -0400 Subject: [PATCH] fix: fractions still not working --- layouts/canadian-multilingual-standard.dtsi | 27 +++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi index 24ee1c8..5ef53fa 100644 --- a/layouts/canadian-multilingual-standard.dtsi +++ b/layouts/canadian-multilingual-standard.dtsi @@ -25,12 +25,9 @@ #define ACC_TR LS(LBKT) // ¨ /* Fractions */ -#define MATH_1_4 RA(N4) // ¼ -#define MATH_1_2 RA(N5) // ½ -#define MATH_3_4 RA(N6) // ¾ -#define MATH_3_8 RC(N5) // ⅜ -#define MATH_5_8 RC(N6) // ⅝ -#define MATH_7_8 RC(N7) // ⅞ +#define MATH_1_4 RC(N4) // ¼ +#define MATH_1_2 RC(N5) // ½ +#define MATH_3_4 RC(N6) // ¾ /* Symbols */ #define MATH_PM RA(N1) // @@ -41,9 +38,7 @@ #define LAQUO RA(Z) // « #define RAQUO RA(X) // » - - -// Mod-morph - lowercase / uppercase accented characters +// MOD-MORPH - lowercase / uppercase accented characters ZMK_MOD_MORPH(morph_a_circ, bindings = <&CIRC A>, <&CIRC LS(A)>; mods = <(MOD_LSFT|MOD_RSFT)>;) // â /  ZMK_MOD_MORPH(morph_e_circ, bindings = <&CIRC E>, <&CIRC LS(E)>; mods = <(MOD_LSFT|MOD_RSFT)>;) // ê / Ê ZMK_MOD_MORPH(morph_e_trem, bindings = <&TREM E>, <&TREM LS(E)>; mods = <(MOD_LSFT|MOD_RSFT)>;) // ê / Ê @@ -57,7 +52,8 @@ ZMK_MOD_MORPH(morph_u_trem, bindings = <&TREM U>, <&TREM LS(U)>; mods = <(MOD_LS ZMK_MOD_MORPH(morph__ae, bindings = <&kp RC(A)>, <&kp LS(RC(A))>; mods = <(MOD_LSFT|MOD_RSFT)>;) // æ / Æ ZMK_MOD_MORPH(morph__oe, bindings = <&kp RC(E)>, <&kp LS(RC(E))>; mods = <(MOD_LSFT|MOD_RSFT)>;) // œ / Œ -// The following macros return to the base layer after being pressed +// KEYMAP MACROS +// The following macros return to the specified layer after being pressed ZMK_MACRO_ONE_PARAM(A_GR, bindings = <&kp BACKSLASH>, <¯o_param_1to1>, <&to MACRO_PLACEHOLDER>;) // À ZMK_MACRO_ONE_PARAM(A_CI, bindings = <&morph_a_circ>, <¯o_param_1to1>, <&to MACRO_PLACEHOLDER>;) //  ZMK_MACRO_ONE_PARAM(E_CU, bindings = <&kp SLASH>, <¯o_param_1to1>, <&to MACRO_PLACEHOLDER>;) // É @@ -75,17 +71,22 @@ ZMK_MACRO_ONE_PARAM(AE_L, bindings = <&morph__ae>, <¯o_param_1to1>, <&to MAC ZMK_MACRO_ONE_PARAM(OE_L, bindings = <&morph__oe>, <¯o_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Œ ZMK_MACRO_ONE_PARAM(CEDIL, bindings = <&kp RBKT>, <¯o_param_1to1>, <&to MACRO_PLACEHOLDER>;) // Ç -// QWERTY Homerow Mods + +// ACCENTS HOME ROW MODS + +// QWERTY ZMK_MACRO(E_GR_D, bindings = <&kp APOS>, <&to QWE>;) // È ZMK_MACRO(I_CI_D, bindings = <&morph_i_circ>, <&to QWE>;) // Î -// Colemak Homerow Mods +// Colemak ZMK_MACRO(E_GR_C, bindings = <&kp APOS>, <&to COL>;) // È ZMK_MACRO(I_CI_C, bindings = <&morph_i_circ>, <&to COL>;) // Î -// Ergo-L Homerow Mods +// Ergo-L ZMK_MACRO(E_CI_E, bindings = <&morph_e_circ>, <&to ERG>;) // Ê +// ACCENTS MACROS + // ` directly ZMK_MACRO(GRA, bindings = <¯o_press &kp RALT>,