summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@telfort.nl>2023-04-16 17:32:52 +0200
committerSergey Udaltsov <sergey.udaltsov@gmail.com>2023-05-17 17:17:12 +0000
commit6258e8b9256ff36aa697b126eca4d945ead04f88 (patch)
tree9dbd8cd83bc3ebfa5c4217fb3cee1c1e6db120aa
parent68948043f360e5553583976d41ae8388d29dd0fb (diff)
downloadxkeyboard-config-6258e8b9256ff36aa697b126eca4d945ead04f88.tar.gz
symbols/et: use dead-vowel symbols instead of mistaken Unicode codepoints
When twelve years ago, in commit c28367a15, the code points 0x100FE67 and further were added for "dead a" and such, the intention was that they were raw key codes (0xfe67 and further), not Unicode codepoints. See the original patch that requested adding very similar key codes to xorgproto three years earlier: https://bugs.freedesktop.org/attachment.cgi?id=18679 The compose sequences in libX11 have been updated to use the dead-vowel symbols instead of the erroneous Unicode codepoints (most of which are valid codepoints for certain characters, that thus became unusable in the Amharic locale), so now it's time to update the keyboard layout. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-rw-r--r--symbols/et12
1 files changed, 6 insertions, 6 deletions
diff --git a/symbols/et b/symbols/et
index cf06223..24e1c0d 100644
--- a/symbols/et
+++ b/symbols/et
@@ -32,18 +32,18 @@ xkb_symbols "olpc" {
key <AD01> { [ 0x01001240, 0x01001250 ] }; // q
key <AD02> { [ 0x010012C8, VoidSymbol ] }; // w
- key <AD03> { [ 0x0100FE69, 0x0100FE70 ] }; // dead e
+ key <AD03> { [ dead_e, dead_E ] };
key <AD04> { [ 0x01001228, VoidSymbol ] }; // r
key <AD05> { [ 0x01001270, 0x01001320 ] }; // t
key <AD06> { [ 0x010012E8, VoidSymbol ] }; // y
- key <AD07> { [ 0x0100FE75, 0x0100FE76 ] }; // dead u
- key <AD08> { [ 0x0100FE71, 0x0100FE72 ] }; // dead i
- key <AD09> { [ 0x0100FE73, 0x0100FE74 ] }; // dead o
+ key <AD07> { [ dead_u, dead_U ] };
+ key <AD08> { [ dead_i, dead_I ] };
+ key <AD09> { [ dead_o, dead_O ] };
key <AD10> { [ 0x01001350, 0x01001330 ] }; // p
key <AD11> { [ 0x01001340, 0x01001338 ] }; // [
key <AD12> { [ 0x01001328, 0x01001280 ] }; // ]
- key <AC01> { [ 0x0100FE67, 0x0100FE68 ] }; // dead a
+ key <AC01> { [ dead_a, dead_A ] };
key <AC02> { [ 0x01001230, 0x01001220 ] }; // s
key <AC03> { [ 0x010012F0, 0x010012F8 ] }; // d
key <AC04> { [ 0x01001348, VoidSymbol ] }; // f
@@ -59,7 +59,7 @@ xkb_symbols "olpc" {
key <AB01> { [ 0x010012D8, 0x010012E0 ] }; // z
key <AB02> { [ 0x010012A0, 0x010012D0 ] }; // x
- key <AB03> { [ 0x01001278, 0x0100FE78 ] }; // c
+ key <AB03> { [ 0x01001278, dead_capital_schwa]};
key <AB04> { [ 0x01001238, 0x01001268 ] }; // v
key <AB05> { [ 0x01001260, VoidSymbol ] }; // b
key <AB06> { [ 0x01001290, 0x01001298 ] }; // n