diff --git a/srcs/compose/compose/cyrillic.json b/srcs/compose/compose/cyrillic.json index f6f2f1f..5450dd6 100644 --- a/srcs/compose/compose/cyrillic.json +++ b/srcs/compose/compose/cyrillic.json @@ -7,31 +7,38 @@ "к": "ӄ", "л": "ԓ", "н": "ӈ", - "х": "ӽ" + "х": "ӽ", + "ѧ": "ӊ" }, ".": { "г": "ӷ", "ж": "җ", "й": "ҋ", "к": "қ", + "л": "ԯ", "м": "ӎ", "н": "ӊ", + "х": "ҳ", + "ч": "ҷ", "і": "ї" }, "а": { "е": "ѣ", "у": "ѡ", - "ъ": "ѣ", + "ч": "combining_acute", "ы": "ѣ", "ь": "ꙙ", - "э": "ѣ", - "є": "ѣ", + "ꙋ": "ꙍ", "ꙑ": "ѣ" }, + "б": { + "ч": "combining_slavonic_psili" + }, "г": { ",": "ӻ", ".": "ӷ", "й": "ғ", + "к": "ґ", "х": "ҁ", "ј": "ғ" }, @@ -40,10 +47,11 @@ "ж": "џ", "з": "ꙃ", "й": "ꙉ", - "ј": "ꙉ" + "ј": "ꙉ", + "ѥ": "ђ" }, "е": { - "о": "ё" + "ч": "combining_trema" }, "ж": { ".": "җ" @@ -53,12 +61,11 @@ }, "и": { "и": "ӣ", - "й": "ӣ", - "у": "ѵ", - "ј": "ӣ" + "у": "ѵ" }, "й": { - ".": "ҋ" + ".": "ҋ", + "ч": "combining_breve" }, "к": { ",": "ӄ", @@ -70,6 +77,7 @@ }, "л": { ",": "ԓ", + ".": "ԯ", "ь": "љ" }, "м": { @@ -77,16 +85,17 @@ }, "н": { ",": "ӈ", - ".": "ӊ", + "·": "ԩ", + "ч": "combining_titlo", "ь": "њ" }, "о": { "т": "ѿ", - "у": "ѹ" + "у": "ѹ", + "ч": "combining_inverted_breve" }, "п": { - "с": "ѱ", - "ш": "ѱ" + "с": "ѱ" }, "т": { "й": "ћ", @@ -94,28 +103,47 @@ "ј": "ћ" }, "у": { + "и": "ѵ", + "й": "ў", "у": "ӯ", - "ъ": "ў" + "ч": "combining_porkrytie", + "і": "ѵ", + "ј": "ў" }, "х": { ",": "ӽ", - "й": "ҳ", - "ь": "ҳ", - "ј": "ҳ" + ".": "ҳ", + "ч": "combining_slavonic_dasia" + }, + "ч": { + ".": "ҷ", + "а": "combining_acute", + "б": "combining_slavonic_psili", + "е": "combining_trema", + "й": "combining_breve", + "н": "combining_titlo", + "о": "combining_inverted_breve", + "у": "combining_pokrytie", + "х": "combining_slavonic_dasia", + "ч": "combining_payerok", + "ч": "combining_payerok", + "ъ": "combining_vertical_tilde", + "ю": "combining_grave", + "ј": "combining_breve", + "ѧ": "combining_vzmet" }, "ш": { - "ч": "щ" + "т": "щ" }, - "ы": { - "у": "ѡ", - "ъ": "ꙑ" + "ъ": { + "ч": "combining_vertical_tilde" }, "ю": { "а": "ꙓ", - "е": "ѥ", + "е": "ё", "м": "ѭ", "н": "ѩ", - "э": "ѥ" + "ч": "combining_grave" }, "я": { "ь": "ꙝ" @@ -123,16 +151,18 @@ "і": { "\"": "ї", ".": "ї", - "й": "ӣ", "у": "ѵ", - "і": "ӣ", - "ј": "ӣ" + "і": "ӣ" + }, + "ј": { + "а": "ꙗ", + "ч": "combining_breve", + "ѣ": "ꙝ" }, "ѡ": { "т": "ѿ" }, - "ꙑ": { - "ь": "ы", - "у": "ѡ" + "ѧ": { + "ч": "combining_vzmet" } } diff --git a/srcs/juloo.keyboard2/ComposeKeyData.java b/srcs/juloo.keyboard2/ComposeKeyData.java index e604412..26878d3 100644 Binary files a/srcs/juloo.keyboard2/ComposeKeyData.java and b/srcs/juloo.keyboard2/ComposeKeyData.java differ