From 7b7f8f1e5da0cd4e0d9460be69b5c025372038d6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 9 Mar 2010 02:23:39 -0500 Subject: [PATCH] Remove conflicting legacy compose sequences in favour of X.org sequences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Jeroen Hoek. See bug 557420 for a prolonged discussion. Quick summary of the removed sequences: <0> Consistency. [1..9] gives the superscript digit, legacy sequence for zero is inconsistent. Consistency. [:letter:] already gives vowel plus caron, legacy sequence for c is inconsistent. Consistency. [:letter:] is for letter with cedilla, [:letter:] is for letter with ogolek Unintuitive. ¢ is visually a vertical bar through a lowercase c, not a slash through an uppercase C. ₡ has no alternatives, whilst ¢ can be typed as . đ can be input through . is used for ₫. Unintuitive. ₤ has two dashes, £ one; therefore L + = > ₤, and L + - = £. Consistency. [:letter:] is used for letter with dot below. § can be input using . Might need an alternative for ˙, but … (upstream) has no alternative either. Consistency. [:vowel:] gives vowel with macron for ȳ ū ī ē too. Redundant. In upstream as is. --- gtk/gtk-compose-lookaside.txt | 18 ------------------ gtk/gtkimcontextsimpleseqs.h | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/gtk/gtk-compose-lookaside.txt b/gtk/gtk-compose-lookaside.txt index df0367b407..3f3b23c69c 100644 --- a/gtk/gtk-compose-lookaside.txt +++ b/gtk/gtk-compose-lookaside.txt @@ -24,12 +24,9 @@ : "Ṫ" U1E6A : "ṫ" U1E6B : "ė" U0117 - : "¢" U00A2 - : "¢" U00A2 : "¢" U00A2 : "¢" U00A2 : "£" U00A3 - : "£" U00A3 : "£" U00A3 : "£" U00A3 : "£" U00A3 @@ -50,8 +47,6 @@ : "¥" U00A5 : "¥" U00A5 : "¥" U00A5 - : "§" U00A7 - : "§" U00A7 <0> : "§" U00A7 <0> : "§" U00A7 : "§" U00A7 @@ -68,11 +63,7 @@ : "©" U00A9 : "©" U00A9 <0> : "©" U00A9 - : "©" U00A9 - : "©" U00A9 : "ª" U00AA - : "ª" U00AA - : "ª" U00AA : "ª" U00AA : "Ç" U00C7 : "­" U00AD @@ -86,7 +77,6 @@ <0> : "°" U00B0 <0> : "°" U00B0 <0> : "°" U00B0 - <0> : "°" U00B0 : "±" U00B1 <2> : "²" U00B2 <2> : "²" U00B2 @@ -114,8 +104,6 @@ <1> : "¹" U00B9 <1> : "¹" U00B9 : "º" U00BA - : "º" U00BA - : "º" U00BA : "º" U00BA : "À" U00C0 : "Á" U00C1 @@ -267,7 +255,6 @@ : "Đ" U0110 : "Đ" U0110 : "đ" U0111 - : "đ" U0111 : "Ē" U0112 : "Ē" U0112 : "Ē" U0112 @@ -275,10 +262,7 @@ : "ē" U0113 : "ē" U0113 : "Ė" U0116 - : "˙" U02D9 - : "Ę" U0118 : "Ę" U0118 - : "ę" U0119 : "ę" U0119 : "Ě" U011A : "Ě" U011A @@ -330,8 +314,6 @@ : "Ň" U0147 : "ň" U0148 : "ň" U0148 - : "Œ" U0152 - : "œ" U0153 : "Ŕ" U0154 : "ŕ" U0155 : "Ŗ" U0156 diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h index 09c259076d..f804815f41 100644 --- a/gtk/gtkimcontextsimpleseqs.h +++ b/gtk/gtkimcontextsimpleseqs.h @@ -1226,7 +1226,7 @@ GDK_exclam, GDK_N, 0x1E46, GDK_exclam, GDK_O, 0x1ECC, GDK_exclam, GDK_P, 0x00B6, GDK_exclam, GDK_R, 0x1E5A, -GDK_exclam, GDK_S, 0x00A7, +GDK_exclam, GDK_S, 0x1E62, GDK_exclam, GDK_T, 0x1E6C, GDK_exclam, GDK_U, 0x1EE4, GDK_exclam, GDK_V, 0x1E7E, @@ -1247,7 +1247,7 @@ GDK_exclam, GDK_n, 0x1E47, GDK_exclam, GDK_o, 0x1ECD, GDK_exclam, GDK_p, 0x00B6, GDK_exclam, GDK_r, 0x1E5B, -GDK_exclam, GDK_s, 0x00A7, +GDK_exclam, GDK_s, 0x1E63, GDK_exclam, GDK_t, 0x1E6D, GDK_exclam, GDK_u, 0x1EE5, GDK_exclam, GDK_v, 0x1E7F, @@ -1495,7 +1495,7 @@ GDK_comma, GDK_minus, 0x00AC, GDK_comma, GDK_A, 0x0104, GDK_comma, GDK_C, 0x00C7, GDK_comma, GDK_D, 0x1E10, -GDK_comma, GDK_E, 0x0118, +GDK_comma, GDK_E, 0x0228, GDK_comma, GDK_G, 0x0122, GDK_comma, GDK_H, 0x1E28, GDK_comma, GDK_I, 0x012E, @@ -1509,7 +1509,7 @@ GDK_comma, GDK_U, 0x0172, GDK_comma, GDK_a, 0x0105, GDK_comma, GDK_c, 0x00E7, GDK_comma, GDK_d, 0x1E11, -GDK_comma, GDK_e, 0x0119, +GDK_comma, GDK_e, 0x0229, GDK_comma, GDK_g, 0x0123, GDK_comma, GDK_h, 0x1E29, GDK_comma, GDK_i, 0x012F, @@ -1547,7 +1547,7 @@ GDK_minus, GDK_o, 0x014D, GDK_minus, GDK_u, 0x016B, GDK_minus, GDK_y, 0x00A5, GDK_period, GDK_minus, 0x00B7, -GDK_period, GDK_period, 0x02D9, +GDK_period, GDK_period, 0x2026, GDK_period, GDK_less, 0x2039, GDK_period, GDK_equal, 0x2022, GDK_period, GDK_greater, 0x203A, @@ -1602,7 +1602,7 @@ GDK_period, 0x1E63, 0x1E69, GDK_slash, GDK_slash, 0x005C, GDK_slash, GDK_less, 0x005C, GDK_slash, GDK_equal, 0x2260, -GDK_slash, GDK_C, 0x00A2, +GDK_slash, GDK_C, 0x20A1, GDK_slash, GDK_D, 0x0110, GDK_slash, GDK_G, 0x01E4, GDK_slash, GDK_H, 0x0126, @@ -1710,7 +1710,7 @@ GDK_less, 0x0338, 0x226E, GDK_equal, GDK_slash, 0x2260, GDK_equal, GDK_C, 0x20AC, GDK_equal, GDK_E, 0x20AC, -GDK_equal, GDK_L, 0x00A3, +GDK_equal, GDK_L, 0x20A4, GDK_equal, GDK_N, 0x20A6, GDK_equal, GDK_O, 0x0150, GDK_equal, GDK_U, 0x0170, @@ -1785,7 +1785,7 @@ GDK_B, GDK_period, 0x1E02, GDK_C, GDK_apostrophe, 0x0106, GDK_C, GDK_comma, 0x00C7, GDK_C, GDK_period, 0x010A, -GDK_C, GDK_slash, 0x00A2, +GDK_C, GDK_slash, 0x20A1, GDK_C, GDK_0, 0x00A9, GDK_C, GDK_less, 0x010C, GDK_C, GDK_equal, 0x20AC, @@ -1964,7 +1964,7 @@ GDK_asciicircum, GDK_plus, 0x207A, GDK_asciicircum, GDK_minus, 0x00AF, GDK_asciicircum, GDK_period, 0x00B7, GDK_asciicircum, GDK_slash, 0x007C, -GDK_asciicircum, GDK_0, 0x00B0, +GDK_asciicircum, GDK_0, 0x2070, GDK_asciicircum, GDK_1, 0x00B9, GDK_asciicircum, GDK_2, 0x00B2, GDK_asciicircum, GDK_3, 0x00B3, @@ -2050,20 +2050,20 @@ GDK_underscore, GDK_7, 0x2087, GDK_underscore, GDK_8, 0x2088, GDK_underscore, GDK_9, 0x2089, GDK_underscore, GDK_equal, 0x208C, -GDK_underscore, GDK_A, 0x00AA, +GDK_underscore, GDK_A, 0x0100, GDK_underscore, GDK_E, 0x0112, GDK_underscore, GDK_G, 0x1E20, GDK_underscore, GDK_I, 0x012A, -GDK_underscore, GDK_O, 0x00BA, +GDK_underscore, GDK_O, 0x014C, GDK_underscore, GDK_U, 0x016A, GDK_underscore, GDK_Y, 0x0232, GDK_underscore, GDK_asciicircum, 0x00AF, GDK_underscore, GDK_underscore, 0x00AF, -GDK_underscore, GDK_a, 0x00AA, +GDK_underscore, GDK_a, 0x0101, GDK_underscore, GDK_e, 0x0113, GDK_underscore, GDK_g, 0x1E21, GDK_underscore, GDK_i, 0x012B, -GDK_underscore, GDK_o, 0x00BA, +GDK_underscore, GDK_o, 0x014D, GDK_underscore, GDK_u, 0x016B, GDK_underscore, GDK_y, 0x0233, GDK_underscore, GDK_Adiaeresis, 0x01DE, @@ -2253,7 +2253,7 @@ GDK_c, GDK_I, 0x01CF, GDK_c, GDK_K, 0x01E8, GDK_c, GDK_L, 0x013D, GDK_c, GDK_N, 0x0147, -GDK_c, GDK_O, 0x00A9, +GDK_c, GDK_O, 0x01D1, GDK_c, GDK_R, 0x0158, GDK_c, GDK_S, 0x0160, GDK_c, GDK_T, 0x0164, @@ -2270,7 +2270,7 @@ GDK_c, GDK_j, 0x01F0, GDK_c, GDK_k, 0x01E9, GDK_c, GDK_l, 0x013E, GDK_c, GDK_n, 0x0148, -GDK_c, GDK_o, 0x00A9, +GDK_c, GDK_o, 0x01D2, GDK_c, GDK_r, 0x0159, GDK_c, GDK_s, 0x0161, GDK_c, GDK_t, 0x0165, @@ -2281,7 +2281,7 @@ GDK_c, GDK_Udiaeresis, 0x01D9, GDK_c, GDK_udiaeresis, 0x01DA, GDK_c, 0x01B7, 0x01EE, GDK_c, 0x0292, 0x01EF, -GDK_d, GDK_minus, 0x0111, +GDK_d, GDK_minus, 0x20AB, GDK_d, GDK_period, 0x1E0B, GDK_d, GDK_less, 0x010F, GDK_d, GDK_h, 0x00F0,