GtkIMContextSimple: Update compose table

This adds Multi_key + f + i, as well as other sequences,
mainly Greek.

https://bugzilla.gnome.org/show_bug.cgi?id=710510

3 files changed, 297 insertions, 45 deletions

diff --git a/gtk/compose-parse.py b/gtk/compose-parse.py
index 493c488733..9bd3c2c44e 100755
--- a/gtk/compose-parse.py
+++ b/gtk/compose-parse.py
@@ -21,7 +21,7 @@ import sys
 import getopt
 
 # We grab files off the web, left and right.
-URL_COMPOSE = 'http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre'
+URL_COMPOSE = 'http://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre'
 URL_KEYSYMSTXT = "http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt"
 URL_GDKKEYSYMSH = "http://git.gnome.org/browse/gtk%2B/plain/gdk/gdkkeysyms.h"
 URL_UNICODEDATATXT = 'http://www.unicode.org/Public/6.0.0/ucd/UnicodeData.txt'
@@ -52,13 +52,13 @@ headerfile_start = """/* GTK - The GIMP Tool Kit
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see see <http://www.gnu.org/licenses/>.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * 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://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre
  *  Input   : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
  *  Input   : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
  *
@@ -375,6 +375,7 @@ def process_keysymstxt():
         keysymdb['ninesubscript'] = 0x2089
         keysymdb['dead_doublegrave'] = 0x030F
         keysymdb['dead_invertedbreve'] = 0x0311
+        keysymdb['dead_greek'] = 0xfe8c
 
 	return keysymdb
 
@@ -499,18 +500,18 @@ for line in xorg_compose_sequences_raw:
 		continue
 
 	#line = line[:-1]
-	components = split(':', line)
+	components = split(':', line, 1)
 	if len(components) != 2:
 		print "Invalid line %(linenum_compose)d in %(filename)s: No sequence\
 		/value pair found" % { "linenum_compose": linenum_compose, "filename": filename_compose }
 		exit(-1)
-	(seq, val ) = split(':', line)
+	(seq, val ) = split(':', line, 1)
 	seq = seq.strip()
 	val = val.strip()
 	raw_sequence = findall('\w+', seq)
 	values = split('\s+', val)
 	unichar_temp = split('"', values[0])
-	unichar = unichar_temp[1]
+	unichar_utf8 = unichar_temp[1]
 	if len(values) == 1:
 		continue
 	codepointstr = values[1]
@@ -527,10 +528,8 @@ for line in xorg_compose_sequences_raw:
 			#print raw_sequence, codepointstr
 		codepoint = keysymunicodedatabase[codepointstr]
 	else:
-		print
-		print "Invalid codepoint at line %(linenum_compose)d in %(filename)s:\
-		 %(line)s" % { "linenum_compose": linenum_compose, "filename": filename_compose, "line": line }
-		exit(-1)
+		unichar = unicode(unichar_utf8, 'utf-8')
+		codepoint = ord(unichar)
 	sequence = rename_combining(raw_sequence)
 	reject_this = False
 	for i in sequence:
@@ -773,6 +772,16 @@ def convert_UnotationToHex(arg):
 def addprefix_GDK(arg):
 	if match('^0x', arg):
 		return '%(arg)s, ' % { 'arg': arg }
+	elif match('^U[0-9A-F][0-9A-F][0-9A-F][0-9A-F]$', arg.upper()):
+                keysym = ''
+                for k, c in keysymunicodedatabase.items():
+                    if c == keysymvalue(arg):
+                        keysym = k
+                        break
+                if keysym != '':
+		    return 'GDK_KEY_%(arg)s, ' % { 'arg': keysym }
+                else:
+		    return '0x%(arg)04X, ' % { 'arg': keysymvalue(arg) }
 	else:
 		return 'GDK_KEY_%(arg)s, ' % { 'arg': arg }
 
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 0c293ffd53..8f291c66c1 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -80,7 +80,7 @@ struct _GtkComposeTableCompact
 static const GtkComposeTableCompact gtk_compose_table_compact = {
   gtk_compose_seqs_compact,
   5,
-  24,
+  25,
   6
 };
 
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index 322d977637..be5cd5f25a 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -18,7 +18,7 @@
 /*
  * 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://cgit.freedesktop.org/xorg/lib/libX11/plain/nls/en_US.UTF-8/Compose.pre
  *  Input   : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
  *  Input   : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
  *
@@ -65,30 +65,31 @@
  */
 
 static const guint16 gtk_compose_seqs_compact[] = {
-GDK_KEY_dead_stroke, 144, 232, 241, 241, 241, 
-GDK_KEY_Greek_accentdieresis, 241, 245, 245, 245, 245, 
-GDK_KEY_dead_grave, 245, 307, 394, 606, 606, 
-GDK_KEY_dead_acute, 606, 670, 766, 1042, 1042, 
-GDK_KEY_dead_circumflex, 1042, 1166, 1166, 1366, 1366, 
-GDK_KEY_dead_tilde, 1366, 1450, 1513, 1653, 1653, 
-GDK_KEY_dead_macron, 1653, 1699, 1699, 1771, 1771, 
-GDK_KEY_dead_breve, 1771, 1821, 1821, 1845, 1845, 
-GDK_KEY_dead_abovedot, 1845, 1875, 1878, 1910, 1910, 
-GDK_KEY_dead_diaeresis, 1910, 1998, 2007, 2031, 2031, 
-GDK_KEY_dead_abovering, 2031, 2041, 2041, 2041, 2041, 
-GDK_KEY_dead_doubleacute, 2041, 2051, 2051, 2051, 2051, 
-GDK_KEY_dead_caron, 2051, 2093, 2093, 2101, 2101, 
-GDK_KEY_dead_cedilla, 2101, 2113, 2113, 2113, 2113, 
-GDK_KEY_dead_ogonek, 2113, 2123, 2123, 2123, 2123, 
-GDK_KEY_dead_iota, 2123, 2145, 2244, 2676, 3336, 
-GDK_KEY_dead_voiced_sound, 3336, 3382, 3382, 3382, 3382, 
-GDK_KEY_dead_semivoiced_sound, 3382, 3392, 3392, 3392, 3392, 
-GDK_KEY_dead_belowdot, 3392, 3408, 3408, 3424, 3424, 
-GDK_KEY_dead_hook, 3424, 3500, 3500, 3556, 3556, 
-GDK_KEY_dead_horn, 3556, 3566, 3566, 3566, 3566, 
-GDK_KEY_dead_psili, 3566, 3594, 3594, 3594, 3594, 
-GDK_KEY_dead_dasia, 3594, 3626, 3626, 3626, 3626, 
-GDK_KEY_Multi_key, 3626, 3626, 9566, 13274, 15139, 
+GDK_KEY_dead_stroke, 150, 238, 250, 250, 250, 
+GDK_KEY_Greek_accentdieresis, 250, 254, 254, 254, 254, 
+GDK_KEY_dead_grave, 254, 316, 403, 615, 615, 
+GDK_KEY_dead_acute, 615, 679, 775, 1051, 1051, 
+GDK_KEY_dead_circumflex, 1051, 1175, 1175, 1375, 1375, 
+GDK_KEY_dead_tilde, 1375, 1459, 1522, 1662, 1662, 
+GDK_KEY_dead_macron, 1662, 1708, 1726, 1798, 1798, 
+GDK_KEY_dead_breve, 1798, 1848, 1848, 1872, 1872, 
+GDK_KEY_dead_abovedot, 1872, 1902, 1905, 1941, 1941, 
+GDK_KEY_dead_diaeresis, 1941, 2029, 2038, 2062, 2062, 
+GDK_KEY_dead_abovering, 2062, 2072, 2072, 2072, 2072, 
+GDK_KEY_dead_doubleacute, 2072, 2082, 2082, 2082, 2082, 
+GDK_KEY_dead_caron, 2082, 2124, 2124, 2132, 2132, 
+GDK_KEY_dead_cedilla, 2132, 2144, 2144, 2144, 2144, 
+GDK_KEY_dead_ogonek, 2144, 2154, 2154, 2154, 2154, 
+GDK_KEY_dead_iota, 2154, 2176, 2275, 2707, 3367, 
+GDK_KEY_dead_voiced_sound, 3367, 3413, 3413, 3413, 3413, 
+GDK_KEY_dead_semivoiced_sound, 3413, 3423, 3423, 3423, 3423, 
+GDK_KEY_dead_belowdot, 3423, 3439, 3439, 3455, 3455, 
+GDK_KEY_dead_hook, 3455, 3533, 3536, 3592, 3592, 
+GDK_KEY_dead_horn, 3592, 3602, 3602, 3602, 3602, 
+GDK_KEY_dead_psili, 3602, 3630, 3630, 3630, 3630, 
+GDK_KEY_dead_dasia, 3630, 3662, 3662, 3662, 3662, 
+GDK_KEY_dead_greek, 3662, 3764, 3788, 3788, 3788, 
+GDK_KEY_Multi_key, 3788, 3788, 10241, 13949, 15824, 
 GDK_KEY_space, 0x002F, 
 GDK_KEY_2, 0x01BB, 
 GDK_KEY_A, 0x023A, 
@@ -136,6 +137,7 @@ GDK_KEY_greaterthanequal, 0x2271,
 GDK_KEY_dead_acute, GDK_KEY_O, 0x01FE, 
 GDK_KEY_dead_acute, GDK_KEY_o, 0x01FF, 
 GDK_KEY_dead_abovedot, GDK_KEY_j, 0x025F, 
+GDK_KEY_dead_greek, GDK_KEY_r, 0x03FC, 
 GDK_KEY_Greek_iota, 0x0390, 
 GDK_KEY_Greek_upsilon, 0x03B0, 
 GDK_KEY_space, 0x0060, 
@@ -617,6 +619,12 @@ GDK_KEY_Greek_alpha, 0x1FB1,
 GDK_KEY_Greek_iota, 0x1FD1, 
 GDK_KEY_Greek_upsilon, 0x1FE1, 
 GDK_KEY_dead_macron, 0x00AF, 
+GDK_KEY_dead_greek, GDK_KEY_A, 0x1FB9, 
+GDK_KEY_dead_greek, GDK_KEY_I, 0x1FD9, 
+GDK_KEY_dead_greek, GDK_KEY_U, 0x1FE9, 
+GDK_KEY_dead_greek, GDK_KEY_a, 0x1FB1, 
+GDK_KEY_dead_greek, GDK_KEY_i, 0x1FD1, 
+GDK_KEY_dead_greek, GDK_KEY_u, 0x1FE1, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_L, 0x1E38, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_R, 0x1E5C, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_l, 0x1E39, 
@@ -688,6 +696,7 @@ GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_S, 0x1E64,
 GDK_KEY_Multi_key, GDK_KEY_apostrophe, GDK_KEY_s, 0x1E65, 
 GDK_KEY_Multi_key, GDK_KEY_c, GDK_KEY_S, 0x1E66, 
 GDK_KEY_Multi_key, GDK_KEY_c, GDK_KEY_s, 0x1E67, 
+GDK_KEY_Multi_key, GDK_KEY_f, GDK_KEY_s, 0x1E9B, 
 GDK_KEY_Multi_key, GDK_KEY_acute, GDK_KEY_S, 0x1E64, 
 GDK_KEY_Multi_key, GDK_KEY_acute, GDK_KEY_s, 0x1E65, 
 GDK_KEY_space, 0x0022, 
@@ -1136,6 +1145,7 @@ GDK_KEY_m, 0x0271,
 GDK_KEY_n, 0x0272, 
 GDK_KEY_p, 0x01A5, 
 GDK_KEY_q, 0x02A0, 
+GDK_KEY_r, 0x027C, 
 GDK_KEY_s, 0x0282, 
 GDK_KEY_t, 0x01AD, 
 GDK_KEY_v, 0x028B, 
@@ -1149,6 +1159,7 @@ GDK_KEY_abreve, 0x1EB3,
 0x025F, 0x0284, 
 0x0279, 0x027B, 
 GDK_KEY_dead_hook, 0x0309, 
+GDK_KEY_dead_greek, GDK_KEY_U, 0x03D2, 
 GDK_KEY_Multi_key, GDK_KEY_plus, GDK_KEY_O, 0x1EDE, 
 GDK_KEY_Multi_key, GDK_KEY_plus, GDK_KEY_U, 0x1EEC, 
 GDK_KEY_Multi_key, GDK_KEY_plus, GDK_KEY_o, 0x1EDF, 
@@ -1198,6 +1209,65 @@ GDK_KEY_Greek_omicron, 0x1F41,
 GDK_KEY_Greek_rho, 0x1FE5, 
 GDK_KEY_Greek_upsilon, 0x1F51, 
 GDK_KEY_Greek_omega, 0x1F61, 
+GDK_KEY_space, 0x00B5, 
+GDK_KEY_A, 0x0391, 
+GDK_KEY_B, 0x0392, 
+GDK_KEY_D, 0x0394, 
+GDK_KEY_E, 0x0395, 
+GDK_KEY_F, 0x03A6, 
+GDK_KEY_G, 0x0393, 
+GDK_KEY_H, 0x0397, 
+GDK_KEY_I, 0x0399, 
+GDK_KEY_J, 0x0398, 
+GDK_KEY_K, 0x039A, 
+GDK_KEY_L, 0x039B, 
+GDK_KEY_M, 0x039C, 
+GDK_KEY_N, 0x039D, 
+GDK_KEY_O, 0x039F, 
+GDK_KEY_P, 0x03A0, 
+GDK_KEY_Q, 0x03A7, 
+GDK_KEY_R, 0x03A1, 
+GDK_KEY_S, 0x03A3, 
+GDK_KEY_T, 0x03A4, 
+GDK_KEY_U, 0x03A5, 
+GDK_KEY_W, 0x03A9, 
+GDK_KEY_X, 0x039E, 
+GDK_KEY_Y, 0x03A8, 
+GDK_KEY_Z, 0x0396, 
+GDK_KEY_a, 0x03B1, 
+GDK_KEY_b, 0x03B2, 
+GDK_KEY_d, 0x03B4, 
+GDK_KEY_e, 0x03B5, 
+GDK_KEY_f, 0x03C6, 
+GDK_KEY_g, 0x03B3, 
+GDK_KEY_h, 0x03B7, 
+GDK_KEY_i, 0x03B9, 
+GDK_KEY_j, 0x03B8, 
+GDK_KEY_k, 0x03BA, 
+GDK_KEY_l, 0x03BB, 
+GDK_KEY_m, 0x03BC, 
+GDK_KEY_n, 0x03BD, 
+GDK_KEY_o, 0x03BF, 
+GDK_KEY_p, 0x03C0, 
+GDK_KEY_q, 0x03C7, 
+GDK_KEY_r, 0x03C1, 
+GDK_KEY_s, 0x03C3, 
+GDK_KEY_t, 0x03C4, 
+GDK_KEY_u, 0x03C5, 
+GDK_KEY_w, 0x03C9, 
+GDK_KEY_x, 0x03BE, 
+GDK_KEY_y, 0x03C8, 
+GDK_KEY_z, 0x03B6, 
+GDK_KEY_nobreakspace, 0x00B5, 
+GDK_KEY_dead_greek, 0x00B5, 
+GDK_KEY_dead_stroke, GDK_KEY_r, 0x03FC, 
+GDK_KEY_dead_macron, GDK_KEY_A, 0x1FB9, 
+GDK_KEY_dead_macron, GDK_KEY_I, 0x1FD9, 
+GDK_KEY_dead_macron, GDK_KEY_U, 0x1FE9, 
+GDK_KEY_dead_macron, GDK_KEY_a, 0x1FB1, 
+GDK_KEY_dead_macron, GDK_KEY_i, 0x1FD1, 
+GDK_KEY_dead_macron, GDK_KEY_u, 0x1FE1, 
+GDK_KEY_dead_hook, GDK_KEY_U, 0x03D2, 
 GDK_KEY_space, GDK_KEY_space, 0x00A0, 
 GDK_KEY_space, GDK_KEY_apostrophe, 0x0027, 
 GDK_KEY_space, GDK_KEY_parenleft, 0x02D8, 
@@ -1255,7 +1325,6 @@ GDK_KEY_exclam, GDK_KEY_z, 0x1E93,
 GDK_KEY_quotedbl, GDK_KEY_quotedbl, 0x00A8, 
 GDK_KEY_quotedbl, GDK_KEY_apostrophe, 0x0344, 
 GDK_KEY_quotedbl, GDK_KEY_comma, 0x201E, 
-GDK_KEY_quotedbl, GDK_KEY_slash, 0x301E, 
 GDK_KEY_quotedbl, GDK_KEY_less, 0x201C, 
 GDK_KEY_quotedbl, GDK_KEY_greater, 0x201D, 
 GDK_KEY_quotedbl, GDK_KEY_A, 0x00C4, 
@@ -1267,7 +1336,6 @@ GDK_KEY_quotedbl, GDK_KEY_U, 0x00DC,
 GDK_KEY_quotedbl, GDK_KEY_W, 0x1E84, 
 GDK_KEY_quotedbl, GDK_KEY_X, 0x1E8C, 
 GDK_KEY_quotedbl, GDK_KEY_Y, 0x0178, 
-GDK_KEY_quotedbl, GDK_KEY_backslash, 0x301D, 
 GDK_KEY_quotedbl, GDK_KEY_a, 0x00E4, 
 GDK_KEY_quotedbl, GDK_KEY_e, 0x00EB, 
 GDK_KEY_quotedbl, GDK_KEY_h, 0x1E27, 
@@ -1316,8 +1384,12 @@ GDK_KEY_quotedbl, GDK_KEY_Greek_iota, 0x03CA,
 GDK_KEY_quotedbl, GDK_KEY_Greek_upsilon, 0x03CB, 
 GDK_KEY_quotedbl, GDK_KEY_dead_acute, 0x0344, 
 GDK_KEY_numbersign, GDK_KEY_numbersign, 0x266F, 
+GDK_KEY_numbersign, GDK_KEY_E, 0x266B, 
+GDK_KEY_numbersign, GDK_KEY_S, 0x266C, 
 GDK_KEY_numbersign, GDK_KEY_b, 0x266D, 
+GDK_KEY_numbersign, GDK_KEY_e, 0x266A, 
 GDK_KEY_numbersign, GDK_KEY_f, 0x266E, 
+GDK_KEY_numbersign, GDK_KEY_q, 0x2669, 
 GDK_KEY_percent, GDK_KEY_o, 0x2030, 
 GDK_KEY_apostrophe, GDK_KEY_space, 0x0027, 
 GDK_KEY_apostrophe, GDK_KEY_apostrophe, 0x00B4, 
@@ -1433,6 +1505,7 @@ GDK_KEY_apostrophe, 0x1F60, 0x1F64,
 GDK_KEY_apostrophe, 0x1F61, 0x1F65, 
 GDK_KEY_apostrophe, 0x1F68, 0x1F6C, 
 GDK_KEY_apostrophe, 0x1F69, 0x1F6D, 
+GDK_KEY_apostrophe, 0x2395, 0x235E, 
 GDK_KEY_parenleft, GDK_KEY_space, 0x02D8, 
 GDK_KEY_parenleft, GDK_KEY_parenleft, 0x005B, 
 GDK_KEY_parenleft, GDK_KEY_minus, 0x007B, 
@@ -1479,6 +1552,8 @@ GDK_KEY_asterisk, GDK_KEY_A, 0x00C5,
 GDK_KEY_asterisk, GDK_KEY_U, 0x016E, 
 GDK_KEY_asterisk, GDK_KEY_a, 0x00E5, 
 GDK_KEY_asterisk, GDK_KEY_u, 0x016F, 
+GDK_KEY_asterisk, GDK_KEY_diaeresis, 0x2363, 
+GDK_KEY_asterisk, GDK_KEY_emopencircle, 0x235F, 
 GDK_KEY_plus, GDK_KEY_plus, 0x0023, 
 GDK_KEY_plus, GDK_KEY_minus, 0x00B1, 
 GDK_KEY_plus, GDK_KEY_O, 0x01A0, 
@@ -1523,6 +1598,7 @@ GDK_KEY_minus, GDK_KEY_parenleft, 0x007B,
 GDK_KEY_minus, GDK_KEY_parenright, 0x007D, 
 GDK_KEY_minus, GDK_KEY_plus, 0x00B1, 
 GDK_KEY_minus, GDK_KEY_comma, 0x00AC, 
+GDK_KEY_minus, GDK_KEY_slash, 0x233F, 
 GDK_KEY_minus, GDK_KEY_colon, 0x00F7, 
 GDK_KEY_minus, GDK_KEY_greater, 0x2192, 
 GDK_KEY_minus, GDK_KEY_A, 0x00C3, 
@@ -1534,6 +1610,7 @@ GDK_KEY_minus, GDK_KEY_N, 0x00D1,
 GDK_KEY_minus, GDK_KEY_O, 0x00D5, 
 GDK_KEY_minus, GDK_KEY_U, 0x016A, 
 GDK_KEY_minus, GDK_KEY_Y, 0x00A5, 
+GDK_KEY_minus, GDK_KEY_backslash, 0x2340, 
 GDK_KEY_minus, GDK_KEY_asciicircum, 0x00AF, 
 GDK_KEY_minus, GDK_KEY_a, 0x0101, 
 GDK_KEY_minus, GDK_KEY_d, 0x0111, 
@@ -1544,8 +1621,12 @@ GDK_KEY_minus, GDK_KEY_n, 0x00F1,
 GDK_KEY_minus, GDK_KEY_o, 0x014D, 
 GDK_KEY_minus, GDK_KEY_u, 0x016B, 
 GDK_KEY_minus, GDK_KEY_y, 0x00A5, 
+GDK_KEY_minus, 0x2191, 0x234F, 
+GDK_KEY_minus, 0x2193, 0x2356, 
+GDK_KEY_minus, GDK_KEY_emopencircle, 0x2296, 
 GDK_KEY_period, GDK_KEY_minus, 0x00B7, 
 GDK_KEY_period, GDK_KEY_period, 0x2026, 
+GDK_KEY_period, GDK_KEY_colon, 0x2235, 
 GDK_KEY_period, GDK_KEY_less, 0x2039, 
 GDK_KEY_period, GDK_KEY_equal, 0x2022, 
 GDK_KEY_period, GDK_KEY_greater, 0x203A, 
@@ -1597,6 +1678,8 @@ GDK_KEY_period, GDK_KEY_sacute, 0x1E65,
 GDK_KEY_period, GDK_KEY_scaron, 0x1E67, 
 GDK_KEY_period, 0x1E62, 0x1E68, 
 GDK_KEY_period, 0x1E63, 0x1E69, 
+GDK_KEY_period, GDK_KEY_emopencircle, 0x2299, 
+GDK_KEY_slash, GDK_KEY_minus, 0x233F, 
 GDK_KEY_slash, GDK_KEY_slash, 0x005C, 
 GDK_KEY_slash, GDK_KEY_less, 0x005C, 
 GDK_KEY_slash, GDK_KEY_equal, 0x2260, 
@@ -1622,6 +1705,7 @@ GDK_KEY_slash, GDK_KEY_m, 0x20A5,
 GDK_KEY_slash, GDK_KEY_o, 0x00F8, 
 GDK_KEY_slash, GDK_KEY_t, 0x0167, 
 GDK_KEY_slash, GDK_KEY_u, 0x00B5, 
+GDK_KEY_slash, GDK_KEY_v, 0x221A, 
 GDK_KEY_slash, GDK_KEY_z, 0x01B6, 
 GDK_KEY_slash, 0x0294, 0x02A1, 
 GDK_KEY_slash, 0x04AE, 0x04B0, 
@@ -1633,7 +1717,9 @@ GDK_KEY_slash, GDK_KEY_Cyrillic_KA, 0x049E,
 GDK_KEY_slash, GDK_KEY_leftarrow, 0x219A, 
 GDK_KEY_slash, GDK_KEY_rightarrow, 0x219B, 
 GDK_KEY_slash, 0x2194, 0x21AE, 
+GDK_KEY_slash, 0x2395, 0x2341, 
 GDK_KEY_0, GDK_KEY_asterisk, 0x00B0, 
+GDK_KEY_0, GDK_KEY_3, 0x2189, 
 GDK_KEY_0, GDK_KEY_C, 0x00A9, 
 GDK_KEY_0, GDK_KEY_S, 0x00A7, 
 GDK_KEY_0, GDK_KEY_X, 0x00A4, 
@@ -1641,12 +1727,15 @@ GDK_KEY_0, GDK_KEY_asciicircum, 0x00B0,
 GDK_KEY_0, GDK_KEY_c, 0x00A9, 
 GDK_KEY_0, GDK_KEY_s, 0x00A7, 
 GDK_KEY_0, GDK_KEY_x, 0x00A4, 
+GDK_KEY_0, GDK_KEY_asciitilde, 0x236C, 
 GDK_KEY_1, GDK_KEY_2, 0x00BD, 
 GDK_KEY_1, GDK_KEY_3, 0x2153, 
 GDK_KEY_1, GDK_KEY_4, 0x00BC, 
 GDK_KEY_1, GDK_KEY_5, 0x2155, 
 GDK_KEY_1, GDK_KEY_6, 0x2159, 
+GDK_KEY_1, GDK_KEY_7, 0x2150, 
 GDK_KEY_1, GDK_KEY_8, 0x215B, 
+GDK_KEY_1, GDK_KEY_9, 0x2151, 
 GDK_KEY_1, GDK_KEY_S, 0x00B9, 
 GDK_KEY_1, GDK_KEY_asciicircum, 0x00B9, 
 GDK_KEY_1, GDK_KEY_s, 0x00B9, 
@@ -1665,14 +1754,18 @@ GDK_KEY_4, GDK_KEY_5, 0x2158,
 GDK_KEY_5, GDK_KEY_6, 0x215A, 
 GDK_KEY_5, GDK_KEY_8, 0x215D, 
 GDK_KEY_7, GDK_KEY_8, 0x215E, 
+GDK_KEY_8, GDK_KEY_8, 0x221E, 
 GDK_KEY_colon, GDK_KEY_parenleft, 0x2639, 
 GDK_KEY_colon, GDK_KEY_parenright, 0x263A, 
 GDK_KEY_colon, GDK_KEY_minus, 0x00F7, 
+GDK_KEY_colon, GDK_KEY_period, 0x2234, 
+GDK_KEY_colon, 0x2395, 0x2360, 
 GDK_KEY_semicolon, GDK_KEY_A, 0x0104, 
 GDK_KEY_semicolon, GDK_KEY_E, 0x0118, 
 GDK_KEY_semicolon, GDK_KEY_I, 0x012E, 
 GDK_KEY_semicolon, GDK_KEY_O, 0x01EA, 
 GDK_KEY_semicolon, GDK_KEY_U, 0x0172, 
+GDK_KEY_semicolon, GDK_KEY_underscore, 0x236E, 
 GDK_KEY_semicolon, GDK_KEY_a, 0x0105, 
 GDK_KEY_semicolon, GDK_KEY_e, 0x0119, 
 GDK_KEY_semicolon, GDK_KEY_i, 0x012F, 
@@ -1686,6 +1779,7 @@ GDK_KEY_less, GDK_KEY_slash, 0x005C,
 GDK_KEY_less, GDK_KEY_3, 0x2665, 
 GDK_KEY_less, GDK_KEY_less, 0x00AB, 
 GDK_KEY_less, GDK_KEY_equal, 0x2264, 
+GDK_KEY_less, GDK_KEY_greater, 0x22C4, 
 GDK_KEY_less, GDK_KEY_C, 0x010C, 
 GDK_KEY_less, GDK_KEY_D, 0x010E, 
 GDK_KEY_less, GDK_KEY_E, 0x011A, 
@@ -1695,6 +1789,7 @@ GDK_KEY_less, GDK_KEY_R, 0x0158,
 GDK_KEY_less, GDK_KEY_S, 0x0160, 
 GDK_KEY_less, GDK_KEY_T, 0x0164, 
 GDK_KEY_less, GDK_KEY_Z, 0x017D, 
+GDK_KEY_less, GDK_KEY_underscore, 0x2264, 
 GDK_KEY_less, GDK_KEY_c, 0x010D, 
 GDK_KEY_less, GDK_KEY_d, 0x010F, 
 GDK_KEY_less, GDK_KEY_e, 0x011B, 
@@ -1705,6 +1800,7 @@ GDK_KEY_less, GDK_KEY_s, 0x0161,
 GDK_KEY_less, GDK_KEY_t, 0x0165, 
 GDK_KEY_less, GDK_KEY_z, 0x017E, 
 GDK_KEY_less, 0x0338, 0x226E, 
+GDK_KEY_less, 0x2395, 0x2343, 
 GDK_KEY_equal, GDK_KEY_slash, 0x2260, 
 GDK_KEY_equal, GDK_KEY_C, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_E, 0x20AC, 
@@ -1714,7 +1810,9 @@ GDK_KEY_equal, GDK_KEY_O, 0x0150,
 GDK_KEY_equal, GDK_KEY_U, 0x0170, 
 GDK_KEY_equal, GDK_KEY_W, 0x20A9, 
 GDK_KEY_equal, GDK_KEY_Y, 0x00A5, 
+GDK_KEY_equal, GDK_KEY_underscore, 0x2261, 
 GDK_KEY_equal, GDK_KEY_c, 0x20AC, 
+GDK_KEY_equal, GDK_KEY_d, 0x20AB, 
 GDK_KEY_equal, GDK_KEY_e, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_l, 0x00A3, 
 GDK_KEY_equal, GDK_KEY_o, 0x0151, 
@@ -1725,9 +1823,11 @@ GDK_KEY_equal, GDK_KEY_Cyrillic_u, 0x04F3,
 GDK_KEY_equal, GDK_KEY_Cyrillic_IE, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_Cyrillic_ES, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_Cyrillic_U, 0x04F2, 
+GDK_KEY_equal, 0x2395, 0x2338, 
 GDK_KEY_greater, GDK_KEY_space, 0x005E, 
 GDK_KEY_greater, GDK_KEY_quotedbl, 0x201D, 
 GDK_KEY_greater, GDK_KEY_apostrophe, 0x2019, 
+GDK_KEY_greater, GDK_KEY_less, 0x22C4, 
 GDK_KEY_greater, GDK_KEY_equal, 0x2265, 
 GDK_KEY_greater, GDK_KEY_greater, 0x00BB, 
 GDK_KEY_greater, GDK_KEY_A, 0x00C2, 
@@ -1735,12 +1835,15 @@ GDK_KEY_greater, GDK_KEY_E, 0x00CA,
 GDK_KEY_greater, GDK_KEY_I, 0x00CE, 
 GDK_KEY_greater, GDK_KEY_O, 0x00D4, 
 GDK_KEY_greater, GDK_KEY_U, 0x00DB, 
+GDK_KEY_greater, GDK_KEY_underscore, 0x2265, 
 GDK_KEY_greater, GDK_KEY_a, 0x00E2, 
 GDK_KEY_greater, GDK_KEY_e, 0x00EA, 
 GDK_KEY_greater, GDK_KEY_i, 0x00EE, 
 GDK_KEY_greater, GDK_KEY_o, 0x00F4, 
 GDK_KEY_greater, GDK_KEY_u, 0x00FB, 
+GDK_KEY_greater, GDK_KEY_diaeresis, 0x2369, 
 GDK_KEY_greater, 0x0338, 0x226F, 
+GDK_KEY_greater, 0x2395, 0x2344, 
 GDK_KEY_question, GDK_KEY_exclam, 0x2E18, 
 GDK_KEY_question, GDK_KEY_question, 0x00BF, 
 GDK_KEY_question, GDK_KEY_A, 0x1EA2, 
@@ -1763,6 +1866,7 @@ GDK_KEY_question, GDK_KEY_ecircumflex, 0x1EC3,
 GDK_KEY_question, GDK_KEY_ocircumflex, 0x1ED5, 
 GDK_KEY_question, GDK_KEY_Abreve, 0x1EB2, 
 GDK_KEY_question, GDK_KEY_abreve, 0x1EB3, 
+GDK_KEY_question, 0x2395, 0x2370, 
 GDK_KEY_A, GDK_KEY_quotedbl, 0x00C4, 
 GDK_KEY_A, GDK_KEY_apostrophe, 0x00C1, 
 GDK_KEY_A, GDK_KEY_parenleft, 0x0102, 
@@ -1792,6 +1896,7 @@ GDK_KEY_C, GDK_KEY_O, 0x00A9,
 GDK_KEY_C, GDK_KEY_o, 0x00A9, 
 GDK_KEY_C, GDK_KEY_r, 0x20A2, 
 GDK_KEY_C, GDK_KEY_bar, 0x00A2, 
+GDK_KEY_D, GDK_KEY_comma, 0x1E10, 
 GDK_KEY_D, GDK_KEY_minus, 0x0110, 
 GDK_KEY_D, GDK_KEY_period, 0x1E0A, 
 GDK_KEY_D, GDK_KEY_less, 0x010E, 
@@ -1810,21 +1915,26 @@ GDK_KEY_E, GDK_KEY_grave, 0x00C8,
 GDK_KEY_E, GDK_KEY_diaeresis, 0x00CB, 
 GDK_KEY_E, GDK_KEY_acute, 0x00C9, 
 GDK_KEY_F, GDK_KEY_period, 0x1E1E, 
+GDK_KEY_F, GDK_KEY_i, 0xFB03, 
+GDK_KEY_F, GDK_KEY_l, 0xFB04, 
 GDK_KEY_F, GDK_KEY_r, 0x20A3, 
 GDK_KEY_G, GDK_KEY_parenleft, 0x011E, 
 GDK_KEY_G, GDK_KEY_comma, 0x0122, 
 GDK_KEY_G, GDK_KEY_period, 0x0120, 
 GDK_KEY_G, GDK_KEY_U, 0x011E, 
 GDK_KEY_G, GDK_KEY_breve, 0x011E, 
+GDK_KEY_H, GDK_KEY_comma, 0x1E28, 
 GDK_KEY_I, GDK_KEY_quotedbl, 0x00CF, 
 GDK_KEY_I, GDK_KEY_apostrophe, 0x00CD, 
 GDK_KEY_I, GDK_KEY_comma, 0x012E, 
 GDK_KEY_I, GDK_KEY_minus, 0x012A, 
 GDK_KEY_I, GDK_KEY_period, 0x0130, 
 GDK_KEY_I, GDK_KEY_greater, 0x00CE, 
+GDK_KEY_I, GDK_KEY_J, 0x0132, 
 GDK_KEY_I, GDK_KEY_asciicircum, 0x00CE, 
 GDK_KEY_I, GDK_KEY_underscore, 0x012A, 
 GDK_KEY_I, GDK_KEY_grave, 0x00CC, 
+GDK_KEY_I, GDK_KEY_j, 0x0132, 
 GDK_KEY_I, GDK_KEY_asciitilde, 0x0128, 
 GDK_KEY_I, GDK_KEY_diaeresis, 0x00CF, 
 GDK_KEY_I, GDK_KEY_acute, 0x00CD, 
@@ -1889,6 +1999,7 @@ GDK_KEY_S, GDK_KEY_O, 0x00A7,
 GDK_KEY_S, GDK_KEY_S, 0x1E9E, 
 GDK_KEY_S, GDK_KEY_m, 0x2120, 
 GDK_KEY_S, GDK_KEY_cedilla, 0x015E, 
+GDK_KEY_T, GDK_KEY_comma, 0x0162, 
 GDK_KEY_T, GDK_KEY_minus, 0x0166, 
 GDK_KEY_T, GDK_KEY_period, 0x1E6A, 
 GDK_KEY_T, GDK_KEY_slash, 0x0166, 
@@ -1957,6 +2068,11 @@ GDK_KEY_Y, GDK_KEY_acute, 0x00DD,
 GDK_KEY_Z, GDK_KEY_apostrophe, 0x0179, 
 GDK_KEY_Z, GDK_KEY_period, 0x017B, 
 GDK_KEY_Z, GDK_KEY_less, 0x017D, 
+GDK_KEY_bracketleft, GDK_KEY_bracketright, 0x2337, 
+GDK_KEY_backslash, GDK_KEY_minus, 0x2340, 
+GDK_KEY_backslash, 0x2395, 0x2342, 
+GDK_KEY_backslash, GDK_KEY_emopencircle, 0x2349, 
+GDK_KEY_bracketright, GDK_KEY_bracketleft, 0x2337, 
 GDK_KEY_asciicircum, GDK_KEY_space, 0x005E, 
 GDK_KEY_asciicircum, GDK_KEY_parenleft, 0x207D, 
 GDK_KEY_asciicircum, GDK_KEY_parenright, 0x207E, 
@@ -2036,6 +2152,7 @@ GDK_KEY_asciicircum, GDK_KEY_KP_7, 0x2077,
 GDK_KEY_asciicircum, GDK_KEY_KP_8, 0x2078, 
 GDK_KEY_asciicircum, GDK_KEY_KP_9, 0x2079, 
 GDK_KEY_asciicircum, GDK_KEY_KP_Equal, 0x207C, 
+GDK_KEY_underscore, GDK_KEY_apostrophe, 0x2358, 
 GDK_KEY_underscore, GDK_KEY_parenleft, 0x208D, 
 GDK_KEY_underscore, GDK_KEY_parenright, 0x208E, 
 GDK_KEY_underscore, GDK_KEY_plus, 0x208A, 
@@ -2049,7 +2166,9 @@ GDK_KEY_underscore, GDK_KEY_6, 0x2086,
 GDK_KEY_underscore, GDK_KEY_7, 0x2087, 
 GDK_KEY_underscore, GDK_KEY_8, 0x2088, 
 GDK_KEY_underscore, GDK_KEY_9, 0x2089, 
+GDK_KEY_underscore, GDK_KEY_less, 0x2264, 
 GDK_KEY_underscore, GDK_KEY_equal, 0x208C, 
+GDK_KEY_underscore, GDK_KEY_greater, 0x2265, 
 GDK_KEY_underscore, GDK_KEY_A, 0x0100, 
 GDK_KEY_underscore, GDK_KEY_E, 0x0112, 
 GDK_KEY_underscore, GDK_KEY_G, 0x1E20, 
@@ -2096,7 +2215,19 @@ GDK_KEY_underscore, 0x1E36, 0x1E38,
 GDK_KEY_underscore, 0x1E37, 0x1E39, 
 GDK_KEY_underscore, 0x1E5A, 0x1E5C, 
 GDK_KEY_underscore, 0x1E5B, 0x1E5D, 
+GDK_KEY_underscore, 0x2206, 0x2359, 
+GDK_KEY_underscore, 0x220A, 0x2377, 
 GDK_KEY_underscore, 0x2212, 0x208B, 
+GDK_KEY_underscore, 0x2218, 0x235B, 
+GDK_KEY_underscore, 0x2260, 0x2262, 
+GDK_KEY_underscore, 0x2282, 0x2286, 
+GDK_KEY_underscore, 0x2283, 0x2287, 
+GDK_KEY_underscore, GDK_KEY_downtack, 0x234A, 
+GDK_KEY_underscore, 0x22C4, 0x235A, 
+GDK_KEY_underscore, 0x2373, 0x2378, 
+GDK_KEY_underscore, 0x2375, 0x2379, 
+GDK_KEY_underscore, 0x237A, 0x2376, 
+GDK_KEY_underscore, GDK_KEY_emopencircle, 0x235C, 
 GDK_KEY_underscore, GDK_KEY_KP_Space, 0x2082, 
 GDK_KEY_underscore, GDK_KEY_KP_Add, 0x208A, 
 GDK_KEY_underscore, GDK_KEY_KP_0, 0x2080, 
@@ -2279,12 +2410,13 @@ GDK_KEY_c, GDK_KEY_z, 0x017E,
 GDK_KEY_c, GDK_KEY_bar, 0x00A2, 
 GDK_KEY_c, GDK_KEY_Udiaeresis, 0x01D9, 
 GDK_KEY_c, GDK_KEY_udiaeresis, 0x01DA, 
-GDK_KEY_c, 0x01B7, 0x01EE, 
-GDK_KEY_c, 0x0292, 0x01EF, 
-GDK_KEY_d, GDK_KEY_minus, 0x20AB, 
+GDK_KEY_d, GDK_KEY_comma, 0x1E11, 
+GDK_KEY_d, GDK_KEY_minus, 0x0111, 
 GDK_KEY_d, GDK_KEY_period, 0x1E0B, 
 GDK_KEY_d, GDK_KEY_less, 0x010F, 
+GDK_KEY_d, GDK_KEY_equal, 0x20AB, 
 GDK_KEY_d, GDK_KEY_h, 0x00F0, 
+GDK_KEY_d, GDK_KEY_i, 0x2300, 
 GDK_KEY_e, GDK_KEY_quotedbl, 0x00EB, 
 GDK_KEY_e, GDK_KEY_apostrophe, 0x00E9, 
 GDK_KEY_e, GDK_KEY_comma, 0x0119, 
@@ -2301,21 +2433,27 @@ GDK_KEY_e, GDK_KEY_diaeresis, 0x00EB,
 GDK_KEY_e, GDK_KEY_acute, 0x00E9, 
 GDK_KEY_f, GDK_KEY_period, 0x1E1F, 
 GDK_KEY_f, GDK_KEY_S, 0x017F, 
+GDK_KEY_f, GDK_KEY_f, 0xFB00, 
+GDK_KEY_f, GDK_KEY_i, 0xFB01, 
+GDK_KEY_f, GDK_KEY_l, 0xFB02, 
 GDK_KEY_f, GDK_KEY_s, 0x017F, 
 GDK_KEY_g, GDK_KEY_parenleft, 0x011F, 
 GDK_KEY_g, GDK_KEY_comma, 0x0123, 
 GDK_KEY_g, GDK_KEY_period, 0x0121, 
 GDK_KEY_g, GDK_KEY_U, 0x011F, 
 GDK_KEY_g, GDK_KEY_breve, 0x011F, 
+GDK_KEY_h, GDK_KEY_comma, 0x1E29, 
 GDK_KEY_i, GDK_KEY_quotedbl, 0x00EF, 
 GDK_KEY_i, GDK_KEY_apostrophe, 0x00ED, 
 GDK_KEY_i, GDK_KEY_comma, 0x012F, 
 GDK_KEY_i, GDK_KEY_minus, 0x012B, 
 GDK_KEY_i, GDK_KEY_period, 0x0131, 
+GDK_KEY_i, GDK_KEY_semicolon, 0x012F, 
 GDK_KEY_i, GDK_KEY_greater, 0x00EE, 
 GDK_KEY_i, GDK_KEY_asciicircum, 0x00EE, 
 GDK_KEY_i, GDK_KEY_underscore, 0x012B, 
 GDK_KEY_i, GDK_KEY_grave, 0x00EC, 
+GDK_KEY_i, GDK_KEY_j, 0x0133, 
 GDK_KEY_i, GDK_KEY_asciitilde, 0x0129, 
 GDK_KEY_i, GDK_KEY_diaeresis, 0x00EF, 
 GDK_KEY_i, GDK_KEY_acute, 0x00ED, 
@@ -2382,6 +2520,7 @@ GDK_KEY_s, GDK_KEY_m, 0x2120,
 GDK_KEY_s, GDK_KEY_o, 0x00A7, 
 GDK_KEY_s, GDK_KEY_s, 0x00DF, 
 GDK_KEY_s, GDK_KEY_cedilla, 0x015F, 
+GDK_KEY_t, GDK_KEY_comma, 0x0163, 
 GDK_KEY_t, GDK_KEY_minus, 0x0167, 
 GDK_KEY_t, GDK_KEY_period, 0x1E6B, 
 GDK_KEY_t, GDK_KEY_slash, 0x0167, 
@@ -2403,6 +2542,7 @@ GDK_KEY_u, GDK_KEY_u, 0x016D,
 GDK_KEY_u, GDK_KEY_asciitilde, 0x0169, 
 GDK_KEY_u, GDK_KEY_diaeresis, 0x00FC, 
 GDK_KEY_u, GDK_KEY_acute, 0x00FA, 
+GDK_KEY_v, GDK_KEY_slash, 0x221A, 
 GDK_KEY_v, GDK_KEY_Z, 0x017D, 
 GDK_KEY_v, GDK_KEY_l, 0x007C, 
 GDK_KEY_v, GDK_KEY_z, 0x017E, 
@@ -2421,9 +2561,19 @@ GDK_KEY_y, GDK_KEY_acute, 0x00FD,
 GDK_KEY_z, GDK_KEY_apostrophe, 0x017A, 
 GDK_KEY_z, GDK_KEY_period, 0x017C, 
 GDK_KEY_z, GDK_KEY_less, 0x017E, 
+GDK_KEY_braceleft, GDK_KEY_braceright, 0x2205, 
 GDK_KEY_bar, GDK_KEY_C, 0x00A2, 
 GDK_KEY_bar, GDK_KEY_c, 0x00A2, 
+GDK_KEY_bar, GDK_KEY_asciitilde, 0x236D, 
+GDK_KEY_bar, 0x2190, 0x2345, 
+GDK_KEY_bar, 0x2192, 0x2346, 
+GDK_KEY_bar, 0x2206, 0x234B, 
+GDK_KEY_bar, 0x2207, 0x2352, 
+GDK_KEY_bar, GDK_KEY_union, 0x2366, 
+GDK_KEY_bar, 0x2282, 0x2367, 
+GDK_KEY_bar, GDK_KEY_emopencircle, 0x233D, 
 GDK_KEY_asciitilde, GDK_KEY_space, 0x007E, 
+GDK_KEY_asciitilde, GDK_KEY_0, 0x236C, 
 GDK_KEY_asciitilde, GDK_KEY_A, 0x00C3, 
 GDK_KEY_asciitilde, GDK_KEY_E, 0x1EBC, 
 GDK_KEY_asciitilde, GDK_KEY_I, 0x0128, 
@@ -2440,6 +2590,8 @@ GDK_KEY_asciitilde, GDK_KEY_o, 0x00F5,
 GDK_KEY_asciitilde, GDK_KEY_u, 0x0169, 
 GDK_KEY_asciitilde, GDK_KEY_v, 0x1E7D, 
 GDK_KEY_asciitilde, GDK_KEY_y, 0x1EF9, 
+GDK_KEY_asciitilde, GDK_KEY_bar, 0x236D, 
+GDK_KEY_asciitilde, GDK_KEY_diaeresis, 0x2368, 
 GDK_KEY_asciitilde, GDK_KEY_Acircumflex, 0x1EAA, 
 GDK_KEY_asciitilde, GDK_KEY_Ecircumflex, 0x1EC4, 
 GDK_KEY_asciitilde, GDK_KEY_Ocircumflex, 0x1ED6, 
@@ -2474,7 +2626,12 @@ GDK_KEY_asciitilde, 0x1F60, 0x1F66,
 GDK_KEY_asciitilde, 0x1F61, 0x1F67, 
 GDK_KEY_asciitilde, 0x1F68, 0x1F6E, 
 GDK_KEY_asciitilde, 0x1F69, 0x1F6F, 
+GDK_KEY_asciitilde, 0x2207, 0x236B, 
+GDK_KEY_asciitilde, 0x2227, 0x2372, 
+GDK_KEY_asciitilde, 0x2228, 0x2371, 
 GDK_KEY_diaeresis, GDK_KEY_apostrophe, 0x0385, 
+GDK_KEY_diaeresis, GDK_KEY_asterisk, 0x2363, 
+GDK_KEY_diaeresis, GDK_KEY_greater, 0x2369, 
 GDK_KEY_diaeresis, GDK_KEY_A, 0x00C4, 
 GDK_KEY_diaeresis, GDK_KEY_E, 0x00CB, 
 GDK_KEY_diaeresis, GDK_KEY_I, 0x00CF, 
@@ -2490,6 +2647,10 @@ GDK_KEY_diaeresis, GDK_KEY_u, 0x00FC,
 GDK_KEY_diaeresis, GDK_KEY_y, 0x00FF, 
 GDK_KEY_diaeresis, GDK_KEY_asciitilde, 0x1FC1, 
 GDK_KEY_diaeresis, GDK_KEY_acute, 0x0385, 
+GDK_KEY_diaeresis, 0x2207, 0x2362, 
+GDK_KEY_diaeresis, 0x2218, 0x2364, 
+GDK_KEY_diaeresis, GDK_KEY_uptack, 0x2361, 
+GDK_KEY_diaeresis, GDK_KEY_emopencircle, 0x2365, 
 GDK_KEY_diaeresis, GDK_KEY_dead_grave, 0x1FED, 
 GDK_KEY_diaeresis, GDK_KEY_dead_acute, 0x0385, 
 GDK_KEY_diaeresis, GDK_KEY_dead_tilde, 0x1FC1, 
@@ -2537,6 +2698,7 @@ GDK_KEY_macron, 0x1E36, 0x1E38,
 GDK_KEY_macron, 0x1E37, 0x1E39, 
 GDK_KEY_macron, 0x1E5A, 0x1E5C, 
 GDK_KEY_macron, 0x1E5B, 0x1E5D, 
+GDK_KEY_macron, GDK_KEY_uptack, 0x2351, 
 GDK_KEY_acute, GDK_KEY_A, 0x00C1, 
 GDK_KEY_acute, GDK_KEY_C, 0x0106, 
 GDK_KEY_acute, GDK_KEY_E, 0x00C9, 
@@ -2668,6 +2830,7 @@ GDK_KEY_cedilla, GDK_KEY_n, 0x0146,
 GDK_KEY_cedilla, GDK_KEY_r, 0x0157, 
 GDK_KEY_cedilla, GDK_KEY_s, 0x015F, 
 GDK_KEY_cedilla, GDK_KEY_t, 0x0163, 
+GDK_KEY_division, 0x2395, 0x2339, 
 GDK_KEY_breve, GDK_KEY_G, 0x011E, 
 GDK_KEY_breve, GDK_KEY_g, 0x011F, 
 0x05B4, GDK_KEY_hebrew_yod, 0xFB1D, 
@@ -3121,15 +3284,48 @@ GDK_KEY_righttack, 0x0338, 0x22AC,
 0x1FFE, GDK_KEY_dead_grave, 0x1FDD, 
 0x1FFE, GDK_KEY_dead_acute, 0x1FDE, 
 0x1FFE, GDK_KEY_dead_tilde, 0x1FDF, 
+0x2190, GDK_KEY_bar, 0x2345, 
+0x2190, 0x2395, 0x2347, 
+0x2191, GDK_KEY_minus, 0x234F, 
+0x2191, 0x2395, 0x2350, 
+0x2192, GDK_KEY_bar, 0x2346, 
+0x2192, 0x2395, 0x2348, 
+0x2193, GDK_KEY_minus, 0x2356, 
+0x2193, 0x2395, 0x2357, 
 0x2203, 0x0338, 0x2204, 
+0x2206, GDK_KEY_underscore, 0x2359, 
+0x2206, GDK_KEY_bar, 0x234B, 
+0x2206, 0x2395, 0x234D, 
+0x2207, GDK_KEY_bar, 0x2352, 
+0x2207, GDK_KEY_asciitilde, 0x236B, 
+0x2207, GDK_KEY_diaeresis, 0x2362, 
+0x2207, 0x2395, 0x2354, 
 0x2208, 0x0338, 0x2209, 
+0x220A, GDK_KEY_underscore, 0x2377, 
 0x220B, 0x0338, 0x220C, 
+0x2218, GDK_KEY_underscore, 0x235B, 
+0x2218, GDK_KEY_diaeresis, 0x2364, 
+0x2218, 0x2229, 0x235D, 
+0x2218, GDK_KEY_uptack, 0x2355, 
+0x2218, GDK_KEY_downtack, 0x234E, 
+0x2218, 0x2395, 0x233B, 
+0x2218, GDK_KEY_emopencircle, 0x233E, 
 0x2223, 0x0338, 0x2224, 
 0x2225, 0x0338, 0x2226, 
+0x2227, GDK_KEY_asciitilde, 0x2372, 
+0x2227, 0x2228, 0x22C4, 
+0x2227, 0x2395, 0x2353, 
+0x2228, GDK_KEY_asciitilde, 0x2371, 
+0x2228, 0x2227, 0x22C4, 
+0x2228, 0x2395, 0x234C, 
+0x2229, 0x2218, 0x235D, 
+GDK_KEY_union, GDK_KEY_bar, 0x2366, 
 0x223C, 0x0338, 0x2241, 
 0x2243, 0x0338, 0x2244, 
 0x2248, 0x0338, 0x2249, 
 0x224D, 0x0338, 0x226D, 
+0x2260, GDK_KEY_underscore, 0x2262, 
+0x2260, 0x2395, 0x236F, 
 0x2272, 0x0338, 0x2274, 
 0x2273, 0x0338, 0x2275, 
 0x2276, 0x0338, 0x2278, 
@@ -3138,10 +3334,20 @@ GDK_KEY_righttack, 0x0338, 0x22AC,
 0x227B, 0x0338, 0x2281, 
 0x227C, 0x0338, 0x22E0, 
 0x227D, 0x0338, 0x22E1, 
+0x2282, GDK_KEY_underscore, 0x2286, 
+0x2282, GDK_KEY_bar, 0x2367, 
+0x2283, GDK_KEY_underscore, 0x2287, 
 0x2286, 0x0338, 0x2288, 
 0x2287, 0x0338, 0x2289, 
 0x2291, 0x0338, 0x22E2, 
 0x2292, 0x0338, 0x22E3, 
+GDK_KEY_uptack, GDK_KEY_diaeresis, 0x2361, 
+GDK_KEY_uptack, GDK_KEY_macron, 0x2351, 
+GDK_KEY_uptack, 0x2218, 0x2355, 
+GDK_KEY_uptack, GDK_KEY_downtack, 0x2336, 
+GDK_KEY_downtack, GDK_KEY_underscore, 0x234A, 
+GDK_KEY_downtack, 0x2218, 0x234E, 
+GDK_KEY_downtack, GDK_KEY_uptack, 0x2336, 
 0x22A8, 0x0338, 0x22AD, 
 0x22A9, 0x0338, 0x22AE, 
 0x22AB, 0x0338, 0x22AF, 
@@ -3149,6 +3355,41 @@ GDK_KEY_righttack, 0x0338, 0x22AC,
 0x22B3, 0x0338, 0x22EB, 
 0x22B4, 0x0338, 0x22EC, 
 0x22B5, 0x0338, 0x22ED, 
+0x22C4, GDK_KEY_underscore, 0x235A, 
+0x22C4, 0x2395, 0x233A, 
+0x2373, GDK_KEY_underscore, 0x2378, 
+0x2375, GDK_KEY_underscore, 0x2379, 
+0x237A, GDK_KEY_underscore, 0x2376, 
+0x2395, GDK_KEY_apostrophe, 0x235E, 
+0x2395, GDK_KEY_slash, 0x2341, 
+0x2395, GDK_KEY_colon, 0x2360, 
+0x2395, GDK_KEY_less, 0x2343, 
+0x2395, GDK_KEY_equal, 0x2338, 
+0x2395, GDK_KEY_greater, 0x2344, 
+0x2395, GDK_KEY_question, 0x2370, 
+0x2395, GDK_KEY_backslash, 0x2342, 
+0x2395, GDK_KEY_division, 0x2339, 
+0x2395, 0x2190, 0x2347, 
+0x2395, 0x2191, 0x2350, 
+0x2395, 0x2192, 0x2348, 
+0x2395, 0x2193, 0x2357, 
+0x2395, 0x2206, 0x234D, 
+0x2395, 0x2207, 0x2354, 
+0x2395, 0x2218, 0x233B, 
+0x2395, 0x2227, 0x2353, 
+0x2395, 0x2228, 0x234C, 
+0x2395, 0x2260, 0x236F, 
+0x2395, 0x22C4, 0x233A, 
+0x2395, GDK_KEY_emopencircle, 0x233C, 
+GDK_KEY_emopencircle, GDK_KEY_asterisk, 0x235F, 
+GDK_KEY_emopencircle, GDK_KEY_minus, 0x2296, 
+GDK_KEY_emopencircle, GDK_KEY_period, 0x2299, 
+GDK_KEY_emopencircle, GDK_KEY_backslash, 0x2349, 
+GDK_KEY_emopencircle, GDK_KEY_underscore, 0x235C, 
+GDK_KEY_emopencircle, GDK_KEY_bar, 0x233D, 
+GDK_KEY_emopencircle, GDK_KEY_diaeresis, 0x2365, 
+GDK_KEY_emopencircle, 0x2218, 0x233E, 
+GDK_KEY_emopencircle, 0x2395, 0x233C, 
 0x2ADD, 0x0338, 0x2ADC, 
 GDK_KEY_KP_Divide, GDK_KEY_D, 0x0110, 
 GDK_KEY_KP_Divide, GDK_KEY_G, 0x01E4, 
@@ -3503,6 +3744,8 @@ GDK_KEY_parenleft, GDK_KEY_KP_6, GDK_KEY_parenright, 0x2465,
 GDK_KEY_parenleft, GDK_KEY_KP_7, GDK_KEY_parenright, 0x2466, 
 GDK_KEY_parenleft, GDK_KEY_KP_8, GDK_KEY_parenright, 0x2467, 
 GDK_KEY_parenleft, GDK_KEY_KP_9, GDK_KEY_parenright, 0x2468, 
+GDK_KEY_asterisk, GDK_KEY_apostrophe, GDK_KEY_A, 0x01FA, 
+GDK_KEY_asterisk, GDK_KEY_apostrophe, GDK_KEY_a, 0x01FB, 
 GDK_KEY_minus, GDK_KEY_minus, GDK_KEY_space, 0x00AD, 
 GDK_KEY_minus, GDK_KEY_minus, GDK_KEY_minus, 0x2014, 
 GDK_KEY_minus, GDK_KEY_minus, GDK_KEY_period, 0x2013, 
@@ -3518,6 +3761,7 @@ GDK_KEY_period, GDK_KEY_dead_caron, GDK_KEY_S, 0x1E66,
 GDK_KEY_period, GDK_KEY_dead_caron, GDK_KEY_s, 0x1E67, 
 GDK_KEY_period, GDK_KEY_dead_belowdot, GDK_KEY_S, 0x1E68, 
 GDK_KEY_period, GDK_KEY_dead_belowdot, GDK_KEY_s, 0x1E69, 
+GDK_KEY_1, GDK_KEY_1, GDK_KEY_0, 0x2152, 
 GDK_KEY_question, GDK_KEY_plus, GDK_KEY_O, 0x1EDE, 
 GDK_KEY_question, GDK_KEY_plus, GDK_KEY_U, 0x1EEC, 
 GDK_KEY_question, GDK_KEY_plus, GDK_KEY_o, 0x1EDF, 
@@ -3544,8 +3788,6 @@ GDK_KEY_question, GDK_KEY_dead_horn, GDK_KEY_o, 0x1EDF,
 GDK_KEY_question, GDK_KEY_dead_horn, GDK_KEY_u, 0x1EED, 
 GDK_KEY_U, GDK_KEY_exclam, GDK_KEY_A, 0x1EB6, 
 GDK_KEY_U, GDK_KEY_exclam, GDK_KEY_a, 0x1EB7, 
-GDK_KEY_U, GDK_KEY_comma, GDK_KEY_E, 0x1E1C, 
-GDK_KEY_U, GDK_KEY_comma, GDK_KEY_e, 0x1E1D, 
 GDK_KEY_U, GDK_KEY_cedilla, GDK_KEY_E, 0x1E1C, 
 GDK_KEY_U, GDK_KEY_cedilla, GDK_KEY_e, 0x1E1D, 
 GDK_KEY_U, GDK_KEY_dead_cedilla, GDK_KEY_E, 0x1E1C, 
@@ -3748,8 +3990,6 @@ GDK_KEY_c, GDK_KEY_quotedbl, GDK_KEY_U, 0x01D9,
 GDK_KEY_c, GDK_KEY_quotedbl, GDK_KEY_u, 0x01DA, 
 GDK_KEY_c, GDK_KEY_dead_diaeresis, GDK_KEY_U, 0x01D9, 
 GDK_KEY_c, GDK_KEY_dead_diaeresis, GDK_KEY_u, 0x01DA, 
-GDK_KEY_o, GDK_KEY_apostrophe, GDK_KEY_A, 0x01FA, 
-GDK_KEY_o, GDK_KEY_apostrophe, GDK_KEY_a, 0x01FB, 
 GDK_KEY_asciitilde, GDK_KEY_quotedbl, GDK_KEY_Greek_iota, 0x1FD7, 
 GDK_KEY_asciitilde, GDK_KEY_quotedbl, GDK_KEY_Greek_upsilon, 0x1FE7, 
 GDK_KEY_asciitilde, GDK_KEY_parenleft, GDK_KEY_Greek_ALPHA, 0x1F0F, 
@@ -4105,6 +4345,7 @@ GDK_KEY_Greek_iota, GDK_KEY_dead_dasia, GDK_KEY_Greek_OMEGA, 0x1FA9,
 GDK_KEY_Greek_iota, GDK_KEY_dead_dasia, GDK_KEY_Greek_alpha, 0x1F81, 
 GDK_KEY_Greek_iota, GDK_KEY_dead_dasia, GDK_KEY_Greek_eta, 0x1F91, 
 GDK_KEY_Greek_iota, GDK_KEY_dead_dasia, GDK_KEY_Greek_omega, 0x1FA1, 
+GDK_KEY_dead_abovedot, GDK_KEY_f, GDK_KEY_s, 0x1E9B, 
 GDK_KEY_parenleft, GDK_KEY_1, GDK_KEY_0, GDK_KEY_parenright, 0x2469, 
 GDK_KEY_parenleft, GDK_KEY_1, GDK_KEY_1, GDK_KEY_parenright, 0x246A, 
 GDK_KEY_parenleft, GDK_KEY_1, GDK_KEY_2, GDK_KEY_parenright, 0x246B, 
@@ -4311,6 +4552,8 @@ GDK_KEY_parenleft, GDK_KEY_KP_4, GDK_KEY_KP_8, GDK_KEY_parenright, 0x32BD,
 GDK_KEY_parenleft, GDK_KEY_KP_4, GDK_KEY_KP_9, GDK_KEY_parenright, 0x32BE, 
 GDK_KEY_parenleft, GDK_KEY_KP_5, GDK_KEY_KP_0, GDK_KEY_parenright, 0x32BF, 
 GDK_KEY_C, GDK_KEY_C, GDK_KEY_C, GDK_KEY_P, 0x262D, 
+GDK_KEY_U, GDK_KEY_space, GDK_KEY_comma, GDK_KEY_E, 0x1E1C, 
+GDK_KEY_U, GDK_KEY_space, GDK_KEY_comma, GDK_KEY_e, 0x1E1D, 
 GDK_KEY_Greek_iota, GDK_KEY_apostrophe, GDK_KEY_parenleft, GDK_KEY_Greek_ALPHA, 0x1F8D, 
 GDK_KEY_Greek_iota, GDK_KEY_apostrophe, GDK_KEY_parenleft, GDK_KEY_Greek_ETA, 0x1F9D, 
 GDK_KEY_Greek_iota, GDK_KEY_apostrophe, GDK_KEY_parenleft, GDK_KEY_Greek_OMEGA, 0x1FAD,