From cd2932bde1dda6dedee2060310a9334ce30d2cbf Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 5 Oct 2024 11:28:14 +0200 Subject: Add slavonic combining diacritics Co-authored-by: Anastazius Kaejatidarjan --- srcs/juloo.keyboard2/KeyValue.java | 11 ++++++ .../juloo.keyboard2/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 ++++++++++++++++++++++ 10 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 (limited to 'srcs') diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 76bf2d0..41dfd56 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -528,6 +528,7 @@ public final class KeyValue implements Comparable 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 @@ + + + + + + + + + + -- cgit v1.2.3