From ec288c70173ef83df937ed13f5b78e4b8163df12 Mon Sep 17 00:00:00 2001 From: Hidetoshi Tajima Date: Wed, 21 May 2003 19:14:06 +0000 Subject: [PATCH] code that can check the compose table for ascending order, by Vasilis * gtk/gtkimcontextsimple.c: code that can check the compose table for ascending order, by Vasilis Vasaitis (#104862). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkimcontextsimple.c | 18 +++++++++--------- 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0fa0c5089..77fdc49a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 21 12:10:25 2003 Hidetoshi Tajima + + * gtk/gtkimcontextsimple.c: + code that can check the compose table for ascending order, + by Vasilis Vasaitis (#104862). + Wed May 21 12:52:01 2003 Owen Taylor * gtk/gtkkeyhash.[ch] (_gtk_key_hash_looku): We need diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f0fa0c5089..77fdc49a51 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed May 21 12:10:25 2003 Hidetoshi Tajima + + * gtk/gtkimcontextsimple.c: + code that can check the compose table for ascending order, + by Vasilis Vasaitis (#104862). + Wed May 21 12:52:01 2003 Owen Taylor * gtk/gtkkeyhash.[ch] (_gtk_key_hash_looku): We need diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f0fa0c5089..77fdc49a51 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed May 21 12:10:25 2003 Hidetoshi Tajima + + * gtk/gtkimcontextsimple.c: + code that can check the compose table for ascending order, + by Vasilis Vasaitis (#104862). + Wed May 21 12:52:01 2003 Owen Taylor * gtk/gtkkeyhash.[ch] (_gtk_key_hash_looku): We need diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f0fa0c5089..77fdc49a51 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed May 21 12:10:25 2003 Hidetoshi Tajima + + * gtk/gtkimcontextsimple.c: + code that can check the compose table for ascending order, + by Vasilis Vasaitis (#104862). + Wed May 21 12:52:01 2003 Owen Taylor * gtk/gtkkeyhash.[ch] (_gtk_key_hash_looku): We need diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f0fa0c5089..77fdc49a51 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed May 21 12:10:25 2003 Hidetoshi Tajima + + * gtk/gtkimcontextsimple.c: + code that can check the compose table for ascending order, + by Vasilis Vasaitis (#104862). + Wed May 21 12:52:01 2003 Owen Taylor * gtk/gtkkeyhash.[ch] (_gtk_key_hash_looku): We need diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 6976f31624..b29299063a 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -37,11 +37,11 @@ struct _GtkComposeTable * to obtain the relevant perl scripts. * * The following compose letter letter sequences confliced -* Dstroke/dstroke and ETH/eth; resolved to Dstroke (Croation, Vietnamese, Lappish), over - * ETH (Icelandic, Faroese, old English, IPA) [ D- -D d- -d ] - * Amacron/amacron and ordfeminine; resolved to ordfeminine [ _A A_ a_ _a ] - * Amacron/amacron and Atilde/atilde; resolved to atilde [ -A A- a- -a ] - * Omacron/Omacron and masculine; resolved to masculine [ _A A_ a_ _a ] + * Dstroke/dstroke and ETH/eth; resolved to Dstroke (Croation, Vietnamese, Lappish), over + * ETH (Icelandic, Faroese, old English, IPA) [ D- -D d- -d ] + * Amacron/amacron and ordfeminine; resolved to ordfeminine [ _A A_ a_ _a ] + * Amacron/amacron and Atilde/atilde; resolved to atilde [ -A A- a- -a ] + * Omacron/Omacron and masculine; resolved to masculine [ _O O_ o_ _o ] * Omacron/omacron and Otilde/atilde; resolved to otilde [ -O O- o- -o ] * * [ Amacron and Omacron are in Latin-4 (Baltic). ordfeminine and masculine are used for @@ -295,8 +295,8 @@ static const guint16 gtk_compose_seqs[] = { GDK_Multi_key, GDK_parenleft, GDK_minus, 0, 0, 0x007B, /* LEFT_CURLY_BRACKET */ GDK_Multi_key, GDK_parenleft, GDK_A, 0, 0, 0x0102, /* LATIN_CAPITAL_LETTER_A_WITH_BREVE */ GDK_Multi_key, GDK_parenleft, GDK_G, 0, 0, 0x011E, /* LATIN_CAPITAL_LETTER_G_WITH_BREVE */ - GDK_Multi_key, GDK_parenleft, GDK_c, 0, 0, 0x00A9, /* COPYRIGHT_SIGN */ GDK_Multi_key, GDK_parenleft, GDK_a, 0, 0, 0x0103, /* LATIN_SMALL_LETTER_A_WITH_BREVE */ + GDK_Multi_key, GDK_parenleft, GDK_c, 0, 0, 0x00A9, /* COPYRIGHT_SIGN */ GDK_Multi_key, GDK_parenleft, GDK_g, 0, 0, 0x011F, /* LATIN_SMALL_LETTER_G_WITH_BREVE */ GDK_Multi_key, GDK_parenleft, GDK_r, 0, 0, 0x00AE, /* REGISTERED_SIGN */ GDK_Multi_key, GDK_parenright, GDK_parenright, 0, 0, 0x005D, /* RIGHT_SQUARE_BRACKET */ @@ -473,9 +473,9 @@ static const guint16 gtk_compose_seqs[] = { GDK_Multi_key, GDK_C, GDK_comma, 0, 0, 0x00C7, /* LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */ GDK_Multi_key, GDK_C, GDK_period, 0, 0, 0x010A, /* LATIN_CAPITAL_LETTER_C_WITH_DOT_ABOVE */ GDK_Multi_key, GDK_C, GDK_slash, 0, 0, 0x00A2, /* CENT_SIGN */ + GDK_Multi_key, GDK_C, GDK_0, 0, 0, 0x00A9, /* COPYRIGHT_SIGN */ GDK_Multi_key, GDK_C, GDK_less, 0, 0, 0x010C, /* LATIN_CAPITAL_LETTER_C_WITH_CARON */ GDK_Multi_key, GDK_C, GDK_equal, 0, 0, 0x20AC, /* EURO_SIGN */ - GDK_Multi_key, GDK_C, GDK_0, 0, 0, 0x00A9, /* COPYRIGHT_SIGN */ GDK_Multi_key, GDK_C, GDK_O, 0, 0, 0x00A9, /* COPYRIGHT_SIGN */ GDK_Multi_key, GDK_C, GDK_o, 0, 0, 0x00A9, /* COPYRIGHT_SIGN */ GDK_Multi_key, GDK_C, GDK_bar, 0, 0, 0x00A2, /* CENT_SIGN */ @@ -564,7 +564,7 @@ static const guint16 gtk_compose_seqs[] = { GDK_Multi_key, GDK_T, GDK_minus, 0, 0, 0x0166, /* LATIN_CAPITAL_LETTER_T_WITH_STROKE */ GDK_Multi_key, GDK_T, GDK_period, 0, 0, 0x1E6A, /* LATIN_CAPITAL_LETTER_T_WITH_DOT_ABOVE */ GDK_Multi_key, GDK_T, GDK_slash, 0, 0, 0x0166, /* LATIN_CAPITAL_LETTER_T_WITH_STROKE */ - GDK_Multi_key, GDK_t, GDK_less, 0, 0, 0x0165, /* LATIN_SMALL_LETTER_T_WITH_CARON */ + GDK_Multi_key, GDK_T, GDK_less, 0, 0, 0x0164, /* LATIN_CAPITAL_LETTER_T_WITH_CARON */ GDK_Multi_key, GDK_T, GDK_H, 0, 0, 0x00DE, /* LATIN_CAPITAL_LETTER_THORN */ GDK_Multi_key, GDK_U, GDK_quotedbl, 0, 0, 0x00DC, /* LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS */ GDK_Multi_key, GDK_U, GDK_apostrophe, 0, 0, 0x00DA, /* LATIN_CAPITAL_LETTER_U_WITH_ACUTE */ @@ -672,8 +672,8 @@ static const guint16 gtk_compose_seqs[] = { GDK_Multi_key, GDK_e, GDK_comma, 0, 0, 0x0119, /* LATIN_SMALL_LETTER_E_WITH_OGONEK */ GDK_Multi_key, GDK_e, GDK_minus, 0, 0, 0x0113, /* LATIN_SMALL_LETTER_E_WITH_MACRON */ GDK_Multi_key, GDK_e, GDK_period, 0, 0, 0x0117, /* LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE */ - GDK_Multi_key, GDK_e, GDK_equal, 0, 0, 0x20AC, /* EURO_SIGN */ GDK_Multi_key, GDK_e, GDK_less, 0, 0, 0x011B, /* LATIN_SMALL_LETTER_E_WITH_CARON */ + GDK_Multi_key, GDK_e, GDK_equal, 0, 0, 0x20AC, /* EURO_SIGN */ GDK_Multi_key, GDK_e, GDK_greater, 0, 0, 0x00EA, /* LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX */ GDK_Multi_key, GDK_e, GDK_asciicircum, 0, 0, 0x00EA, /* LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX */ GDK_Multi_key, GDK_e, GDK_underscore, 0, 0, 0x0113, /* LATIN_SMALL_LETTER_E_WITH_MACRON */