summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--gtk/gtkimcontextsimple.c4
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ca1198aba..80397d9ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-08-30 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkimcontextsimple.c: Change the compose sequence for
+ soft hyphen to be multi_key-minus-minus-space, and add
+ compose sequences multi_key-minus-minus-period and
+ multi_key-minus-minus-minus for en dash and em dash.
+ (#172653, Christian Lohmaier)
+
* gtk/gtkentry.c (gtk_entry_draw_frame): Fix some unused
code. (#313946, Christian Persch)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ca1198aba..80397d9ff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
2005-08-30 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkimcontextsimple.c: Change the compose sequence for
+ soft hyphen to be multi_key-minus-minus-space, and add
+ compose sequences multi_key-minus-minus-period and
+ multi_key-minus-minus-minus for en dash and em dash.
+ (#172653, Christian Lohmaier)
+
* gtk/gtkentry.c (gtk_entry_draw_frame): Fix some unused
code. (#313946, Christian Persch)
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 1d444e97a..aff446367 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -391,7 +391,9 @@ static const guint16 gtk_compose_seqs[] = {
GDK_Multi_key, GDK_minus, GDK_parenright, 0, 0, 0x007D, /* RIGHT_CURLY_BRACKET */
GDK_Multi_key, GDK_minus, GDK_plus, 0, 0, 0x00B1, /* PLUSxMINUS_SIGN */
GDK_Multi_key, GDK_minus, GDK_comma, 0, 0, 0x00AC, /* NOT_SIGN */
- GDK_Multi_key, GDK_minus, GDK_minus, 0, 0, 0x00AD, /* SOFT_HYPHEN */
+ GDK_Multi_key, GDK_minus, GDK_minus, GDK_space, 0, 0x00AD, /* SOFT_HYPHEN */
+ GDK_Multi_key, GDK_minus, GDK_minus, GDK_minus, 0, 0x2014, /* EM DASH */
+ GDK_Multi_key, GDK_minus, GDK_minus, GDK_period, 0, 0x2014, /* EN DASH */
GDK_Multi_key, GDK_minus, GDK_colon, 0, 0, 0x00F7, /* DIVISION_SIGN */
GDK_Multi_key, GDK_minus, GDK_A, 0, 0, 0x00C3, /* LATIN_CAPITAL_LETTER_A_WITH_TILDE */
GDK_Multi_key, GDK_minus, GDK_D, 0, 0, 0x0110, /* LATIN_CAPITAL_LETTER_D_WITH_STROKE */