From c8cb355838ec659f8138203c312dd91d23539194 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 21 Oct 2009 16:57:51 +1000 Subject: [PATCH] Update compose sequences to what's in upstream today. Signed-off-by: Peter Hutterer --- gtk/gtkimcontextsimple.c | 2 +- gtk/gtkimcontextsimpleseqs.h | 133 +++++++++++++++++++++++++---------------- 2 files changed, 82 insertions(+), 53 deletions(-) diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 62bab7c..f36dcf5 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -61,7 +61,7 @@ struct _GtkComposeTableCompact static const GtkComposeTableCompact gtk_compose_table_compact = { gtk_compose_seqs_compact, 5, - 23, + 24, 6 }; diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h index fd0cc57..bdb64b3 100644 --- a/gtk/gtkimcontextsimpleseqs.h +++ b/gtk/gtkimcontextsimpleseqs.h @@ -18,10 +18,9 @@ */ /* - * File auto-generated from script found at gtk/compose-parse.py, with the --gtk parameter, + * File auto-generated from script found at http://bugzilla.gnome.org/show_bug.cgi?id=321896 * using the input files * Input : http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre - * Input : http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtk-compose-lookaside.txt * Input : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt * Input : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt * @@ -83,14 +82,15 @@ GDK_dead_doubleacute, 2053, 2063, 2063, 2063, 2063, GDK_dead_caron, 2063, 2089, 2089, 2097, 2097, GDK_dead_cedilla, 2097, 2111, 2111, 2111, 2111, GDK_dead_ogonek, 2111, 2121, 2121, 2121, 2121, -GDK_dead_iota, 2121, 2143, 2242, 2674, 3334, -GDK_dead_voiced_sound, 3334, 3380, 3380, 3380, 3380, -GDK_dead_semivoiced_sound, 3380, 3390, 3390, 3390, 3390, -GDK_dead_belowdot, 3390, 3400, 3400, 3416, 3416, -GDK_dead_hook, 3416, 3494, 3494, 3550, 3550, -GDK_dead_psili, 3550, 3578, 3578, 3578, 3578, -GDK_dead_dasia, 3578, 3610, 3610, 3610, 3610, -GDK_Multi_key, 3610, 3610, 9589, 13297, 15157, +GDK_dead_iota, 2121, 2143, 2242, 2674, 3334, +GDK_dead_voiced_sound, 3334, 3380, 3380, 3380, 3380, +GDK_dead_semivoiced_sound, 3380, 3390, 3390, 3390, 3390, +GDK_dead_belowdot, 3422, 3438, 3438, 3454, 3454, +GDK_dead_hook, 3454, 3532, 3532, 3588, 3588, +GDK_dead_horn, 3588, 3598, 3598, 3598, 3598, +GDK_dead_psili, 3598, 3626, 3626, 3626, 3626, +GDK_dead_dasia, 3626, 3658, 3658, 3658, 3658, +GDK_Multi_key, 3610, 3610, 9589, 13297, 15157, GDK_space, 0x002F, GDK_2, 0x01BB, GDK_A, 0x023A, @@ -143,6 +143,7 @@ GDK_Greek_upsilon, 0x03B0, GDK_space, 0x0060, GDK_V, 0x01DB, GDK_v, 0x01DC, +GDK_nobreakspace, 0x0300, GDK_Abreve, 0x1EB0, GDK_abreve, 0x1EB1, GDK_Emacron, 0x1E14, @@ -255,6 +256,7 @@ GDK_Multi_key, GDK_macron, GDK_o, 0x1E51, GDK_space, 0x0027, GDK_V, 0x01D7, GDK_v, 0x01D8, +GDK_nobreakspace, 0x0301, GDK_Abreve, 0x1EAE, GDK_abreve, 0x1EAF, GDK_Emacron, 0x1E16, @@ -510,6 +512,7 @@ GDK_space, 0x007E, GDK_less, 0x2272, GDK_equal, 0x2243, GDK_greater, 0x2273, +GDK_nobreakspace, 0x0303, GDK_Oacute, 0x1E4C, GDK_Odiaeresis, 0x1E4E, GDK_Uacute, 0x1E78, @@ -769,6 +772,16 @@ GDK_parenleft, 0x208D, GDK_parenright, 0x208E, GDK_plus, 0x208A, GDK_minus, 0x208B, +GDK_0, 0x2080, +GDK_1, 0x2081, +GDK_2, 0x2082, +GDK_3, 0x2083, +GDK_4, 0x2084, +GDK_5, 0x2085, +GDK_6, 0x2086, +GDK_7, 0x2087, +GDK_8, 0x2088, +GDK_9, 0x2088, GDK_equal, 0x208C, GDK_V, 0x01D9, GDK_v, 0x01DA, @@ -1103,11 +1116,14 @@ GDK_kana_HI, 0x30D4, GDK_kana_FU, 0x30D7, GDK_kana_HE, 0x30DA, GDK_kana_HO, 0x30DD, +GDK_space, 0x0323, GDK_plus, 0x2A25, GDK_minus, 0x2A2A, GDK_equal, 0x2A66, +GDK_nobreakspace, 0x0323, GDK_Abreve, 0x1EB6, GDK_abreve, 0x1EB7, +GDK_dead_belowdot, 0x0323, GDK_Multi_key, GDK_plus, GDK_O, 0x1EE2, GDK_Multi_key, GDK_plus, GDK_U, 0x1EF0, GDK_Multi_key, GDK_plus, GDK_o, 0x1EE3, @@ -1165,6 +1181,11 @@ GDK_Multi_key, GDK_asciicircum, GDK_e, 0x1EC3, GDK_Multi_key, GDK_asciicircum, GDK_o, 0x1ED5, GDK_Multi_key, GDK_b, GDK_A, 0x1EB2, GDK_Multi_key, GDK_b, GDK_a, 0x1EB3, +GDK_space, 0x031B, +GDK_nobreakspace, 0x031B, +GDK_Utilde, 0x1EEE, +GDK_utilde, 0x1EEF, +GDK_dead_horn, 0x031B, GDK_Greek_ALPHA, 0x1F08, GDK_Greek_EPSILON, 0x1F18, GDK_Greek_ETA, 0x1F28, @@ -1365,13 +1386,13 @@ GDK_apostrophe, GDK_AE, 0x01FC, GDK_apostrophe, GDK_Ccedilla, 0x1E08, GDK_apostrophe, GDK_Ecircumflex, 0x1EBE, GDK_apostrophe, GDK_Idiaeresis, 0x1E2E, -GDK_apostrophe, GDK_Ocircumflex, 0x1ED0, -GDK_apostrophe, GDK_Otilde, 0x1E4C, -GDK_apostrophe, GDK_Ooblique, 0x01FE, -GDK_apostrophe, 0x00DC, 0x01D7, -GDK_apostrophe, GDK_acircumflex, 0x1EA5, -GDK_apostrophe, GDK_aring, 0x01FB, -GDK_apostrophe, GDK_ae, 0x01FD, +GDK_apostrophe, GDK_Ocircumflex, 0x1ED0, +GDK_apostrophe, GDK_Otilde, 0x1E4C, +GDK_apostrophe, GDK_Ooblique, 0x01FE, +GDK_apostrophe, GDK_Udiaeresis, 0x01D7, +GDK_apostrophe, GDK_acircumflex, 0x1EA5, +GDK_apostrophe, GDK_aring, 0x01FB, +GDK_apostrophe, GDK_ae, 0x01FD, GDK_apostrophe, GDK_ccedilla, 0x1E09, GDK_apostrophe, GDK_ecircumflex, 0x1EBF, GDK_apostrophe, GDK_idiaeresis, 0x1E2F, @@ -1529,6 +1550,7 @@ GDK_minus, GDK_parenright, 0x007D, GDK_minus, GDK_plus, 0x00B1, GDK_minus, GDK_comma, 0x00AC, GDK_minus, GDK_colon, 0x00F7, +GDK_minus, GDK_greater, 0x2192, GDK_minus, GDK_A, 0x00C3, GDK_minus, GDK_D, 0x0110, GDK_minus, GDK_E, 0x0112, @@ -1603,6 +1625,7 @@ GDK_period, 0x1E62, 0x1E68, 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_D, 0x0110, GDK_slash, GDK_G, 0x01E4, @@ -1682,8 +1705,11 @@ GDK_semicolon, GDK_u, 0x0173, GDK_less, GDK_space, 0x02C7, GDK_less, GDK_quotedbl, 0x201C, GDK_less, GDK_apostrophe, 0x2018, +GDK_less, GDK_minus, 0x2190, GDK_less, GDK_slash, 0x005C, +GDK_less, GDK_3, 0x2665, GDK_less, GDK_less, 0x00AB, +GDK_less, GDK_equal, 0x2264, GDK_less, GDK_C, 0x010C, GDK_less, GDK_D, 0x010E, GDK_less, GDK_E, 0x011A, @@ -1703,6 +1729,7 @@ GDK_less, GDK_s, 0x0161, GDK_less, GDK_t, 0x0165, GDK_less, GDK_z, 0x017E, GDK_less, 0x0338, 0x226E, +GDK_equal, GDK_slash, 0x2260, GDK_equal, GDK_C, 0x20AC, GDK_equal, GDK_E, 0x20AC, GDK_equal, GDK_L, 0x00A3, @@ -1725,6 +1752,7 @@ GDK_equal, GDK_Cyrillic_U, 0x04F2, GDK_greater, GDK_space, 0x005E, GDK_greater, GDK_quotedbl, 0x201D, GDK_greater, GDK_apostrophe, 0x2019, +GDK_greater, GDK_equal, 0x2265, GDK_greater, GDK_greater, 0x00BB, GDK_greater, GDK_A, 0x00C2, GDK_greater, GDK_E, 0x00CA, @@ -2065,13 +2093,13 @@ GDK_underscore, GDK_o, 0x00BA, GDK_underscore, GDK_u, 0x016B, GDK_underscore, GDK_y, 0x0233, GDK_underscore, GDK_Adiaeresis, 0x01DE, -GDK_underscore, GDK_AE, 0x01E2, -GDK_underscore, GDK_Otilde, 0x022C, -GDK_underscore, GDK_Odiaeresis, 0x022A, -GDK_underscore, 0x00DC, 0x01D5, -GDK_underscore, GDK_adiaeresis, 0x01DF, -GDK_underscore, GDK_ae, 0x01E3, -GDK_underscore, GDK_otilde, 0x022D, +GDK_underscore, GDK_AE, 0x01E2, +GDK_underscore, GDK_Otilde, 0x022C, +GDK_underscore, GDK_Odiaeresis, 0x022A, +GDK_underscore, GDK_Udiaeresis, 0x01D5, +GDK_underscore, GDK_adiaeresis, 0x01DF, +GDK_underscore, GDK_ae, 0x01E3, +GDK_underscore, GDK_otilde, 0x022D, GDK_underscore, GDK_odiaeresis, 0x022B, GDK_underscore, GDK_udiaeresis, 0x01D6, GDK_underscore, 0x01EA, 0x01EC, @@ -2125,13 +2153,13 @@ GDK_grave, GDK_o, 0x00F2, GDK_grave, GDK_u, 0x00F9, GDK_grave, GDK_w, 0x1E81, GDK_grave, GDK_y, 0x1EF3, -GDK_grave, GDK_Acircumflex, 0x1EA6, -GDK_grave, GDK_Ecircumflex, 0x1EC0, -GDK_grave, GDK_Ocircumflex, 0x1ED2, -GDK_grave, 0x00DC, 0x01DB, -GDK_grave, GDK_acircumflex, 0x1EA7, -GDK_grave, GDK_ecircumflex, 0x1EC1, -GDK_grave, GDK_ocircumflex, 0x1ED3, +GDK_grave, GDK_Acircumflex, 0x1EA6, +GDK_grave, GDK_Ecircumflex, 0x1EC0, +GDK_grave, GDK_Ocircumflex, 0x1ED2, +GDK_grave, GDK_Udiaeresis, 0x01DB, +GDK_grave, GDK_acircumflex, 0x1EA7, +GDK_grave, GDK_ecircumflex, 0x1EC1, +GDK_grave, GDK_ocircumflex, 0x1ED3, GDK_grave, GDK_udiaeresis, 0x01DC, GDK_grave, GDK_Ohorn, 0x1EDC, GDK_grave, GDK_ohorn, 0x1EDD, @@ -2276,13 +2304,13 @@ GDK_c, GDK_o, 0x00A9, GDK_c, GDK_r, 0x0159, GDK_c, GDK_s, 0x0161, GDK_c, GDK_t, 0x0165, -GDK_c, GDK_u, 0x01D4, -GDK_c, GDK_z, 0x017E, -GDK_c, GDK_bar, 0x00A2, -GDK_c, 0x00DC, 0x01D9, -GDK_c, GDK_udiaeresis, 0x01DA, -GDK_c, 0x01B7, 0x01EE, -GDK_c, 0x0292, 0x01EF, +GDK_c, GDK_u, 0x01D4, +GDK_c, GDK_z, 0x017E, +GDK_c, GDK_bar, 0x00A2, +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_period, 0x1E0B, GDK_d, GDK_less, 0x010F, @@ -2514,13 +2542,13 @@ GDK_macron, GDK_o, 0x014D, GDK_macron, GDK_u, 0x016B, GDK_macron, GDK_y, 0x0233, GDK_macron, GDK_Adiaeresis, 0x01DE, -GDK_macron, GDK_AE, 0x01E2, -GDK_macron, GDK_Otilde, 0x022C, -GDK_macron, GDK_Odiaeresis, 0x022A, -GDK_macron, 0x00DC, 0x01D5, -GDK_macron, GDK_adiaeresis, 0x01DF, -GDK_macron, GDK_ae, 0x01E3, -GDK_macron, GDK_otilde, 0x022D, +GDK_macron, GDK_AE, 0x01E2, +GDK_macron, GDK_Otilde, 0x022C, +GDK_macron, GDK_Odiaeresis, 0x022A, +GDK_macron, GDK_Udiaeresis, 0x01D5, +GDK_macron, GDK_adiaeresis, 0x01DF, +GDK_macron, GDK_ae, 0x01E3, +GDK_macron, GDK_otilde, 0x022D, GDK_macron, GDK_odiaeresis, 0x022B, GDK_macron, GDK_udiaeresis, 0x01D6, GDK_macron, 0x01EA, 0x01EC, @@ -2583,13 +2611,13 @@ GDK_acute, GDK_AE, 0x01FC, GDK_acute, GDK_Ccedilla, 0x1E08, GDK_acute, GDK_Ecircumflex, 0x1EBE, GDK_acute, GDK_Idiaeresis, 0x1E2E, -GDK_acute, GDK_Ocircumflex, 0x1ED0, -GDK_acute, GDK_Otilde, 0x1E4C, -GDK_acute, GDK_Ooblique, 0x01FE, -GDK_acute, 0x00DC, 0x01D7, -GDK_acute, GDK_acircumflex, 0x1EA5, -GDK_acute, GDK_aring, 0x01FB, -GDK_acute, GDK_ae, 0x01FD, +GDK_acute, GDK_Ocircumflex, 0x1ED0, +GDK_acute, GDK_Otilde, 0x1E4C, +GDK_acute, GDK_Ooblique, 0x01FE, +GDK_acute, GDK_Udiaeresis, 0x01D7, +GDK_acute, GDK_acircumflex, 0x1EA5, +GDK_acute, GDK_aring, 0x01FB, +GDK_acute, GDK_ae, 0x01FD, GDK_acute, GDK_ccedilla, 0x1E09, GDK_acute, GDK_ecircumflex, 0x1EBF, GDK_acute, GDK_idiaeresis, 0x1E2F, @@ -4320,6 +4348,7 @@ GDK_parenleft, GDK_KP_4, GDK_KP_7, GDK_parenright, 0x32BC, GDK_parenleft, GDK_KP_4, GDK_KP_8, GDK_parenright, 0x32BD, GDK_parenleft, GDK_KP_4, GDK_KP_9, GDK_parenright, 0x32BE, GDK_parenleft, GDK_KP_5, GDK_KP_0, GDK_parenright, 0x32BF, +GDK_C, GDK_C, GDK_C, GDK_P, 0x262D, GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ALPHA, 0x1F8D, GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ETA, 0x1F9D, GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_OMEGA, 0x1FAD, -- 1.6.5.rc2