From 4c0c1fa13bf02ccf2fe6000dffa03b3ce1e96bd5 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 13 Jul 2024 12:13:25 +0200 Subject: [PATCH] Combining diacritic for accent double aigu --- srcs/compose/accent_double_aigu.json | 7 +------ srcs/juloo.keyboard2/ComposeKeyData.java | Bin 80573 -> 80358 bytes srcs/juloo.keyboard2/KeyModifier.java | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/srcs/compose/accent_double_aigu.json b/srcs/compose/accent_double_aigu.json index 1732b26..fa2b1ac 100644 --- a/srcs/compose/accent_double_aigu.json +++ b/srcs/compose/accent_double_aigu.json @@ -1,10 +1,5 @@ { "o": "ő", "u": "ű", - " ": "˝", - "a": "a\u030b", - "e": "e\u030b", - "i": "i\u030b", - "m": "m\u030b", - "y": "y\u030b" + " ": "˝" } diff --git a/srcs/juloo.keyboard2/ComposeKeyData.java b/srcs/juloo.keyboard2/ComposeKeyData.java index 3be49637fb89b51db2abbdd5d4992cbc88664f4a..e45e737a27311616afab8464754b84ddfd56f79f 100644 GIT binary patch delta 1321 zcmYjRNoW*76y=X`n}`cZL`RV^iBU)<>8h^o>W(Oi9uybiRf5n}sZkGVoMhY}jM1P6 zFG_)R7SyANIVg&ti0DP*RlFHc5Ld*rcD-@y!>79H{kPQoo`*kL-hFSm{iV@&tUg>1 z_{d0JS;TymzUEJVz<4O4Saz0si{11 zJzXS|bW^7Eh^ZbtWLayQoj(85KA7VF!9GpRcK(4JIeKigHa33p)af(c3ja@U6YcI8T=c@$oDQfoDAYK)!eLP#T zqgVRfsGydGig{keA~(@TCA;lnmm8|kT;gtCh1RUg?}sT~^)(Dop&CLpjIbl^@tL*m zeuXOTZiQCvsQF!iGZAAgQQ=I$naHpMLjq|8l!U=P^difCwz+aU_1U5CD;oK)!<2-& zgt~-r2^|R?2^|R?2^|R?2^|R?2^|R?37rJF67VPBPr#pmKLLLdyPN&A-A-M;;~kZ7 zcdlcAy6n`G=8Y9H?FItsS? zGf$|wC)6BB?yYL>t!nPAYVNIS?oDd$O==D{4mPgcrI5Pq?QiYwYDha5gg6Y9+Zj@M z71IK=!u!+$*-c@Si!;7$l8B(ikL-LDCo`jX}~FB<%+&|5sr6leLnLS3x~YuO1?-c*iL?zSYx^{SU9N;u;wvX4$ku2YlLF8e)AQ=way_A;B3DVfVb-T|g%`ZsVJSq*+BF9o% f=XMQJYg223YYbAc5dH4HHAoBQ^EB94oGAVRsXUxU delta 1514 zcmY+DU1(fI6vsJBZ0ovdOGHT1T9&kl5!Yts&YgSjSR)2Rt2BP#gCFFfb5C~L)wCOT zyQUQ+sZC!cFyM$#p-|s^2=qY+NcF)-!GZ{4@dKexLJ{km56=7-!@3V==boAK`=9yW zbMO2$^5x$nTX)yiY_ol~)4#ab7s=AnV*lCj3u}?d5S1v0GI}^OS%0ir55GwqHp5%U z1k|8hNF7l!5Ai>EzH?sGgb>GsOjN3~+#Ov1@%|mMySM(Pd+pN4Lz%mmF1VEszM0-R zlNV;rmb}z#oj%ik>+R*U=Q=Ch-ueE!s~0Z5=SIzh>tFtP2=MAg;y&E?eJJzJl>_eh zOykDQD>pv#n}=xRaoZ{u`_i^TlOZxSmLiu(YSkh zbMJ|6JgR_D*i%3#AQTX3Fj$tULQE0SW13?fZ&Rl3l^+iKUm7G`?faTr*xuuA|FQRZ z&^1nIG^?Scp`@Xtp`@XdiO7l*5+Xdwpqiy_e)D7{k$(Ody)Yw7gH3}?gO&`;Gic19 zF;n>0XK8vWoCe$iZUMKbx2U(V-few5=bsv(G?;Q~VAtofH0d_Ju79Lx_cJAhoO8R`smhC0VrT{5oDxH<=m7AlGHTY@gHNfvRBMcm`~IfNK(VG(U%5p7`+J7*cS zSw?M^QJZDdW*N0vMs1c+n`P8y8MRr0j~QXi2*()-Uq#>u|AeGJpGzQ;w05RG)+y*H z=qTtY=qTtYC@3f>C@AaqE2{f@4LayfeKHoOpyoeKXw=t_&>sJ5LNorlqC+#1HFz34 z4W35d8dMFcHsNJ297P7Bz!(L_C~$__47HiN_0OYk$n<~h=ddz|l{u`;amyT57O=9w z6$@OkKuZO%1+WELDsul*O4I)O6g?D&;w4ZFxCUG^$bgICVhk5!xERC57%sNpT5v5c zW{Ysi7r$85bhuJU5`QbBBYr!lY9-Zpc%ZjzduQr%^~`AhT}DU!ctQK97_3hgRIB8| zU(0C9uN73K+^-v&sg=#;&T6R2g^}Ql_4+H#ZjZa|mGdz#WrlpUv|T)#9M7Yj?o#`l gU5>d#`IimNl8(%zk`GAxZ2NRSZYwE{SKqJx3sF|t0RR91 diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java index 4b11890..9f0836c 100644 --- a/srcs/juloo.keyboard2/KeyModifier.java +++ b/srcs/juloo.keyboard2/KeyModifier.java @@ -69,7 +69,7 @@ public final class KeyModifier case OGONEK: return apply_compose_or_dead_char(k, ComposeKeyData.accent_ogonek, '\u02DB'); case DOT_ABOVE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_dot_above, '\u02D9'); case BREVE: return apply_dead_char(k, '\u02D8'); - case DOUBLE_AIGU: return apply_compose(k, ComposeKeyData.accent_double_aigu); + case DOUBLE_AIGU: return apply_diacritics(k, ComposeKeyData.accent_double_aigu, '\0', '\u030b'); case ORDINAL: return apply_compose(k, ComposeKeyData.accent_ordinal); case SUPERSCRIPT: return apply_compose(k, ComposeKeyData.accent_superscript); case SUBSCRIPT: return apply_compose(k, ComposeKeyData.accent_subscript);