From 9a44ecf4e207c288cbc1e41c691237b27d7b968b Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 13 Jul 2024 12:10:04 +0200
Subject: [PATCH] Apply combining diacritic for accent aigu

Any characters that were not affected by the compose or the dead char
mappings are now outputted with a combining diacritic when enabling the
accent aigu.
---
 srcs/compose/accent_aigu.json            |  12 +----
 srcs/juloo.keyboard2/ComposeKeyData.java | Bin 81066 -> 80573 bytes
 srcs/juloo.keyboard2/KeyModifier.java    |  55 +++++++++++++----------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/srcs/compose/accent_aigu.json b/srcs/compose/accent_aigu.json
index bfc04b8..86852fc 100644
--- a/srcs/compose/accent_aigu.json
+++ b/srcs/compose/accent_aigu.json
@@ -11,15 +11,5 @@
   "u": "ú",
   "y": "ý",
   "z": "ź",
-  "ü": "ǘ",
-  "j": "j\u0301",
-  "у": "у\u0301",
-  "е": "е\u0301",
-  "а": "а\u0301",
-  "о": "о\u0301",
-  "и": "и\u0301",
-  "ы": "ы\u0301",
-  "э": "э\u0301",
-  "ю": "ю\u0301",
-  "я": "я\u0301"
+  "ü": "ǘ"
 }
diff --git a/srcs/juloo.keyboard2/ComposeKeyData.java b/srcs/juloo.keyboard2/ComposeKeyData.java
index 2f1e5e82f68c95d59c83cd30bbcc46210372cb88..3be49637fb89b51db2abbdd5d4992cbc88664f4a 100644
GIT binary patch
delta 178
zcmZ4WlV$H$mJJzg<~jLA#if;1F{K6uX~{s+(8L79PBjFv4a~u8OE8%N5;0B$vD1tv
zJI0DkW^EVSytn=Ny6O5XjI7?tmO%Z6$(BHMKr$6frh&*r1273R5y&<Ilg3~YXcJJx
i6ik|dNuYf|5sS$a=lV_F+palX!IF`Cd%gvuH46X?r9DId

delta 313
zcmdn{m1WgWmJJzgB3U{4Ma89+RWYRo25HGa($K_YvYmzOWPvEz$@OhwlfUx|Ng5a$
zCxR6igA|yWDk*4lDFA`e<fUyYLNTRoKme36F*X2_#s-Fy=Lo5B!39$%KM~TJteapq
z-Or3sbMvRRee3ECEn-RylM~Irq&b*`h**NzK-++_DPS@cOs0XzB%t{~(hy7<fk~i?
zfFdSf(iBXB%}fHDlLYh-P!_B=8LU1TtR|TUY*}&=NIH3P<6*hU6Xvi?K0jAv@_}9K
f(-lM*b*2}HFmg^lH<y3%h9^-#Y`7ih_<R-s`-E)T

diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 8d5fbbb..4b11890 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -58,7 +58,7 @@ public final class KeyModifier
       case GESTURE: return apply_gesture(k);
       case SHIFT: return apply_shift(k);
       case GRAVE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_grave, '\u02CB');
-      case AIGU: return apply_compose_or_dead_char(k, ComposeKeyData.accent_aigu, '\u00B4');
+      case AIGU: return apply_diacritics(k, ComposeKeyData.accent_aigu, '\u00B4', '\u0301');
       case CIRCONFLEXE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_circonflexe, '\u02C6');
       case TILDE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_tilde, '\u02DC');
       case CEDILLE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_cedille, '\u00B8');
@@ -131,43 +131,50 @@ public final class KeyModifier
     return k;
   }
 
-  /** Apply the given compose state or fallback to the dead_char. */
-  private static KeyValue apply_compose_or_dead_char(KeyValue k, int state, char dead_char)
+  /** Apply the following mapping, in this order, and stop at the first that
+      changes the key.
+
+      - The compose state, unless it is [0].
+      - The dead char, unless it is ['\0'].
+      - The combining diacritic, unless it is ['\0']. */
+  private static KeyValue apply_diacritics(KeyValue k, int state, char dead_char, char combining)
   {
     switch (k.getKind())
     {
       case Char:
         char c = k.getChar();
-        KeyValue r = ComposeKey.apply(state, c);
-        if (r != null)
-          return r;
+        if (state != 0)
+        {
+          KeyValue r = ComposeKey.apply(state, c);
+          if (r != null)
+            return r;
+        }
+        if (dead_char != '\0')
+        {
+          char modified = (char)KeyCharacterMap.getDeadChar(dead_char, c);
+          if (modified != 0 && modified != c)
+            return KeyValue.makeStringKey(String.valueOf(modified));
+        }
+        if (combining != '\0')
+          return KeyValue.makeStringKey(new String(new char[]{ c, combining }));
+        break;
     }
-    return apply_dead_char(k, dead_char);
+    return k;
   }
 
   private static KeyValue apply_compose(KeyValue k, int state)
   {
-    switch (k.getKind())
-    {
-      case Char:
-        KeyValue r = ComposeKey.apply(state, k.getChar());
-        if (r != null)
-          return r;
-    }
-    return k;
+    return apply_diacritics(k, state, '\0', '\0');
   }
 
   private static KeyValue apply_dead_char(KeyValue k, char dead_char)
   {
-    switch (k.getKind())
-    {
-      case Char:
-        char c = k.getChar();
-        char modified = (char)KeyCharacterMap.getDeadChar(dead_char, c);
-        if (modified != 0 && modified != c)
-          return KeyValue.makeStringKey(String.valueOf(modified));
-    }
-    return k;
+    return apply_diacritics(k, 0, dead_char, '\0');
+  }
+
+  private static KeyValue apply_compose_or_dead_char(KeyValue k, int state, char dead_char)
+  {
+    return apply_diacritics(k, state, dead_char, '\0');
   }
 
   private static KeyValue apply_shift(KeyValue k)