From cd2932bde1dda6dedee2060310a9334ce30d2cbf Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 5 Oct 2024 11:28:14 +0200 Subject: [PATCH] Add slavonic combining diacritics Co-authored-by: Anastazius Kaejatidarjan --- assets/special_font.ttf | Bin 14652 -> 16448 bytes srcs/juloo.keyboard2/KeyValue.java | 11 +++++ .../prefs/ExtraKeysPreference.java | 22 ++++++++- srcs/special_font/200.svg | 42 ++++++++++++++++++ srcs/special_font/201.svg | 42 ++++++++++++++++++ srcs/special_font/202.svg | 42 ++++++++++++++++++ srcs/special_font/203.svg | 42 ++++++++++++++++++ srcs/special_font/204.svg | 42 ++++++++++++++++++ srcs/special_font/205.svg | 42 ++++++++++++++++++ srcs/special_font/206.svg | 42 ++++++++++++++++++ srcs/special_font/207.svg | 42 ++++++++++++++++++ 11 files changed, 367 insertions(+), 2 deletions(-) create mode 100644 srcs/special_font/200.svg create mode 100644 srcs/special_font/201.svg create mode 100644 srcs/special_font/202.svg create mode 100644 srcs/special_font/203.svg create mode 100644 srcs/special_font/204.svg create mode 100644 srcs/special_font/205.svg create mode 100644 srcs/special_font/206.svg create mode 100644 srcs/special_font/207.svg diff --git a/assets/special_font.ttf b/assets/special_font.ttf index ad676f51d418f6c9117de39bd8a8ab380f282562..334fe3acfbaf4fb530b80fef25f2f5a40aaa31a4 100644 GIT binary patch delta 1185 zcma)5OKcle6g_Xo_SkV^k7JL2u@l?V=3}?9GauWeapQy}bz3(dgBk?{svFuSB5ABP zMU6mesF3)G1uzxc76~Lil>ixu1uR%Z%7!gc7c86zq0&}WVFgGu+;LpijP!iw-gn+P z_ue=D{?ZSd>>3z=c5H%2apsw{lAWl03$PMp&n&K1YcKcKvHStvfR zw7R}<^{(NoQsPru6DwAG}VAVDKe)SfdxMk zwl}>kjX)#cIJ*|5j&3(R`4F>co;JOj{7)H;3Ud8g=x%S zwtkzx#l*lb!P($eC=uEWJq(w_pV!OQ-v%8{Oh9CRQGbnruurf_zJOmMlqE&i`g(Ou zHNHwKuG{^=km#{H+zW1ZG-}KxlirF)jD~~$&NjPU84m}8qW=ry-ocaxCyFGw$32Dz z5~851#{dpPqe4e8PV-EVkE-ReszPQe*_a;g*G6P{%3 z=ktcOSnMrRf0*=Dh}_YJz)5vI$DzTSNo-{|mY zzOyr!426?D<*9%qMWSV6D3ubmq-YO1+g+}%e21&U^^Iwkq?taMkRMh!s3l*ssW|#^ z2pP~f&Lkm_)6EvF%c1x&k2xK|Ur?f_vmcov1OH1Skn7vm(5DjNseO&?>8Mg@YLLy7 zIwW+$k8T=j0!a))$5SZaX~1jqt4dB#bFyHg3#68FRMe2~Z|gD5BX%4)IO4E7oo?CX zW*?gRE?;)ks=Xbz@|@)Fx=E!T7R3adv{8 tWMy`WO|zN0C70n!!j+55lS(Gj!l4!_EmT{mwNP(iwuL#mEJlA0?q8DH^kM)2 delta 407 zcmXX?ze@sP7=FI*PBe*z93oIsl4vpsIV>_7OfsZIr;5PyvLw9jNC~YWn+h7D&NW)w z8m^(Cp`oCmIa-1{`ay2}2ln343-9~AKc46Lc;AOMyWc$o1JI8)1k5cLCnlwIp$}jS z)GaBhte@DYX@I{_?_1exgc0E_K)j{7xFy&1UXPfVN>J_Fs)qSppLDAs^PYdLy)`&69SX>Q8qWTIl2WJ%0W+5|D`G1E=U14Ft*XvyeCI0<%Vp z1-alca%|RbmxXXIiB&-|J1ofxgr~h+54vc;qRP2e5F#Gw^}E{K8nTjB*)G#1U@ case "meta": return modifierKey("Meta", Modifier.META, 0); /* Combining diacritics */ + /* Glyphs is the corresponding dead-key + 0x0100. */ case "combining_dot_above": return makeCharKey(0xE15A, '\u0307', 0); case "combining_double_aigu": return makeCharKey(0xE15B, '\u030B', 0); case "combining_slash": return makeCharKey(0xE15C, '\u0337', 0); @@ -547,6 +548,16 @@ public final class KeyValue implements Comparable case "combining_dot_below": return makeCharKey(0xE160, '\u0323', 0); case "combining_horn": return makeCharKey(0xE161, '\u031B', 0); case "combining_hook_above": return makeCharKey(0xE162, '\u0309', 0); + /* Combining diacritics that do not have a corresponding dead keys start + at 0xE200. */ + case "combining_vertical_tilde": return makeCharKey(0xE200, '\u033E', 0); + case "combining_inverted_breve": return makeCharKey(0xE201, '\u0311', 0); + case "combining_pokrytie": return makeCharKey(0xE202, '\u0487', 0); + case "combining_slavonic_psili": return makeCharKey(0xE203, '\u0486', 0); + case "combining_slavonic_dasia": return makeCharKey(0xE204, '\u0485', 0); + case "combining_payerok": return makeCharKey(0xE205, '\uA67D', 0); + case "combining_titlo": return makeCharKey(0xE206, '\u0483', 0); + case "combining_vzmet": return makeCharKey(0xE207, '\uA66F', 0); /* Special event keys */ case "config": return eventKey(0xE004, Event.CONFIG, FLAG_SMALLER_FONT); diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java index f5a99ff..04ac8b2 100644 --- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java +++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java @@ -90,7 +90,15 @@ public class ExtraKeysPreference extends PreferenceCategory "combining_ogonek", "combining_dot_below", "combining_horn", - "combining_hook_above" + "combining_hook_above", + "combining_vertical_tilde", + "combining_inverted_breve", + "combining_pokrytie", + "combining_slavonic_psili", + "combining_slavonic_dasia", + "combining_payerok", + "combining_titlo", + "combining_vzmet" }; /** Whether an extra key is enabled by default. */ @@ -159,7 +167,17 @@ public class ExtraKeysPreference extends PreferenceCategory case "combining_ogonek": case "combining_dot_below": case "combining_horn": - case "combining_hook_above": id = R.string.key_descr_combining; break; + case "combining_hook_above": + case "combining_vertical_tilde": + case "combining_inverted_breve": + case "combining_pokrytie": + case "combining_slavonic_psili": + case "combining_slavonic_dasia": + case "combining_payerok": + case "combining_titlo": + case "combining_vzmet": + id = R.string.key_descr_combining; + break; } if (id == 0) return null; diff --git a/srcs/special_font/200.svg b/srcs/special_font/200.svg new file mode 100644 index 0000000..b925eb5 --- /dev/null +++ b/srcs/special_font/200.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/201.svg b/srcs/special_font/201.svg new file mode 100644 index 0000000..a7629f9 --- /dev/null +++ b/srcs/special_font/201.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/202.svg b/srcs/special_font/202.svg new file mode 100644 index 0000000..590016b --- /dev/null +++ b/srcs/special_font/202.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/203.svg b/srcs/special_font/203.svg new file mode 100644 index 0000000..8f6910c --- /dev/null +++ b/srcs/special_font/203.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/204.svg b/srcs/special_font/204.svg new file mode 100644 index 0000000..760a894 --- /dev/null +++ b/srcs/special_font/204.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/205.svg b/srcs/special_font/205.svg new file mode 100644 index 0000000..313e811 --- /dev/null +++ b/srcs/special_font/205.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/206.svg b/srcs/special_font/206.svg new file mode 100644 index 0000000..43712d0 --- /dev/null +++ b/srcs/special_font/206.svg @@ -0,0 +1,42 @@ + + + + + + + + + + diff --git a/srcs/special_font/207.svg b/srcs/special_font/207.svg new file mode 100644 index 0000000..f13d1e5 --- /dev/null +++ b/srcs/special_font/207.svg @@ -0,0 +1,42 @@ + + + + + + + + + +