From cbd2485d33e9b53a05ec30129f8df2c066befac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= <jfdess@gmail.com>
Date: Mon, 28 Oct 2024 22:59:51 -0400
Subject: [PATCH] fix: try inverted marks as macros

---
 behaviors/mod-morph.dtsi                    |  4 ++--
 keymap-drawer/config.yaml                   |  4 ++--
 layouts/canadian-multilingual-standard.dtsi | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/behaviors/mod-morph.dtsi b/behaviors/mod-morph.dtsi
index d1f723f..d4cf1f4 100644
--- a/behaviors/mod-morph.dtsi
+++ b/behaviors/mod-morph.dtsi
@@ -78,12 +78,12 @@ ZMK_MOD_MORPH(sap_dap,
 
 // tap: question mark | shift + tap: inverted question mark
 ZMK_MOD_MORPH(ques_iques,
-    bindings = <&kp QUEST>, <&kp INV_QUEST>;
+    bindings = <&kp QUEST>, <&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>;
+    bindings = <&kp EXCL>, <&INV_EXCL>;
     mods = <(MOD_LSFT|MOD_RSFT)>;
 )
diff --git a/keymap-drawer/config.yaml b/keymap-drawer/config.yaml
index 3792fde..5215fa9 100644
--- a/keymap-drawer/config.yaml
+++ b/keymap-drawer/config.yaml
@@ -452,7 +452,6 @@ parse_config:
     "&KPT ACC_CI 4": "^",
     "&KPT ACC_GR 4": "`",
     "&KPT ACC_TR 4": "¨",
-    "&INV_QUEST": "¿",
     "&INV_EXCL": "¡",
     "&OE_L 4": "Œ",
     "&O_CI 4": "Ô",
@@ -460,7 +459,8 @@ parse_config:
     "&U_CI 4": "Û",
     "&U_GR 4": "Ù",
     "&U_TR 4": "Ü",
-    "&QUEST": "?",
+    "&kp QUEST": "?",
+    "&INV_QUEST": "¿",
     "&kp RA(COMMA)": "<",
     "&kp RA(DOT)": ">",
     "&GRA": "`",
diff --git a/layouts/canadian-multilingual-standard.dtsi b/layouts/canadian-multilingual-standard.dtsi
index 33fd485..b97cbcb 100644
--- a/layouts/canadian-multilingual-standard.dtsi
+++ b/layouts/canadian-multilingual-standard.dtsi
@@ -26,8 +26,6 @@
 #define ACC_GR RA(LBKT)         // `
 #define ACC_TI RC(RBKT)         // ~
 #define ACC_TR LS(LBKT)         // ¨
-#define INV_QUEST RC(MINUS)     // ¿
-#define INV_EXCL RS(RC(N1))     // ¡
 
 /* Fractions */
 #define MATH_1_4 RC(N4) // ¼
@@ -93,6 +91,19 @@ ZMK_MACRO(I_CI_Q, bindings = <&morph_i_circ>, <&to QWE>;) // Î
 /* Colemak */
 ZMK_MACRO(E_GR_C, bindings = <&kp APOS>, <&to COL>;) // È
 ZMK_MACRO(I_CI_C, bindings = <&morph_i_circ>, <&to COL>;) // Î
+ZMK_MACRO(INV_QUEST, bindings = 
+<&macro_press &kp RCTL>,
+<&macro_tap &kp MINUS>,
+<&macro_release &kp RCTL>;
+) // ¿
+
+ZMK_MACRO(INV_EXCL, bindings = 
+<&macro_press &kp RCTL>,
+<&macro_press &kp RSHFT>,
+<&macro_tap &kp N1>,
+<&macro_release &kp LSHFT>,
+<&macro_release &kp RCTL>;
+) // ¡
 
 /* Ergo-L */
 ZMK_MACRO(E_CI_E, bindings = <&morph_e_circ>, <&to ERG>;) // Ê