Update to libX11 1.8.9 part 4: input methods and NLS fixes

11 files changed, 858 insertions, 1832 deletions

diff --git a/lib/libX11/modules/im/ximcp/imDefIm.c b/lib/libX11/modules/im/ximcp/imDefIm.c
index ccdf14c12..fe4d18ba3 100644
--- a/lib/libX11/modules/im/ximcp/imDefIm.c
+++ b/lib/libX11/modules/im/ximcp/imDefIm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1990, 1991, 1992 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1990, 1991, 1992, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -980,34 +980,30 @@ _XimProtoIMFree(
     Xim		  im)
 {
     /* XIMPrivateRec */
-    if (im->private.proto.im_onkeylist) {
-	Xfree(im->private.proto.im_onkeylist);
-	im->private.proto.im_onkeylist = NULL;
-    }
-    if (im->private.proto.im_offkeylist) {
-	Xfree(im->private.proto.im_offkeylist);
-	im->private.proto.im_offkeylist = NULL;
-    }
+
+    Xfree(im->private.proto.im_onkeylist);
+    im->private.proto.im_onkeylist = NULL;
+
+    Xfree(im->private.proto.im_offkeylist);
+    im->private.proto.im_offkeylist = NULL;
+
     if (im->private.proto.intrproto) {
-	_XimFreeProtoIntrCallback(im);
-	im->private.proto.intrproto = NULL;
-    }
-    if (im->private.proto.im_inner_resources) {
-	Xfree(im->private.proto.im_inner_resources);
-	im->private.proto.im_inner_resources = NULL;
-    }
-    if (im->private.proto.ic_inner_resources) {
-	Xfree(im->private.proto.ic_inner_resources);
-	im->private.proto.ic_inner_resources = NULL;
-    }
-    if (im->private.proto.hold_data) {
-	Xfree(im->private.proto.hold_data);
-	im->private.proto.hold_data = NULL;
-    }
-    if (im->private.proto.locale_name) {
-	Xfree(im->private.proto.locale_name);
-	im->private.proto.locale_name = NULL;
+      _XimFreeProtoIntrCallback(im);
+      im->private.proto.intrproto = NULL;
     }
+
+    Xfree(im->private.proto.im_inner_resources);
+    im->private.proto.im_inner_resources = NULL;
+
+    Xfree(im->private.proto.ic_inner_resources);
+    im->private.proto.ic_inner_resources = NULL;
+
+    Xfree(im->private.proto.hold_data);
+    im->private.proto.hold_data = NULL;
+
+    Xfree(im->private.proto.locale_name);
+    im->private.proto.locale_name = NULL;
+
     if (im->private.proto.ctom_conv) {
 	_XlcCloseConverter(im->private.proto.ctom_conv);
 	im->private.proto.ctom_conv = NULL;
@@ -1047,48 +1043,37 @@ _XimProtoIMFree(
     }
 #endif /* XIM_CONNECTABLE */
 
-    if (im->private.proto.saved_imvalues) {
-        Xfree(im->private.proto.saved_imvalues);
-        im->private.proto.saved_imvalues = NULL;
-    }
-    if (im->private.proto.default_styles) {
-	Xfree(im->private.proto.default_styles);
-	im->private.proto.default_styles = NULL;
-    }
+    Xfree(im->private.proto.saved_imvalues);
+    im->private.proto.saved_imvalues = NULL;
+
+    Xfree(im->private.proto.default_styles);
+    im->private.proto.default_styles = NULL;
 
     /* core */
-    if (im->core.res_name) {
-        Xfree(im->core.res_name);
-	im->core.res_name = NULL;
-    }
-    if (im->core.res_class) {
-        Xfree(im->core.res_class);
-	im->core.res_class = NULL;
-    }
-    if (im->core.im_values_list) {
-	Xfree(im->core.im_values_list);
-	im->core.im_values_list = NULL;
-    }
-    if (im->core.ic_values_list) {
-	Xfree(im->core.ic_values_list);
-	im->core.ic_values_list = NULL;
-    }
-    if (im->core.im_name) {
-	Xfree(im->core.im_name);
-	im->core.im_name = NULL;
-    }
-    if (im->core.styles) {
-	Xfree(im->core.styles);
-	im->core.styles = NULL;
-    }
-    if (im->core.im_resources) {
-        Xfree(im->core.im_resources);
-	im->core.im_resources = NULL;
-    }
-    if (im->core.ic_resources) {
-        Xfree(im->core.ic_resources);
-	im->core.ic_resources = NULL;
-    }
+
+    Xfree(im->core.res_name);
+    im->core.res_name = NULL;
+
+    Xfree(im->core.res_class);
+    im->core.res_class = NULL;
+
+    Xfree(im->core.im_values_list);
+    im->core.im_values_list = NULL;
+
+    Xfree(im->core.ic_values_list);
+    im->core.ic_values_list = NULL;
+
+    Xfree(im->core.im_name);
+    im->core.im_name = NULL;
+
+    Xfree(im->core.styles);
+    im->core.styles = NULL;
+
+    Xfree(im->core.im_resources);
+    im->core.im_resources = NULL;
+
+    Xfree(im->core.ic_resources);
+    im->core.ic_resources = NULL;
 
     return;
 }
diff --git a/lib/libX11/modules/im/ximcp/imInsClbk.c b/lib/libX11/modules/im/ximcp/imInsClbk.c
index 95b379cba..c10e347fe 100644
--- a/lib/libX11/modules/im/ximcp/imInsClbk.c
+++ b/lib/libX11/modules/im/ximcp/imInsClbk.c
@@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback(
     if( xim ) {
 	lock = True;
 	xim->methods->close( (XIM)xim );
+	/* XIMs must be freed manually after being opened; close just
+	   does the protocol to deinitialize the IM.  */
+	XFree( xim );
 	lock = False;
 	icb->call = True;
 	callback( display, client_data, NULL );
diff --git a/lib/libX11/modules/im/ximcp/imLcIc.c b/lib/libX11/modules/im/ximcp/imLcIc.c
index 635458990..a3b6c1f52 100644
--- a/lib/libX11/modules/im/ximcp/imLcIc.c
+++ b/lib/libX11/modules/im/ximcp/imLcIc.c
@@ -61,10 +61,16 @@ _XimLocalDestroyIC(
     if (ic->core.focus_window)
 	_XUnregisterFilter(ic->core.im->core.display,
 			ic->core.focus_window, _XimLocalFilter, (XPointer)ic);
-    if(ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
+
+    Xfree(ic->private.local.ic_resources);
+    ic->private.local.ic_resources = NULL;
+
+    Xfree(ic->core.res_name);
+    ic->core.res_name=NULL;
+
+    Xfree(ic->core.res_class);
+    ic->core.res_class = NULL;
+
     return;
 }
 
@@ -138,12 +144,13 @@ _XimLocalCreateIC(
     XIMArg		*values)
 {
     Xic			 ic;
-    XimDefICValues	 ic_values;
+    XimDefICValues	 ic_values={ 0 };
     XIMResourceList	 res;
     unsigned int	 num;
     int			 len;
 
-    if((ic = Xcalloc(1, sizeof(XicRec))) == (Xic)NULL) {
+    ic = Xcalloc(1, sizeof(XicRec));
+    if( ic  == (Xic)NULL) {
 	return ((XIC)NULL);
     }
 
@@ -158,15 +165,15 @@ _XimLocalCreateIC(
 
     num = im->core.ic_num_resources;
     len = sizeof(XIMResource) * num;
-    if((res = Xmalloc(len)) == (XIMResourceList)NULL) {
+    res = Xmalloc(len);
+    if( res  == (XIMResourceList)NULL) {
 	goto Set_Error;
     }
     (void)memcpy((char *)res, (char *)im->core.ic_resources, len);
     ic->private.local.ic_resources     = res;
     ic->private.local.ic_num_resources = num;
 
-    bzero((char *)&ic_values, sizeof(XimDefICValues));
-    if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values,
+     if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values,
 				 im->core.styles, res, num) == False) {
 	goto Set_Error;
     }
@@ -190,10 +197,10 @@ _XimLocalCreateIC(
     return((XIC)ic);
 
 Set_Error :
-    if (ic->private.local.ic_resources) {
-	Xfree(ic->private.local.ic_resources);
-	ic->private.local.ic_resources = NULL;
-    }
+
+    Xfree(ic->private.local.ic_resources);
+     ic->private.local.ic_resources = NULL;
+     
     Xfree(ic);
     return((XIC)NULL);
 }
diff --git a/lib/libX11/modules/im/ximcp/imLcPrs.c b/lib/libX11/modules/im/ximcp/imLcPrs.c
index 795ea7191..ea6d429ad 100644
--- a/lib/libX11/modules/im/ximcp/imLcPrs.c
+++ b/lib/libX11/modules/im/ximcp/imLcPrs.c
@@ -678,7 +678,7 @@ parseline(
 		b->treesize = newsize;
 		/* Re-derive top after realloc() to avoid undefined behaviour
 		   (and crashes on architectures that track pointer bounds). */
-		if (top >= (DTIndex *) old && top < (DTIndex *) &old[oldsize])
+		if (old && top >= (DTIndex *) old && top < (DTIndex *) &old[oldsize])
 		    top = (DTIndex *) (((char *)new) + (((char *)top)-(char *)old));
 	    }
 	    p = &b->tree[b->treeused];
diff --git a/lib/libX11/modules/im/ximcp/imRm.c b/lib/libX11/modules/im/ximcp/imRm.c
index cb9e1b2c5..29f498a1d 100644
--- a/lib/libX11/modules/im/ximcp/imRm.c
+++ b/lib/libX11/modules/im/ximcp/imRm.c
@@ -510,13 +510,21 @@ _XimDefaultResName(
     Xic			  ic = (Xic)parm;
     Xim			  im = (Xim)ic->core.im;
     char		**out;
-
+    char		 *string;
+    
     if(im->core.res_name == (char *)NULL) {
 	return True;
     }
 
+   string=strdup(im->core.res_name);
+   if ( string == NULL)
+	return False;
+    
     out = (char **)((char *)top + info->offset);
-    *out = im->core.res_name;
+
+    Xfree(*out);  /* free old im->core.res_name */
+    *out =string;
+    
     return True;
 }
 
@@ -529,14 +537,22 @@ _XimDefaultResClass(
 {
     Xic			  ic = (Xic)parm;
     Xim			  im = (Xim)ic->core.im;
+    char          *string;
     char		**out;
 
     if(im->core.res_class == (char *)NULL) {
 	return True;
     }
 
+    string=strdup(im->core.res_class);
+    if (string == NULL)
+      return False;
+    
     out = (char **)((char *)top + info->offset);
-    *out = im->core.res_class;
+  
+    Xfree(*out);  /* free old im->core.res_class */
+    *out = string;
+    
     return True;
 }
 
@@ -820,9 +836,8 @@ _XimEncodeString(
     }
 
     out = (char **)((char *)top + info->offset);
-    if(*out) {
-	Xfree(*out);
-    }
+    
+    Xfree(*out);
     *out = string;
     return True;
 }
@@ -1947,7 +1962,7 @@ static const XimICMode ic_mode[] = {
 		0,
 		0},
     {OFFSET_XNSPOTLOCATION,
-		0, /*(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),*/
+		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
 		(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
 		0,
 		(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
diff --git a/lib/libX11/nls/am_ET.UTF-8/Compose.pre b/lib/libX11/nls/am_ET.UTF-8/Compose.pre
index b02f2b8e4..1c8cffbea 100644
--- a/lib/libX11/nls/am_ET.UTF-8/Compose.pre
+++ b/lib/libX11/nls/am_ET.UTF-8/Compose.pre
@@ -2,7 +2,7 @@ XCOMM
 XCOMM UTF-8 (Unicode) compose sequences for the Ethiopian layout.
 XCOMM Designed as part of the OLPC project.
 XCOMM
-XCOMM 2007 Sergey Udaltsov <svu@gnome.org>
+XCOMM Original author: Sergey Udaltsov <svu@gnome.org>, 2007.
 XCOMM
 
 
@@ -14,325 +14,325 @@ XCOMM Group I
 XCOMM
 
 XCOMM Modifier: /u/
-<UFE75> <U1200> : "ሁ" U1201 # key h (base character ሀ)
-<UFE75> <U1208> : "ሉ" U1209 # key l (base character ለ)
-<UFE75> <U1218> : "ሙ" U1219 # key m (base character መ)
-<UFE75> <U1228> : "ሩ" U1229 # key r (base character ረ)
-<UFE75> <U1230> : "ሱ" U1231 # key s (base character ሰ)
-<UFE75> <U1240> : "ቁ" U1241 # key q (base character ቀ)
-<UFE75> <U1260> : "ቡ" U1261 # key b (base character በ)
-<UFE75> <U1270> : "ቱ" U1271 # key t (base character ተ)
-<UFE75> <U1290> : "ኑ" U1291 # key n (base character ነ)
-<UFE75> <U12A0> : "ኡ" U12A1 # key x (base character አ)
-<UFE75> <U12A8> : "ኩ" U12A9 # key k (base character ከ)
-<UFE75> <U12C8> : "ዉ" U12C9 # key w (base character ወ)
-<UFE75> <U12D8> : "ዙ" U12D9 # key z (base character ዘ)
-<UFE75> <U12E8> : "ዩ" U12E9 # key y (base character የ)
-<UFE75> <U12F0> : "ዱ" U12F1 # key d (base character ደ)
-<UFE75> <U1300> : "ጁ" U1301 # key j (base character ጀ)
-<UFE75> <U1308> : "ጉ" U1309 # key g (base character ገ)
-<UFE75> <U1340> : "ፁ" U1341 # key [ (base character ፀ)
-<UFE75> <U1348> : "ፉ" U1349 # key f (base character ፈ)
-<UFE75> <U1350> : "ፑ" U1351 # key p (base character ፐ)
-<UFE75> <U1238> : "ሹ" U1239 # key v (base character ሸ)
-<UFE75> <U1328> : "ጩ" U1329 # key ] (base character ጨ)
+<dead_u> <U1200> : "ሁ" U1201 # key h (base character ሀ)
+<dead_u> <U1208> : "ሉ" U1209 # key l (base character ለ)
+<dead_u> <U1218> : "ሙ" U1219 # key m (base character መ)
+<dead_u> <U1228> : "ሩ" U1229 # key r (base character ረ)
+<dead_u> <U1230> : "ሱ" U1231 # key s (base character ሰ)
+<dead_u> <U1240> : "ቁ" U1241 # key q (base character ቀ)
+<dead_u> <U1260> : "ቡ" U1261 # key b (base character በ)
+<dead_u> <U1270> : "ቱ" U1271 # key t (base character ተ)
+<dead_u> <U1290> : "ኑ" U1291 # key n (base character ነ)
+<dead_u> <U12A0> : "ኡ" U12A1 # key x (base character አ)
+<dead_u> <U12A8> : "ኩ" U12A9 # key k (base character ከ)
+<dead_u> <U12C8> : "ዉ" U12C9 # key w (base character ወ)
+<dead_u> <U12D8> : "ዙ" U12D9 # key z (base character ዘ)
+<dead_u> <U12E8> : "ዩ" U12E9 # key y (base character የ)
+<dead_u> <U12F0> : "ዱ" U12F1 # key d (base character ደ)
+<dead_u> <U1300> : "ጁ" U1301 # key j (base character ጀ)
+<dead_u> <U1308> : "ጉ" U1309 # key g (base character ገ)
+<dead_u> <U1340> : "ፁ" U1341 # key [ (base character ፀ)
+<dead_u> <U1348> : "ፉ" U1349 # key f (base character ፈ)
+<dead_u> <U1350> : "ፑ" U1351 # key p (base character ፐ)
+<dead_u> <U1238> : "ሹ" U1239 # key v (base character ሸ)
+<dead_u> <U1328> : "ጩ" U1329 # key ] (base character ጨ)
 
 XCOMM Modifier: /i/
-<UFE71> <U1200> : "ሂ" U1202 # key h (base character ሀ)
-<UFE71> <U1208> : "ሊ" U120A # key l (base character ለ)
-<UFE71> <U1218> : "ሚ" U121A # key m (base character መ)
-<UFE71> <U1228> : "ሪ" U122A # key r (base character ረ)
-<UFE71> <U1230> : "ሲ" U1232 # key s (base character ሰ)
-<UFE71> <U1240> : "ቂ" U1242 # key q (base character ቀ)
-<UFE71> <U1260> : "ቢ" U1262 # key b (base character በ)
-<UFE71> <U1270> : "ቲ" U1272 # key t (base character ተ)
-<UFE71> <U1290> : "ኒ" U1292 # key n (base character ነ)
-<UFE71> <U12A0> : "ኢ" U12A2 # key x (base character አ)
-<UFE71> <U12A8> : "ኪ" U12AA # key k (base character ከ)
-<UFE71> <U12C8> : "ዊ" U12CA # key w (base character ወ)
-<UFE71> <U12D8> : "ዚ" U12DA # key z (base character ዘ)
-<UFE71> <U12E8> : "ዪ" U12EA # key y (base character የ)
-<UFE71> <U12F0> : "ዲ" U12F2 # key d (base character ደ)
-<UFE71> <U1300> : "ጂ" U1302 # key j (base character ጀ)
-<UFE71> <U1308> : "ጊ" U130A # key g (base character ገ)
-<UFE71> <U1340> : "ፂ" U1342 # key [ (base character ፀ)
-<UFE71> <U1348> : "ፊ" U134A # key f (base character ፈ)
-<UFE71> <U1350> : "ፒ" U1352 # key p (base character ፐ)
-<UFE71> <U1238> : "ሺ" U123A # key v (base character ሸ)
-<UFE71> <U1328> : "ጪ" U132A # key ] (base character ጨ)
+<dead_i> <U1200> : "ሂ" U1202 # key h (base character ሀ)
+<dead_i> <U1208> : "ሊ" U120A # key l (base character ለ)
+<dead_i> <U1218> : "ሚ" U121A # key m (base character መ)
+<dead_i> <U1228> : "ሪ" U122A # key r (base character ረ)
+<dead_i> <U1230> : "ሲ" U1232 # key s (base character ሰ)
+<dead_i> <U1240> : "ቂ" U1242 # key q (base character ቀ)
+<dead_i> <U1260> : "ቢ" U1262 # key b (base character በ)
+<dead_i> <U1270> : "ቲ" U1272 # key t (base character ተ)
+<dead_i> <U1290> : "ኒ" U1292 # key n (base character ነ)
+<dead_i> <U12A0> : "ኢ" U12A2 # key x (base character አ)
+<dead_i> <U12A8> : "ኪ" U12AA # key k (base character ከ)
+<dead_i> <U12C8> : "ዊ" U12CA # key w (base character ወ)
+<dead_i> <U12D8> : "ዚ" U12DA # key z (base character ዘ)
+<dead_i> <U12E8> : "ዪ" U12EA # key y (base character የ)
+<dead_i> <U12F0> : "ዲ" U12F2 # key d (base character ደ)
+<dead_i> <U1300> : "ጂ" U1302 # key j (base character ጀ)
+<dead_i> <U1308> : "ጊ" U130A # key g (base character ገ)
+<dead_i> <U1340> : "ፂ" U1342 # key [ (base character ፀ)
+<dead_i> <U1348> : "ፊ" U134A # key f (base character ፈ)
+<dead_i> <U1350> : "ፒ" U1352 # key p (base character ፐ)
+<dead_i> <U1238> : "ሺ" U123A # key v (base character ሸ)
+<dead_i> <U1328> : "ጪ" U132A # key ] (base character ጨ)
 
 XCOMM Modifier: /a/
-<UFE67> <U1200> : "ሃ" U1203 # key h (base character ሀ)
-<UFE67> <U1208> : "ላ" U120B # key l (base character ለ)
-<UFE67> <U1218> : "ማ" U121B # key m (base character መ)
-<UFE67> <U1228> : "ራ" U122B # key r (base character ረ)
-<UFE67> <U1230> : "ሳ" U1233 # key s (base character ሰ)
-<UFE67> <U1240> : "ቃ" U1243 # key q (base character ቀ)
-<UFE67> <U1260> : "ባ" U1263 # key b (base character በ)
-<UFE67> <U1270> : "ታ" U1273 # key t (base character ተ)
-<UFE67> <U1290> : "ና" U1293 # key n (base character ነ)
-<UFE67> <U12A0> : "ኣ" U12A3 # key x (base character አ)
-<UFE67> <U12A8> : "ካ" U12AB # key k (base character ከ)
-<UFE67> <U12C8> : "ዋ" U12CB # key w (base character ወ)
-<UFE67> <U12D8> : "ዛ" U12DB # key z (base character ዘ)
-<UFE67> <U12E8> : "ያ" U12EB # key y (base character የ)
-<UFE67> <U12F0> : "ዳ" U12F3 # key d (base character ደ)
-<UFE67> <U1300> : "ጃ" U1303 # key j (base character ጀ)
-<UFE67> <U1308> : "ጋ" U130B # key g (base character ገ)
-<UFE67> <U1340> : "ፃ" U1343 # key [ (base character ፀ)
-<UFE67> <U1348> : "ፋ" U134B # key f (base character ፈ)
-<UFE67> <U1350> : "ፓ" U1353 # key p (base character ፐ)
-<UFE67> <U1238> : "ሻ" U123B # key v (base character ሸ)
-<UFE67> <U1328> : "ጫ" U132B # key ] (base character ጨ)
+<dead_a> <U1200> : "ሃ" U1203 # key h (base character ሀ)
+<dead_a> <U1208> : "ላ" U120B # key l (base character ለ)
+<dead_a> <U1218> : "ማ" U121B # key m (base character መ)
+<dead_a> <U1228> : "ራ" U122B # key r (base character ረ)
+<dead_a> <U1230> : "ሳ" U1233 # key s (base character ሰ)
+<dead_a> <U1240> : "ቃ" U1243 # key q (base character ቀ)
+<dead_a> <U1260> : "ባ" U1263 # key b (base character በ)
+<dead_a> <U1270> : "ታ" U1273 # key t (base character ተ)
+<dead_a> <U1290> : "ና" U1293 # key n (base character ነ)
+<dead_a> <U12A0> : "ኣ" U12A3 # key x (base character አ)
+<dead_a> <U12A8> : "ካ" U12AB # key k (base character ከ)
+<dead_a> <U12C8> : "ዋ" U12CB # key w (base character ወ)
+<dead_a> <U12D8> : "ዛ" U12DB # key z (base character ዘ)
+<dead_a> <U12E8> : "ያ" U12EB # key y (base character የ)
+<dead_a> <U12F0> : "ዳ" U12F3 # key d (base character ደ)
+<dead_a> <U1300> : "ጃ" U1303 # key j (base character ጀ)
+<dead_a> <U1308> : "ጋ" U130B # key g (base character ገ)
+<dead_a> <U1340> : "ፃ" U1343 # key [ (base character ፀ)
+<dead_a> <U1348> : "ፋ" U134B # key f (base character ፈ)
+<dead_a> <U1350> : "ፓ" U1353 # key p (base character ፐ)
+<dead_a> <U1238> : "ሻ" U123B # key v (base character ሸ)
+<dead_a> <U1328> : "ጫ" U132B # key ] (base character ጨ)
 
 XCOMM Modifier: /e/
-<UFE69> <U1200> : "ሄ" U1204 # key h (base character ሀ)
-<UFE69> <U1208> : "ሌ" U120C # key l (base character ለ)
-<UFE69> <U1218> : "ሜ" U121C # key m (base character መ)
-<UFE69> <U1228> : "ሬ" U122C # key r (base character ረ)
-<UFE69> <U1230> : "ሴ" U1234 # key s (base character ሰ)
-<UFE69> <U1240> : "ቄ" U1244 # key q (base character ቀ)
-<UFE69> <U1260> : "ቤ" U1264 # key b (base character በ)
-<UFE69> <U1270> : "ቴ" U1274 # key t (base character ተ)
-<UFE69> <U1290> : "ኔ" U1294 # key n (base character ነ)
-<UFE69> <U12A0> : "ኤ" U12A4 # key x (base character አ)
-<UFE69> <U12A8> : "ኬ" U12AC # key k (base character ከ)
-<UFE69> <U12C8> : "ዌ" U12CC # key w (base character ወ)
-<UFE69> <U12D8> : "ዜ" U12DC # key z (base character ዘ)
-<UFE69> <U12E8> : "ዬ" U12EC # key y (base character የ)
-<UFE69> <U12F0> : "ዴ" U12F4 # key d (base character ደ)
-<UFE69> <U1300> : "ጄ" U1304 # key j (base character ጀ)
-<UFE69> <U1308> : "ጌ" U130C # key g (base character ገ)
-<UFE69> <U1340> : "ፄ" U1344 # key [ (base character ፀ)
-<UFE69> <U1348> : "ፌ" U134C # key f (base character ፈ)
-<UFE69> <U1350> : "ፔ" U1354 # key p (base character ፐ)
-<UFE69> <U1238> : "ሼ" U123C # key v (base character ሸ)
-<UFE69> <U1328> : "ጬ" U132C # key ] (base character ጨ)
+<dead_e> <U1200> : "ሄ" U1204 # key h (base character ሀ)
+<dead_e> <U1208> : "ሌ" U120C # key l (base character ለ)
+<dead_e> <U1218> : "ሜ" U121C # key m (base character መ)
+<dead_e> <U1228> : "ሬ" U122C # key r (base character ረ)
+<dead_e> <U1230> : "ሴ" U1234 # key s (base character ሰ)
+<dead_e> <U1240> : "ቄ" U1244 # key q (base character ቀ)
+<dead_e> <U1260> : "ቤ" U1264 # key b (base character በ)
+<dead_e> <U1270> : "ቴ" U1274 # key t (base character ተ)
+<dead_e> <U1290> : "ኔ" U1294 # key n (base character ነ)
+<dead_e> <U12A0> : "ኤ" U12A4 # key x (base character አ)
+<dead_e> <U12A8> : "ኬ" U12AC # key k (base character ከ)
+<dead_e> <U12C8> : "ዌ" U12CC # key w (base character ወ)
+<dead_e> <U12D8> : "ዜ" U12DC # key z (base character ዘ)
+<dead_e> <U12E8> : "ዬ" U12EC # key y (base character የ)
+<dead_e> <U12F0> : "ዴ" U12F4 # key d (base character ደ)
+<dead_e> <U1300> : "ጄ" U1304 # key j (base character ጀ)
+<dead_e> <U1308> : "ጌ" U130C # key g (base character ገ)
+<dead_e> <U1340> : "ፄ" U1344 # key [ (base character ፀ)
+<dead_e> <U1348> : "ፌ" U134C # key f (base character ፈ)
+<dead_e> <U1350> : "ፔ" U1354 # key p (base character ፐ)
+<dead_e> <U1238> : "ሼ" U123C # key v (base character ሸ)
+<dead_e> <U1328> : "ጬ" U132C # key ] (base character ጨ)
 
-XCOMM Modifier: /c/
-<UFE78> <U1200> : "ህ" U1205 # key h (base character ሀ)
-<UFE78> <U1208> : "ል" U120D # key l (base character ለ)
-<UFE78> <U1218> : "ም" U121D # key m (base character መ)
-<UFE78> <U1228> : "ር" U122D # key r (base character ረ)
-<UFE78> <U1230> : "ስ" U1235 # key s (base character ሰ)
-<UFE78> <U1240> : "ቅ" U1245 # key q (base character ቀ)
-<UFE78> <U1260> : "ብ" U1265 # key b (base character በ)
-<UFE78> <U1270> : "ት" U1275 # key t (base character ተ)
-<UFE78> <U1290> : "ን" U1295 # key n (base character ነ)
-<UFE78> <U12A0> : "እ" U12A5 # key x (base character አ)
-<UFE78> <U12A8> : "ክ" U12AD # key k (base character ከ)
-<UFE78> <U12C8> : "ው" U12CD # key w (base character ወ)
-<UFE78> <U12D8> : "ዝ" U12DD # key z (base character ዘ)
-<UFE78> <U12E8> : "ይ" U12ED # key y (base character የ)
-<UFE78> <U12F0> : "ድ" U12F5 # key d (base character ደ)
-<UFE78> <U1300> : "ጅ" U1305 # key j (base character ጀ)
-<UFE78> <U1308> : "ግ" U130D # key g (base character ገ)
-<UFE78> <U1340> : "ፅ" U1345 # key [ (base character ፀ)
-<UFE78> <U1348> : "ፍ" U134D # key f (base character ፈ)
-<UFE78> <U1350> : "ፕ" U1355 # key p (base character ፐ)
-<UFE78> <U1238> : "ሽ" U123D # key v (base character ሸ)
-<UFE78> <U1328> : "ጭ" U132D # key ] (base character ጨ)
+XCOMM Modifier: /C/
+<dead_SCHWA> <U1200> : "ህ" U1205 # key h (base character ሀ)
+<dead_SCHWA> <U1208> : "ል" U120D # key l (base character ለ)
+<dead_SCHWA> <U1218> : "ም" U121D # key m (base character መ)
+<dead_SCHWA> <U1228> : "ር" U122D # key r (base character ረ)
+<dead_SCHWA> <U1230> : "ስ" U1235 # key s (base character ሰ)
+<dead_SCHWA> <U1240> : "ቅ" U1245 # key q (base character ቀ)
+<dead_SCHWA> <U1260> : "ብ" U1265 # key b (base character በ)
+<dead_SCHWA> <U1270> : "ት" U1275 # key t (base character ተ)
+<dead_SCHWA> <U1290> : "ን" U1295 # key n (base character ነ)
+<dead_SCHWA> <U12A0> : "እ" U12A5 # key x (base character አ)
+<dead_SCHWA> <U12A8> : "ክ" U12AD # key k (base character ከ)
+<dead_SCHWA> <U12C8> : "ው" U12CD # key w (base character ወ)
+<dead_SCHWA> <U12D8> : "ዝ" U12DD # key z (base character ዘ)
+<dead_SCHWA> <U12E8> : "ይ" U12ED # key y (base character የ)
+<dead_SCHWA> <U12F0> : "ድ" U12F5 # key d (base character ደ)
+<dead_SCHWA> <U1300> : "ጅ" U1305 # key j (base character ጀ)
+<dead_SCHWA> <U1308> : "ግ" U130D # key g (base character ገ)
+<dead_SCHWA> <U1340> : "ፅ" U1345 # key [ (base character ፀ)
+<dead_SCHWA> <U1348> : "ፍ" U134D # key f (base character ፈ)
+<dead_SCHWA> <U1350> : "ፕ" U1355 # key p (base character ፐ)
+<dead_SCHWA> <U1238> : "ሽ" U123D # key v (base character ሸ)
+<dead_SCHWA> <U1328> : "ጭ" U132D # key ] (base character ጨ)
 
 XCOMM Modifier: /o/
-<UFE73> <U1200> : "ሆ" U1206 # key h (base character ሀ)
-<UFE73> <U1208> : "ሎ" U120E # key l (base character ለ)
-<UFE73> <U1218> : "ሞ" U121E # key m (base character መ)
-<UFE73> <U1228> : "ሮ" U122E # key r (base character ረ)
-<UFE73> <U1230> : "ሶ" U1236 # key s (base character ሰ)
-<UFE73> <U1240> : "ቆ" U1246 # key q (base character ቀ)
-<UFE73> <U1260> : "ቦ" U1266 # key b (base character በ)
-<UFE73> <U1270> : "ቶ" U1276 # key t (base character ተ)
-<UFE73> <U1290> : "ኖ" U1296 # key n (base character ነ)
-<UFE73> <U12A0> : "ኦ" U12A6 # key x (base character አ)
-<UFE73> <U12A8> : "ኮ" U12AE # key k (base character ከ)
-<UFE73> <U12C8> : "ዎ" U12CE # key w (base character ወ)
-<UFE73> <U12D8> : "ዞ" U12DE # key z (base character ዘ)
-<UFE73> <U12E8> : "ዮ" U12EE # key y (base character የ)
-<UFE73> <U12F0> : "ዶ" U12F6 # key d (base character ደ)
-<UFE73> <U1300> : "ጆ" U1306 # key j (base character ጀ)
-<UFE73> <U1308> : "ጎ" U130E # key g (base character ገ)
-<UFE73> <U1340> : "ፆ" U1346 # key [ (base character ፀ)
-<UFE73> <U1348> : "ፎ" U134E # key f (base character ፈ)
-<UFE73> <U1350> : "ፖ" U1356 # key p (base character ፐ)
-<UFE73> <U1238> : "ሾ" U123E # key v (base character ሸ)
-<UFE73> <U1328> : "ጮ" U132E # key ] (base character ጨ)
+<dead_o> <U1200> : "ሆ" U1206 # key h (base character ሀ)
+<dead_o> <U1208> : "ሎ" U120E # key l (base character ለ)
+<dead_o> <U1218> : "ሞ" U121E # key m (base character መ)
+<dead_o> <U1228> : "ሮ" U122E # key r (base character ረ)
+<dead_o> <U1230> : "ሶ" U1236 # key s (base character ሰ)
+<dead_o> <U1240> : "ቆ" U1246 # key q (base character ቀ)
+<dead_o> <U1260> : "ቦ" U1266 # key b (base character በ)
+<dead_o> <U1270> : "ቶ" U1276 # key t (base character ተ)
+<dead_o> <U1290> : "ኖ" U1296 # key n (base character ነ)
+<dead_o> <U12A0> : "ኦ" U12A6 # key x (base character አ)
+<dead_o> <U12A8> : "ኮ" U12AE # key k (base character ከ)
+<dead_o> <U12C8> : "ዎ" U12CE # key w (base character ወ)
+<dead_o> <U12D8> : "ዞ" U12DE # key z (base character ዘ)
+<dead_o> <U12E8> : "ዮ" U12EE # key y (base character የ)
+<dead_o> <U12F0> : "ዶ" U12F6 # key d (base character ደ)
+<dead_o> <U1300> : "ጆ" U1306 # key j (base character ጀ)
+<dead_o> <U1308> : "ጎ" U130E # key g (base character ገ)
+<dead_o> <U1340> : "ፆ" U1346 # key [ (base character ፀ)
+<dead_o> <U1348> : "ፎ" U134E # key f (base character ፈ)
+<dead_o> <U1350> : "ፖ" U1356 # key p (base character ፐ)
+<dead_o> <U1238> : "ሾ" U123E # key v (base character ሸ)
+<dead_o> <U1328> : "ጮ" U132E # key ] (base character ጨ)
 
 XCOMM Modifier: /A/
-<UFE68> <U1208> : "ሏ" U120F # key l (base character ለ)
-<UFE68> <U1218> : "ሟ" U121F # key m (base character መ)
-<UFE68> <U1228> : "ሯ" U122F # key r (base character ረ)
-<UFE68> <U1230> : "ሷ" U1237 # key s (base character ሰ)
-<UFE68> <U1240> : "ቋ" U124B # key q (base character ቀ)
-<UFE68> <U1260> : "ቧ" U1267 # key b (base character በ)
-<UFE68> <U1270> : "ቷ" U1277 # key t (base character ተ)
-<UFE68> <U1290> : "ኗ" U1297 # key n (base character ነ)
-<UFE68> <U12A0> : "ኧ" U12A7 # key x (base character አ)
-<UFE68> <U12A8> : "ኳ" U12B3 # key k (base character ከ)
-<UFE68> <U12D8> : "ዟ" U12DF # key z (base character ዘ)
-<UFE68> <U12F0> : "ዷ" U12F7 # key d (base character ደ)
-<UFE68> <U1300> : "ጇ" U1307 # key j (base character ጀ)
-<UFE68> <U1308> : "ጓ" U1313 # key g (base character ገ)
-<UFE68> <U1348> : "ፏ" U134F # key f (base character ፈ)
-<UFE68> <U1350> : "ፗ" U1357 # key p (base character ፐ)
-<UFE68> <U1238> : "ሿ" U123F # key v (base character ሸ)
-<UFE68> <U1328> : "ጯ" U132F # key ] (base character ጨ)
+<dead_A> <U1208> : "ሏ" U120F # key l (base character ለ)
+<dead_A> <U1218> : "ሟ" U121F # key m (base character መ)
+<dead_A> <U1228> : "ሯ" U122F # key r (base character ረ)
+<dead_A> <U1230> : "ሷ" U1237 # key s (base character ሰ)
+<dead_A> <U1240> : "ቋ" U124B # key q (base character ቀ)
+<dead_A> <U1260> : "ቧ" U1267 # key b (base character በ)
+<dead_A> <U1270> : "ቷ" U1277 # key t (base character ተ)
+<dead_A> <U1290> : "ኗ" U1297 # key n (base character ነ)
+<dead_A> <U12A0> : "ኧ" U12A7 # key x (base character አ)
+<dead_A> <U12A8> : "ኳ" U12B3 # key k (base character ከ)
+<dead_A> <U12D8> : "ዟ" U12DF # key z (base character ዘ)
+<dead_A> <U12F0> : "ዷ" U12F7 # key d (base character ደ)
+<dead_A> <U1300> : "ጇ" U1307 # key j (base character ጀ)
+<dead_A> <U1308> : "ጓ" U1313 # key g (base character ገ)
+<dead_A> <U1348> : "ፏ" U134F # key f (base character ፈ)
+<dead_A> <U1350> : "ፗ" U1357 # key p (base character ፐ)
+<dead_A> <U1238> : "ሿ" U123F # key v (base character ሸ)
+<dead_A> <U1328> : "ጯ" U132F # key ] (base character ጨ)
 
 XCOMM Modifier: /U/
-<UFE76> <U1240> : "ቍ" U124D # key q (base character ቀ)
-<UFE76> <U12A8> : "ኵ" U12B5 # key k (base character ከ)
-<UFE76> <U1308> : "ጕ" U1315 # key g (base character ገ)
+<dead_U> <U1240> : "ቍ" U124D # key q (base character ቀ)
+<dead_U> <U12A8> : "ኵ" U12B5 # key k (base character ከ)
+<dead_U> <U1308> : "ጕ" U1315 # key g (base character ገ)
 
 XCOMM Modifier: /I/
-<UFE72> <U1240> : "ቊ" U124A # key q (base character ቀ)
-<UFE72> <U12A8> : "ኲ" U12B2 # key k (base character ከ)
-<UFE72> <U1308> : "ጒ" U1312 # key g (base character ገ)
+<dead_I> <U1240> : "ቊ" U124A # key q (base character ቀ)
+<dead_I> <U12A8> : "ኲ" U12B2 # key k (base character ከ)
+<dead_I> <U1308> : "ጒ" U1312 # key g (base character ገ)
 
 XCOMM Modifier: /E/
-<UFE70> <U1240> : "ቌ" U124C # key q (base character ቀ)
-<UFE70> <U12A8> : "ኴ" U12B4 # key k (base character ከ)
-<UFE70> <U1308> : "ጔ" U1314 # key g (base character ገ)
+<dead_E> <U1240> : "ቌ" U124C # key q (base character ቀ)
+<dead_E> <U12A8> : "ኴ" U12B4 # key k (base character ከ)
+<dead_E> <U1308> : "ጔ" U1314 # key g (base character ገ)
 
 XCOMM Modifier: /O/
-<UFE74> <U1240> : "ቈ" U1248 # key q (base character ቀ)
-<UFE74> <U12A8> : "ኰ" U12B0 # key k (base character ከ)
-<UFE74> <U1308> : "ጐ" U1310 # key g (base character ገ)
+<dead_O> <U1240> : "ቈ" U1248 # key q (base character ቀ)
+<dead_O> <U12A8> : "ኰ" U12B0 # key k (base character ከ)
+<dead_O> <U1308> : "ጐ" U1310 # key g (base character ገ)
 
 XCOMM
 XCOMM Group II
 XCOMM
 
 XCOMM Modifier: /u/
-<UFE75> <U1210> : "ሑ" U1211 # key h (base character ሐ)
-<UFE75> <U1220> : "ሡ" U1221 # key s (base character ሠ)
-<UFE75> <U1250> : "ቑ" U1251 # key q (base character ቐ)
-<UFE75> <U1278> : "ቹ" U1279 # key c (base character ቸ)
-<UFE75> <U1320> : "ጡ" U1321 # key t (base character ጠ)
-<UFE75> <U1298> : "ኙ" U1299 # key n (base character ኘ)
-<UFE75> <U12D0> : "ዑ" U12D1 # key x (base character ዐ)
-<UFE75> <U12B8> : "ኹ" U12B9 # key k (base character ኸ)
-<UFE75> <U12E0> : "ዡ" U12E1 # key z (base character ዠ)
-<UFE75> <U12F8> : "ዹ" U12F9 # key d (base character ዸ)
-<UFE75> <U1318> : "ጙ" U1319 # key g (base character ጘ)
-<UFE75> <U1338> : "ጹ" U1339 # key [ (base character ጸ)
-<UFE75> <U1330> : "ጱ" U1331 # key p (base character ጰ)
-<UFE75> <U1280> : "ኁ" U1281 # key ] (base character ኀ)
-<UFE75> <U1268> : "ቩ" U1269 # key v (base character ቨ)
+<dead_u> <U1210> : "ሑ" U1211 # key h (base character ሐ)
+<dead_u> <U1220> : "ሡ" U1221 # key s (base character ሠ)
+<dead_u> <U1250> : "ቑ" U1251 # key q (base character ቐ)
+<dead_u> <U1278> : "ቹ" U1279 # key c (base character ቸ)
+<dead_u> <U1320> : "ጡ" U1321 # key t (base character ጠ)
+<dead_u> <U1298> : "ኙ" U1299 # key n (base character ኘ)
+<dead_u> <U12D0> : "ዑ" U12D1 # key x (base character ዐ)
+<dead_u> <U12B8> : "ኹ" U12B9 # key k (base character ኸ)
+<dead_u> <U12E0> : "ዡ" U12E1 # key z (base character ዠ)
+<dead_u> <U12F8> : "ዹ" U12F9 # key d (base character ዸ)
+<dead_u> <U1318> : "ጙ" U1319 # key g (base character ጘ)
+<dead_u> <U1338> : "ጹ" U1339 # key [ (base character ጸ)
+<dead_u> <U1330> : "ጱ" U1331 # key p (base character ጰ)
+<dead_u> <U1280> : "ኁ" U1281 # key ] (base character ኀ)
+<dead_u> <U1268> : "ቩ" U1269 # key v (base character ቨ)
 
 XCOMM Modifier: /i/
-<UFE71> <U1210> : "ሒ" U1212 # key h (base character ሐ)
-<UFE71> <U1220> : "ሢ" U1222 # key s (base character ሠ)
-<UFE71> <U1250> : "ቒ" U1252 # key q (base character ቐ)
-<UFE71> <U1278> : "ቺ" U127A # key c (base character ቸ)
-<UFE71> <U1320> : "ጢ" U1322 # key t (base character ጠ)
-<UFE71> <U1298> : "ኚ" U129A # key n (base character ኘ)
-<UFE71> <U12D0> : "ዒ" U12D2 # key x (base character ዐ)
-<UFE71> <U12B8> : "ኺ" U12BA # key k (base character ኸ)
-<UFE71> <U12E0> : "ዢ" U12E2 # key z (base character ዠ)
-<UFE71> <U12F8> : "ዺ" U12FA # key d (base character ዸ)
-<UFE71> <U1318> : "ጚ" U131A # key g (base character ጘ)
-<UFE71> <U1338> : "ጺ" U133A # key [ (base character ጸ)
-<UFE71> <U1330> : "ጲ" U1332 # key p (base character ጰ)
-<UFE71> <U1280> : "ኂ" U1282 # key ] (base character ኀ)
-<UFE71> <U1268> : "ቪ" U126A # key v (base character ቨ)
+<dead_i> <U1210> : "ሒ" U1212 # key h (base character ሐ)
+<dead_i> <U1220> : "ሢ" U1222 # key s (base character ሠ)
+<dead_i> <U1250> : "ቒ" U1252 # key q (base character ቐ)
+<dead_i> <U1278> : "ቺ" U127A # key c (base character ቸ)
+<dead_i> <U1320> : "ጢ" U1322 # key t (base character ጠ)
+<dead_i> <U1298> : "ኚ" U129A # key n (base character ኘ)
+<dead_i> <U12D0> : "ዒ" U12D2 # key x (base character ዐ)
+<dead_i> <U12B8> : "ኺ" U12BA # key k (base character ኸ)
+<dead_i> <U12E0> : "ዢ" U12E2 # key z (base character ዠ)
+<dead_i> <U12F8> : "ዺ" U12FA # key d (base character ዸ)
+<dead_i> <U1318> : "ጚ" U131A # key g (base character ጘ)
+<dead_i> <U1338> : "ጺ" U133A # key [ (base character ጸ)
+<dead_i> <U1330> : "ጲ" U1332 # key p (base character ጰ)
+<dead_i> <U1280> : "ኂ" U1282 # key ] (base character ኀ)
+<dead_i> <U1268> : "ቪ" U126A # key v (base character ቨ)
 
 XCOMM Modifier: /a/
-<UFE67> <U1210> : "ሓ" U1213 # key h (base character ሐ)
-<UFE67> <U1220> : "ሣ" U1223 # key s (base character ሠ)
-<UFE67> <U1250> : "ቓ" U1253 # key q (base character ቐ)
-<UFE67> <U1278> : "ቻ" U127B # key c (base character ቸ)
-<UFE67> <U1320> : "ጣ" U1323 # key t (base character ጠ)
-<UFE67> <U1298> : "ኛ" U129B # key n (base character ኘ)
-<UFE67> <U12D0> : "ዓ" U12D3 # key x (base character ዐ)
-<UFE67> <U12B8> : "ኻ" U12BB # key k (base character ኸ)
-<UFE67> <U12E0> : "ዣ" U12E3 # key z (base character ዠ)
-<UFE67> <U12F8> : "ዻ" U12FB # key d (base character ዸ)
-<UFE67> <U1318> : "ጛ" U131B # key g (base character ጘ)
-<UFE67> <U1338> : "ጻ" U133B # key [ (base character ጸ)
-<UFE67> <U1330> : "ጳ" U1333 # key p (base character ጰ)
-<UFE67> <U1280> : "ኃ" U1283 # key ] (base character ኀ)
-<UFE67> <U1268> : "ቫ" U126B # key v (base character ቨ)
+<dead_a> <U1210> : "ሓ" U1213 # key h (base character ሐ)
+<dead_a> <U1220> : "ሣ" U1223 # key s (base character ሠ)
+<dead_a> <U1250> : "ቓ" U1253 # key q (base character ቐ)
+<dead_a> <U1278> : "ቻ" U127B # key c (base character ቸ)
+<dead_a> <U1320> : "ጣ" U1323 # key t (base character ጠ)
+<dead_a> <U1298> : "ኛ" U129B # key n (base character ኘ)
+<dead_a> <U12D0> : "ዓ" U12D3 # key x (base character ዐ)
+<dead_a> <U12B8> : "ኻ" U12BB # key k (base character ኸ)
+<dead_a> <U12E0> : "ዣ" U12E3 # key z (base character ዠ)
+<dead_a> <U12F8> : "ዻ" U12FB # key d (base character ዸ)
+<dead_a> <U1318> : "ጛ" U131B # key g (base character ጘ)
+<dead_a> <U1338> : "ጻ" U133B # key [ (base character ጸ)
+<dead_a> <U1330> : "ጳ" U1333 # key p (base character ጰ)
+<dead_a> <U1280> : "ኃ" U1283 # key ] (base character ኀ)
+<dead_a> <U1268> : "ቫ" U126B # key v (base character ቨ)
 
 XCOMM Modifier: /e/
-<UFE69> <U1210> : "ሔ" U1214 # key h (base character ሐ)
-<UFE69> <U1220> : "ሤ" U1224 # key s (base character ሠ)
-<UFE69> <U1250> : "ቔ" U1254 # key q (base character ቐ)
-<UFE69> <U1278> : "ቼ" U127C # key c (base character ቸ)
-<UFE69> <U1320> : "ጤ" U1324 # key t (base character ጠ)
-<UFE69> <U1298> : "ኜ" U129C # key n (base character ኘ)
-<UFE69> <U12D0> : "ዔ" U12D4 # key x (base character ዐ)
-<UFE69> <U12B8> : "ኼ" U12BC # key k (base character ኸ)
-<UFE69> <U12E0> : "ዤ" U12E4 # key z (base character ዠ)
-<UFE69> <U12F8> : "ዼ" U12FC # key d (base character ዸ)
-<UFE69> <U1318> : "ጜ" U131C # key g (base character ጘ)
-<UFE69> <U1338> : "ጼ" U133C # key [ (base character ጸ)
-<UFE69> <U1330> : "ጴ" U1334 # key p (base character ጰ)
-<UFE69> <U1280> : "ኄ" U1284 # key ] (base character ኀ)
-<UFE69> <U1268> : "ቬ" U126C # key v (base character ቨ)
+<dead_e> <U1210> : "ሔ" U1214 # key h (base character ሐ)
+<dead_e> <U1220> : "ሤ" U1224 # key s (base character ሠ)
+<dead_e> <U1250> : "ቔ" U1254 # key q (base character ቐ)
+<dead_e> <U1278> : "ቼ" U127C # key c (base character ቸ)
+<dead_e> <U1320> : "ጤ" U1324 # key t (base character ጠ)
+<dead_e> <U1298> : "ኜ" U129C # key n (base character ኘ)
+<dead_e> <U12D0> : "ዔ" U12D4 # key x (base character ዐ)
+<dead_e> <U12B8> : "ኼ" U12BC # key k (base character ኸ)
+<dead_e> <U12E0> : "ዤ" U12E4 # key z (base character ዠ)
+<dead_e> <U12F8> : "ዼ" U12FC # key d (base character ዸ)
+<dead_e> <U1318> : "ጜ" U131C # key g (base character ጘ)
+<dead_e> <U1338> : "ጼ" U133C # key [ (base character ጸ)
+<dead_e> <U1330> : "ጴ" U1334 # key p (base character ጰ)
+<dead_e> <U1280> : "ኄ" U1284 # key ] (base character ኀ)
+<dead_e> <U1268> : "ቬ" U126C # key v (base character ቨ)
 
-XCOMM Modifier: /c/
-<UFE78> <U1210> : "ሕ" U1215 # key h (base character ሐ)
-<UFE78> <U1220> : "ሥ" U1225 # key s (base character ሠ)
-<UFE78> <U1250> : "ቕ" U1255 # key q (base character ቐ)
-<UFE78> <U1278> : "ች" U127D # key c (base character ቸ)
-<UFE78> <U1320> : "ጥ" U1325 # key t (base character ጠ)
-<UFE78> <U1298> : "ኝ" U129D # key n (base character ኘ)
-<UFE78> <U12D0> : "ዕ" U12D5 # key x (base character ዐ)
-<UFE78> <U12B8> : "ኽ" U12BD # key k (base character ኸ)
-<UFE78> <U12E0> : "ዥ" U12E5 # key z (base character ዠ)
-<UFE78> <U12F8> : "ዽ" U12FD # key d (base character ዸ)
-<UFE78> <U1318> : "ጝ" U131D # key g (base character ጘ)
-<UFE78> <U1338> : "ጽ" U133D # key [ (base character ጸ)
-<UFE78> <U1330> : "ጵ" U1335 # key p (base character ጰ)
-<UFE78> <U1280> : "ኅ" U1285 # key ] (base character ኀ)
-<UFE78> <U1268> : "ቭ" U126D # key v (base character ቨ)
+XCOMM Modifier: /C/
+<dead_SCHWA> <U1210> : "ሕ" U1215 # key h (base character ሐ)
+<dead_SCHWA> <U1220> : "ሥ" U1225 # key s (base character ሠ)
+<dead_SCHWA> <U1250> : "ቕ" U1255 # key q (base character ቐ)
+<dead_SCHWA> <U1278> : "ች" U127D # key c (base character ቸ)
+<dead_SCHWA> <U1320> : "ጥ" U1325 # key t (base character ጠ)
+<dead_SCHWA> <U1298> : "ኝ" U129D # key n (base character ኘ)
+<dead_SCHWA> <U12D0> : "ዕ" U12D5 # key x (base character ዐ)
+<dead_SCHWA> <U12B8> : "ኽ" U12BD # key k (base character ኸ)
+<dead_SCHWA> <U12E0> : "ዥ" U12E5 # key z (base character ዠ)
+<dead_SCHWA> <U12F8> : "ዽ" U12FD # key d (base character ዸ)
+<dead_SCHWA> <U1318> : "ጝ" U131D # key g (base character ጘ)
+<dead_SCHWA> <U1338> : "ጽ" U133D # key [ (base character ጸ)
+<dead_SCHWA> <U1330> : "ጵ" U1335 # key p (base character ጰ)
+<dead_SCHWA> <U1280> : "ኅ" U1285 # key ] (base character ኀ)
+<dead_SCHWA> <U1268> : "ቭ" U126D # key v (base character ቨ)
 
 XCOMM Modifier: /o/
-<UFE73> <U1210> : "ሖ" U1216 # key h (base character ሐ)
-<UFE73> <U1220> : "ሦ" U1226 # key s (base character ሠ)
-<UFE73> <U1250> : "ቖ" U1256 # key q (base character ቐ)
-<UFE73> <U1278> : "ቾ" U127E # key c (base character ቸ)
-<UFE73> <U1320> : "ጦ" U1326 # key t (base character ጠ)
-<UFE73> <U1298> : "ኞ" U129E # key n (base character ኘ)
-<UFE73> <U12D0> : "ዖ" U12D6 # key x (base character ዐ)
-<UFE73> <U12B8> : "ኾ" U12BE # key k (base character ኸ)
-<UFE73> <U12E0> : "ዦ" U12E6 # key z (base character ዠ)
-<UFE73> <U12F8> : "ዾ" U12FE # key d (base character ዸ)
-<UFE73> <U1318> : "ጞ" U131E # key g (base character ጘ)
-<UFE73> <U1338> : "ጾ" U133E # key [ (base character ጸ)
-<UFE73> <U1330> : "ጶ" U1336 # key p (base character ጰ)
-<UFE73> <U1280> : "ኆ" U1286 # key ] (base character ኀ)
-<UFE73> <U1268> : "ቮ" U126E # key v (base character ቨ)
+<dead_o> <U1210> : "ሖ" U1216 # key h (base character ሐ)
+<dead_o> <U1220> : "ሦ" U1226 # key s (base character ሠ)
+<dead_o> <U1250> : "ቖ" U1256 # key q (base character ቐ)
+<dead_o> <U1278> : "ቾ" U127E # key c (base character ቸ)
+<dead_o> <U1320> : "ጦ" U1326 # key t (base character ጠ)
+<dead_o> <U1298> : "ኞ" U129E # key n (base character ኘ)
+<dead_o> <U12D0> : "ዖ" U12D6 # key x (base character ዐ)
+<dead_o> <U12B8> : "ኾ" U12BE # key k (base character ኸ)
+<dead_o> <U12E0> : "ዦ" U12E6 # key z (base character ዠ)
+<dead_o> <U12F8> : "ዾ" U12FE # key d (base character ዸ)
+<dead_o> <U1318> : "ጞ" U131E # key g (base character ጘ)
+<dead_o> <U1338> : "ጾ" U133E # key [ (base character ጸ)
+<dead_o> <U1330> : "ጶ" U1336 # key p (base character ጰ)
+<dead_o> <U1280> : "ኆ" U1286 # key ] (base character ኀ)
+<dead_o> <U1268> : "ቮ" U126E # key v (base character ቨ)
 
 XCOMM Modifier: /A/
-<UFE68> <U1210> : "ሗ" U1217 # key h (base character ሐ)
-<UFE68> <U1220> : "ሧ" U1227 # key s (base character ሠ)
-<UFE68> <U1250> : "ቛ" U125B # key q (base character ቐ)
-<UFE68> <U1278> : "ቿ" U127F # key c (base character ቸ)
-<UFE68> <U1320> : "ጧ" U1327 # key t (base character ጠ)
-<UFE68> <U1298> : "ኟ" U129F # key n (base character ኘ)
-<UFE68> <U12B8> : "ዃ" U12C3 # key k (base character ኸ)
-<UFE68> <U12E0> : "ዧ" U12E7 # key z (base character ዠ)
-<UFE68> <U12F8> : "ዿ" U12FF # key d (base character ዸ)
-<UFE68> <U1338> : "ጿ" U133F # key [ (base character ጸ)
-<UFE68> <U1330> : "ጷ" U1337 # key p (base character ጰ)
-<UFE68> <U1280> : "ኋ" U128B # key ] (base character ኀ)
-<UFE68> <U1268> : "ቯ" U126F # key v (base character ቨ)
+<dead_A> <U1210> : "ሗ" U1217 # key h (base character ሐ)
+<dead_A> <U1220> : "ሧ" U1227 # key s (base character ሠ)
+<dead_A> <U1250> : "ቛ" U125B # key q (base character ቐ)
+<dead_A> <U1278> : "ቿ" U127F # key c (base character ቸ)
+<dead_A> <U1320> : "ጧ" U1327 # key t (base character ጠ)
+<dead_A> <U1298> : "ኟ" U129F # key n (base character ኘ)
+<dead_A> <U12B8> : "ዃ" U12C3 # key k (base character ኸ)
+<dead_A> <U12E0> : "ዧ" U12E7 # key z (base character ዠ)
+<dead_A> <U12F8> : "ዿ" U12FF # key d (base character ዸ)
+<dead_A> <U1338> : "ጿ" U133F # key [ (base character ጸ)
+<dead_A> <U1330> : "ጷ" U1337 # key p (base character ጰ)
+<dead_A> <U1280> : "ኋ" U128B # key ] (base character ኀ)
+<dead_A> <U1268> : "ቯ" U126F # key v (base character ቨ)
 
 XCOMM Modifier: /U/
-<UFE76> <U1250> : "ቝ" U125D # key q (base character ቐ)
-<UFE76> <U12B8> : "ዅ" U12C5 # key k (base character ኸ)
+<dead_U> <U1250> : "ቝ" U125D # key q (base character ቐ)
+<dead_U> <U12B8> : "ዅ" U12C5 # key k (base character ኸ)
 
 XCOMM Modifier: /I/
-<UFE72> <U1250> : "ቚ" U125A # key q (base character ቐ)
-<UFE72> <U12B8> : "ዂ" U12C2 # key k (base character ኸ)
+<dead_I> <U1250> : "ቚ" U125A # key q (base character ቐ)
+<dead_I> <U12B8> : "ዂ" U12C2 # key k (base character ኸ)
 
 XCOMM Modifier: /E/
-<UFE70> <U1250> : "ቜ" U125C # key q (base character ቐ)
-<UFE70> <U12B8> : "ዄ" U12C4 # key k (base character ኸ)
+<dead_E> <U1250> : "ቜ" U125C # key q (base character ቐ)
+<dead_E> <U12B8> : "ዄ" U12C4 # key k (base character ኸ)
 
 XCOMM Modifier: /O/
-<UFE74> <U1250> : "ቘ" U1258 # key q (base character ቐ)
-<UFE74> <U12B8> : "ዀ" U12C0 # key k (base character ኸ)
+<dead_O> <U1250> : "ቘ" U1258 # key q (base character ቐ)
+<dead_O> <U12B8> : "ዀ" U12C0 # key k (base character ኸ)
 
 XCOMM
 XCOMM Group III
diff --git a/lib/libX11/nls/compose.dir.pre b/lib/libX11/nls/compose.dir.pre
index 4ce1ee344..89239453c 100644
--- a/lib/libX11/nls/compose.dir.pre
+++ b/lib/libX11/nls/compose.dir.pre
@@ -430,8 +430,8 @@ en_US.UTF-8/Compose:		si_LK.UTF-8
 en_US.UTF-8/Compose:		sk_SK.UTF-8
 en_US.UTF-8/Compose:		sl_SI.UTF-8
 en_US.UTF-8/Compose:		sq_AL.UTF-8
-en_US.UTF-8/Compose:		sr_ME.UTF-8
-en_US.UTF-8/Compose:		sr_RS.UTF-8
+sr_RS.UTF-8/Compose:		sr_ME.UTF-8
+sr_RS.UTF-8/Compose:		sr_RS.UTF-8
 en_US.UTF-8/Compose:		ss_ZA.UTF-8
 en_US.UTF-8/Compose:		st_ZA.UTF-8
 en_US.UTF-8/Compose:		sv_FI.UTF-8
diff --git a/lib/libX11/nls/en_US.UTF-8/Compose.pre b/lib/libX11/nls/en_US.UTF-8/Compose.pre
index ea87d8424..680f4faba 100644
--- a/lib/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/lib/libX11/nls/en_US.UTF-8/Compose.pre
@@ -14,6 +14,8 @@ XCOMM Spacing versions of accents (mostly)
 <dead_grave> <dead_grave>		: "`"	grave # GRAVE ACCENT
 <dead_circumflex> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 <dead_circumflex> <dead_circumflex>	: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <greater> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <space> <greater>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 <dead_abovering> <space>		: "°"	degree # DEGREE SIGN
 <dead_abovering> <dead_abovering>	: "°"	degree # DEGREE SIGN
 <Multi_key> <o> <o>			: "°"	degree # DEGREE SIGN
@@ -22,13 +24,14 @@ XCOMM Spacing versions of accents (mostly)
 <dead_macron> <space>			: "¯"	macron # MACRON
 <dead_macron> <dead_macron>		: "¯"	macron # MACRON
 <Multi_key> <minus> <asciicircum>	: "¯"	macron # MACRON
-<Multi_key> <asciicircum> <minus>	: "¯"	macron # MACRON
+<Multi_key> <underscore> <space>	: "¯"	macron # MACRON
+<Multi_key> <space> <underscore>	: "¯"	macron # MACRON
 <Multi_key> <underscore> <underscore>	: "¯"	macron # MACRON
 <Multi_key> <underscore> <asciicircum>	: "¯"	macron # MACRON
 <dead_breve> <space>			: "˘"	breve # BREVE
 <dead_breve> <dead_breve>		: "˘"	breve # BREVE
-<Multi_key> <space> <parenleft>		: "˘"	breve # BREVE
 <Multi_key> <parenleft> <space>		: "˘"	breve # BREVE
+<Multi_key> <space> <parenleft>		: "˘"	breve # BREVE
 <dead_abovedot> <space>			: "˙"	abovedot # DOT ABOVE
 <dead_abovedot> <dead_abovedot>		: "˙"	abovedot # DOT ABOVE
 <Multi_key> <period> <space>		: "˙"	abovedot # DOT ABOVE
@@ -40,8 +43,8 @@ XCOMM Spacing versions of accents (mostly)
 <dead_doubleacute> <dead_doubleacute>	: "˝"	U2dd # DOUBLE ACUTE ACCENT
 <dead_caron> <space>			: "ˇ"	caron # CARON
 <dead_caron> <dead_caron>		: "ˇ"	caron # CARON
-<Multi_key> <space> <less>		: "ˇ"	caron # CARON
 <Multi_key> <less> <space>		: "ˇ"	caron # CARON
+<Multi_key> <space> <less>		: "ˇ"	caron # CARON
 <dead_cedilla> <space>			: "¸"	cedilla # CEDILLA
 <dead_cedilla> <dead_cedilla>		: "¸"	cedilla # CEDILLA
 <Multi_key> <comma> <space>		: "¸"	cedilla # CEDILLA
@@ -56,17 +59,17 @@ XCOMM Spacing versions of accents (mostly)
 XCOMM ASCII characters that may be difficult to access on some keyboards.
 <Multi_key> <plus> <plus>		: "#"	numbersign # NUMBER SIGN
 <Multi_key> <A> <T>			: "@"	at # COMMERCIAL AT
+
 <Multi_key> <parenleft> <parenleft>	: "["	bracketleft # LEFT SQUARE BRACKET
-<Multi_key> <slash> <slash>		: "\\"	backslash # REVERSE SOLIDUS
-<Multi_key> <slash> <less>		: "\\"	backslash # REVERSE SOLIDUS
-<Multi_key> <less> <slash>		: "\\"	backslash # REVERSE SOLIDUS
 <Multi_key> <parenright> <parenright>	: "]"	bracketright # RIGHT SQUARE BRACKET
 
-<Multi_key> <greater> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
-<Multi_key> <space> <greater>		: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <slash> <slash>		: "\\"	backslash # REVERSE SOLIDUS
+<Multi_key> <slash> <less>		: "\\"	backslash # REVERSE SOLIDUS
 
 <Multi_key> <parenleft> <minus>		: "{"	braceleft # LEFT CURLY BRACKET
 <Multi_key> <minus> <parenleft>		: "{"	braceleft # LEFT CURLY BRACKET
+<Multi_key> <parenright> <minus>	: "}"	braceright # RIGHT CURLY BRACKET
+<Multi_key> <minus> <parenright>	: "}"	braceright # RIGHT CURLY BRACKET
 
 <Multi_key> <slash> <asciicircum>	: "|"	bar # VERTICAL LINE
 <Multi_key> <asciicircum> <slash>	: "|"	bar # VERTICAL LINE
@@ -75,9 +78,6 @@ XCOMM ASCII characters that may be difficult to access on some keyboards.
 <Multi_key> <v> <l>			: "|"	bar # VERTICAL LINE
 <Multi_key> <l> <v>			: "|"	bar # VERTICAL LINE
 
-<Multi_key> <parenright> <minus>	: "}"	braceright # RIGHT CURLY BRACKET
-<Multi_key> <minus> <parenright>	: "}"	braceright # RIGHT CURLY BRACKET
-
 <Multi_key> <L> <T>			: "<"	less # LESS-THAN
 <Multi_key> <l> <t>			: "<"	less # LESS-THAN
 <Multi_key> <G> <T>			: ">"	greater # GREATER-THAN
@@ -88,17 +88,11 @@ XCOMM Two special spaces
 <Multi_key> <space> <period>		: " "	U2008 # PUNCTUATION SPACE
 
 <Multi_key> <o> <c>			: "©"	copyright # COPYRIGHT SIGN
-<Multi_key> <o> <C>			: "©"	copyright # COPYRIGHT SIGN
-<Multi_key> <O> <c>			: "©"	copyright # COPYRIGHT SIGN
 <Multi_key> <O> <C>			: "©"	copyright # COPYRIGHT SIGN
-<Multi_key> <C> <o>			: "©"	copyright # COPYRIGHT SIGN
 <Multi_key> <C> <O>			: "©"	copyright # COPYRIGHT SIGN
 
 <Multi_key> <o> <r>			: "®"	registered # REGISTERED SIGN
-<Multi_key> <o> <R>			: "®"	registered # REGISTERED SIGN
-<Multi_key> <O> <r>			: "®"	registered # REGISTERED SIGN
 <Multi_key> <O> <R>			: "®"	registered # REGISTERED SIGN
-<Multi_key> <R> <o>			: "®"	registered # REGISTERED SIGN
 <Multi_key> <R> <O>			: "®"	registered # REGISTERED SIGN
 
 <Multi_key> <parenleft> <parenright> <parenright>: "🄯"	U1F12F # COPYLEFT SYMBOL
@@ -118,6 +112,8 @@ XCOMM Special punctuation
 <Multi_key> <exclam> <question>		: "‽"	U203D # INTERROBANG
 <Multi_key> <question> <exclam>		: "⸘"	U2E18 # INVERTED INTERROBANG
 <Multi_key> <minus> <minus> <space>	: "­"	U00ad # SOFT HYPHEN
+<Multi_key> <bar> <minus>		: "†"	U2020 # DAGGER
+<Multi_key> <bar> <equal>		: "‡"	U2021 # DOUBLE DAGGER
 <Multi_key> <percent> <o>		: "‰"	U2030 # PER MILLE SIGN
 
 XCOMM Some ligatures
@@ -139,8 +135,8 @@ XCOMM Some ligatures
 XCOMM Quotation marks
 <Multi_key> <less> <less>		: "«"	guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 <Multi_key> <greater> <greater>		: "»"	guillemotright # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-<Multi_key> <period> <greater>		: "›"	U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 <Multi_key> <period> <less>		: "‹"	U2039 # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+<Multi_key> <period> <greater>		: "›"	U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 <Multi_key> <less> <apostrophe>		: "‘"	U2018 # LEFT SINGLE QUOTATION MARK
 <Multi_key> <apostrophe> <less>		: "‘"	U2018 # LEFT SINGLE QUOTATION MARK
 <Multi_key> <greater> <apostrophe>	: "’"	U2019 # RIGHT SINGLE QUOTATION MARK
@@ -155,6 +151,22 @@ XCOMM Quotation marks
 <Multi_key> <quotedbl> <comma>		: "„"	U201e # DOUBLE LOW-9 QUOTATION MARK
 
 XCOMM Currencies
+<Multi_key> <S> <bar>			: "$"	dollar # DOLLAR SIGN
+<Multi_key> <bar> <S>			: "$"	dollar # DOLLAR SIGN
+<Multi_key> <c> <bar>			: "¢"	cent # CENT SIGN
+<Multi_key> <bar> <c>			: "¢"	cent # CENT SIGN
+<Multi_key> <c> <slash>			: "¢"	cent # CENT SIGN
+<Multi_key> <slash> <c>			: "¢"	cent # CENT SIGN
+<Multi_key> <L> <minus>			: "£"	sterling # POUND SIGN
+<Multi_key> <minus> <L>			: "£"	sterling # POUND SIGN
+<Multi_key> <l> <minus>			: "£"	sterling # POUND SIGN
+<Multi_key> <minus> <l>			: "£"	sterling # POUND SIGN
+<Multi_key> <Y> <equal>			: "¥"	yen # YEN SIGN
+<Multi_key> <equal> <Y>			: "¥"	yen # YEN SIGN
+<Multi_key> <y> <equal>			: "¥"	yen # YEN SIGN
+<Multi_key> <equal> <y>			: "¥"	yen # YEN SIGN
+<Multi_key> <B> <bar>			: "฿"	U0e3f # THAI CURRENCY SYMBOL BAHT
+<Multi_key> <bar> <B>			: "฿"	U0e3f # THAI CURRENCY SYMBOL BAHT
 <Multi_key> <C> <E>			: "₠"	U20a0 # EURO-CURRENCY SIGN
 <Multi_key> <C> <slash>			: "₡"	U20a1 # COLON SIGN
 <Multi_key> <slash> <C>			: "₡"	U20a1 # COLON SIGN
@@ -185,52 +197,28 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
 <Multi_key> <equal> <Cyrillic_ES>	: "€"	EuroSign # EURO SIGN
 <Multi_key> <Cyrillic_IE> <equal>	: "€"	EuroSign # EURO SIGN
 <Multi_key> <equal> <Cyrillic_IE>	: "€"	EuroSign # EURO SIGN
-<Multi_key> <P> <equal>			: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <p> <equal>			: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <equal> <P>			: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <equal> <p>			: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <Cyrillic_ZE> <equal>	: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <Cyrillic_ze> <equal>	: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <equal> <Cyrillic_ZE>	: "₽"	U20bd # ROUBLE SIGN
-<Multi_key> <equal> <Cyrillic_ze>	: "₽"	U20bd # ROUBLE SIGN
-XCOMM "₭" U20ad KIP SIGN
-XCOMM "₮" U20ae TUGRIK SIGN
-XCOMM "₯" U20af DRACHMA SIGN
-XCOMM "₰" U20b0 GERMAN PENNY SIGN
+<Multi_key> <K> <minus>			: "₭"	U20ad # KIP SIGN
+<Multi_key> <minus> <K>			: "₭"	U20ad # KIP SIGN
+<Multi_key> <T> <equal>			: "₮"	U20ae # TUGRIK SIGN
+<Multi_key> <equal> <T>			: "₮"	U20ae # TUGRIK SIGN
 XCOMM "₱" U20b1 PESO SIGN
-XCOMM "₲" U20b2 GUARANI SIGN
-XCOMM "₳" U20b3 AUSTRAL SIGN
+<Multi_key> <G> <bar>			: "₲"	U20b2 # GUARANI SIGN
+<Multi_key> <bar> <G>			: "₲"	U20b2 # GUARANI SIGN
 XCOMM "₴" U20b4 HRYVNIA SIGN
-XCOMM "₵" U20b5 CEDI SIGN
+<Multi_key> <C> <bar>			: "₵"	U20b5 # CEDI SIGN
+<Multi_key> <bar> <C>			: "₵"	U20b5 # CEDI SIGN
 <Multi_key> <R> <equal>			: "₹"	U20b9 # INDIAN RUPEE SIGN
 <Multi_key> <equal> <R>			: "₹"	U20b9 # INDIAN RUPEE SIGN
 <Multi_key> <r> <equal>			: "₹"	U20b9 # INDIAN RUPEE SIGN
 <Multi_key> <equal> <r>			: "₹"	U20b9 # INDIAN RUPEE SIGN
-
-<Multi_key> <C> <bar>			: "¢"	cent # CENT SIGN
-<Multi_key> <bar> <C>			: "¢"	cent # CENT SIGN
-<Multi_key> <c> <bar>			: "¢"	cent # CENT SIGN
-<Multi_key> <bar> <c>			: "¢"	cent # CENT SIGN
-<Multi_key> <c> <slash>			: "¢"	cent # CENT SIGN
-<Multi_key> <slash> <c>			: "¢"	cent # CENT SIGN
-<Multi_key> <L> <minus>			: "£"	sterling # POUND SIGN
-<Multi_key> <minus> <L>			: "£"	sterling # POUND SIGN
-<Multi_key> <l> <minus>			: "£"	sterling # POUND SIGN
-<Multi_key> <minus> <l>			: "£"	sterling # POUND SIGN
-<Multi_key> <Y> <equal>			: "¥"	yen # YEN SIGN
-<Multi_key> <equal> <Y>			: "¥"	yen # YEN SIGN
-<Multi_key> <y> <equal>			: "¥"	yen # YEN SIGN
-<Multi_key> <equal> <y>			: "¥"	yen # YEN SIGN
-<Multi_key> <Y> <minus>			: "¥"	yen # YEN SIGN
-<Multi_key> <minus> <Y>			: "¥"	yen # YEN SIGN
-<Multi_key> <y> <minus>			: "¥"	yen # YEN SIGN
-<Multi_key> <minus> <y>			: "¥"	yen # YEN SIGN
-
-XCOMM Long S
-<Multi_key> <f> <s>			: "ſ"	U017f # LATIN SMALL LETTER LONG S
-<Multi_key> <f> <S>			: "ſ"	U017f # LATIN SMALL LETTER LONG S
-<dead_abovedot> <Multi_key> <f> <s>	: "ẛ"	U1e9b # LATIN SMALL LETTER LONG S WITH DOT ABOVE
-<Multi_key> <dead_abovedot> <f> <s>	: "ẛ"	U1e9b # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+<Multi_key> <P> <equal>			: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <equal> <P>			: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <p> <equal>			: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <equal> <p>			: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ZE> <equal>	: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ZE>	: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ze> <equal>	: "₽"	U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ze>	: "₽"	U20bd # ROUBLE SIGN
 
 XCOMM Dashes
 <Multi_key> <minus> <minus> <period>	: "–"	U2013 # EN DASH
@@ -260,12 +248,8 @@ XCOMM Other symbols
 
 <Multi_key> <o> <x>			: "¤"	currency # CURRENCY SIGN
 <Multi_key> <x> <o>			: "¤"	currency # CURRENCY SIGN
-<Multi_key> <o> <X>			: "¤"	currency # CURRENCY SIGN
-<Multi_key> <X> <o>			: "¤"	currency # CURRENCY SIGN
 <Multi_key> <O> <X>			: "¤"	currency # CURRENCY SIGN
 <Multi_key> <X> <O>			: "¤"	currency # CURRENCY SIGN
-<Multi_key> <O> <x>			: "¤"	currency # CURRENCY SIGN
-<Multi_key> <x> <O>			: "¤"	currency # CURRENCY SIGN
 
 <Multi_key> <N> <o>			: "№"	numerosign # NUMERO SIGN
 <Multi_key> <N> <O>			: "№"	numerosign # NUMERO SIGN
@@ -294,6 +278,11 @@ XCOMM Latin-1 Supplement
 <Multi_key> <asciicircum> <underscore> <a>	: "ª"	ordfeminine # FEMININE ORDINAL INDICATOR
 <dead_circumflex> <Multi_key> <underscore> <o>	: "º"	masculine # MASCULINE ORDINAL INDICATOR
 <Multi_key> <asciicircum> <underscore> <o>	: "º"	masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <asciicircum> <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <1> <asciicircum>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<dead_circumflex> <KP_1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <asciicircum> <KP_1>	: "¹"	onesuperior # SUPERSCRIPT ONE
 <dead_circumflex> <2>			: "²"	twosuperior # SUPERSCRIPT TWO
 <Multi_key> <asciicircum> <2>		: "²"	twosuperior # SUPERSCRIPT TWO
 <Multi_key> <2> <asciicircum>		: "²"	twosuperior # SUPERSCRIPT TWO
@@ -307,11 +296,6 @@ XCOMM Latin-1 Supplement
 <Multi_key> <m> <u>			: "µ"	mu # MICRO SIGN
 <Multi_key> <slash> <u>			: "µ"	mu # MICRO SIGN
 <Multi_key> <u> <slash>			: "µ"	mu # MICRO SIGN
-<dead_circumflex> <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <1> <asciicircum>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <KP_1>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <KP_1>	: "¹"	onesuperior # SUPERSCRIPT ONE
 <Multi_key> <1> <4>			: "¼"	onequarter # VULGAR FRACTION ONE QUARTER
 <Multi_key> <1> <2>			: "½"	onehalf # VULGAR FRACTION ONE HALF
 <Multi_key> <3> <4>			: "¾"	threequarters # VULGAR FRACTION THREE QUARTERS
@@ -381,11 +365,11 @@ XCOMM Latin-1 Supplement
 <Multi_key> <I> <quotedbl>		: "Ï"	Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
 <Multi_key> <diaeresis> <I>		: "Ï"	Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
 <Multi_key> <I> <diaeresis>		: "Ï"	Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
-<dead_acute> <J>			: "J́"	# LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <apostrophe> <J>		: "J́"	# LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <J> <apostrophe>		: "J́"	# LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <acute> <J>			: "J́"	# LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <J> <acute>			: "J́"	# LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <J>			: "J́"	# LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <apostrophe> <J>		: "J́"	# LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <J> <apostrophe>		: "J́"	# LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <acute> <J>			: "J́"	# LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <J> <acute>			: "J́"	# LATIN CAPITAL LETTER J plus COMBINING ACUTE
 <Multi_key> <D> <H>			: "Ð"	ETH # LATIN CAPITAL LETTER ETH
 <dead_tilde> <N>			: "Ñ"	Ntilde # LATIN CAPITAL LETTER N WITH TILDE
 <Multi_key> <asciitilde> <N>		: "Ñ"	Ntilde # LATIN CAPITAL LETTER N WITH TILDE
@@ -506,11 +490,11 @@ XCOMM Latin-1 Supplement
 <Multi_key> <i> <quotedbl>		: "ï"	idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
 <Multi_key> <diaeresis> <i>		: "ï"	idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
 <Multi_key> <i> <diaeresis>		: "ï"	idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
-<dead_acute> <j>			: "j́"	# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <apostrophe> <j>		: "j́"	# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <j> <apostrophe>		: "j́"	# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <acute> <j>			: "j́"	# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <j> <acute>			: "j́"	# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <j>			: "j́"	# LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <apostrophe> <j>		: "j́"	# LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <j> <apostrophe>		: "j́"	# LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <acute> <j>			: "j́"	# LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <j> <acute>			: "j́"	# LATIN SMALL LETTER J plus COMBINING ACUTE
 <Multi_key> <d> <h>			: "ð"	eth # LATIN SMALL LETTER ETH
 <dead_tilde> <n>			: "ñ"	ntilde # LATIN SMALL LETTER N WITH TILDE
 <Multi_key> <asciitilde> <n>		: "ñ"	ntilde # LATIN SMALL LETTER N WITH TILDE
@@ -706,20 +690,18 @@ XCOMM Latin Extended-A
 <dead_breve> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <U> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <u> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-<Multi_key> <G> <U>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-<Multi_key> <G> <u>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <b> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <breve> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G> <breve>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
+<Multi_key> <G> <U>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G> <parenleft>		: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <dead_breve> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <U> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <u> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
-<Multi_key> <g> <U>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
-<Multi_key> <g> <u>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <b> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <breve> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g> <breve>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
+<Multi_key> <g> <U>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g> <parenleft>		: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <dead_abovedot> <G>			: "Ġ"	U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
 <Multi_key> <period> <G>		: "Ġ"	U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
@@ -1058,11 +1040,14 @@ XCOMM Latin Extended-A
 <Multi_key> <v> <z>			: "ž"	U017E # LATIN SMALL LETTER Z WITH CARON
 <Multi_key> <less> <z>			: "ž"	U017E # LATIN SMALL LETTER Z WITH CARON
 <Multi_key> <z> <less>			: "ž"	U017E # LATIN SMALL LETTER Z WITH CARON
+<Multi_key> <f> <s>			: "ſ"	U017F # LATIN SMALL LETTER LONG S
+<Multi_key> <f> <S>			: "ſ"	U017F # LATIN SMALL LETTER LONG S
 
 XCOMM Latin Extended-B
 <dead_stroke> <b>				: "ƀ"	U0180 # LATIN SMALL LETTER B WITH STROKE
 <Multi_key> <slash> <b>				: "ƀ"	U0180 # LATIN SMALL LETTER B WITH STROKE
 <Multi_key> <KP_Divide> <b>			: "ƀ"	U0180 # LATIN SMALL LETTER B WITH STROKE
+<Multi_key> <E> <E>				: "Ə"	U018F # LATIN CAPITAL LETTER SCHWA
 <dead_stroke> <I>				: "Ɨ"	U0197 # LATIN CAPITAL LETTER I WITH STROKE
 <Multi_key> <slash> <I>				: "Ɨ"	U0197 # LATIN CAPITAL LETTER I WITH STROKE
 <Multi_key> <KP_Divide> <I>			: "Ɨ"	U0197 # LATIN CAPITAL LETTER I WITH STROKE
@@ -1234,18 +1219,12 @@ XCOMM Latin Extended-B
 <Multi_key> <o> <semicolon>			: "ǫ"	U01EB # LATIN SMALL LETTER O WITH OGONEK
 <Multi_key> <comma> <o>				: "ǫ"	U01EB # LATIN SMALL LETTER O WITH OGONEK
 <Multi_key> <o> <comma>				: "ǫ"	U01EB # LATIN SMALL LETTER O WITH OGONEK
-<dead_macron> <U01EA>				: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <macron> <U01EA>			: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <U01EA>		: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
 <dead_macron> <dead_ogonek> <O>			: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
 <dead_macron> <Multi_key> <semicolon> <O>	: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
 <Multi_key> <macron> <dead_ogonek> <O>		: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
 <Multi_key> <macron> <semicolon> <O>		: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
 <Multi_key> <underscore> <dead_ogonek> <O>	: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
 <Multi_key> <underscore> <semicolon> <O>	: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_macron> <U01EB>				: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <macron> <U01EB>			: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <U01EB>		: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 <dead_macron> <dead_ogonek> <o>			: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 <dead_macron> <Multi_key> <semicolon> <o>	: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 <Multi_key> <macron> <dead_ogonek> <o>		: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
@@ -1339,6 +1318,18 @@ XCOMM Latin Extended-B
 <dead_doublegrave> <u>				: "ȕ"	U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
 <dead_invertedbreve> <U>			: "Ȗ"	U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
 <dead_invertedbreve> <u>			: "ȗ"	U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_belowcomma> <S>				: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<Multi_key> <semicolon> <S>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<Multi_key> <S> <semicolon>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <s>				: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<Multi_key> <semicolon> <s>			: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<Multi_key> <s> <semicolon>			: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <T>				: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<Multi_key> <semicolon> <T>			: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<Multi_key> <T> <semicolon>			: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<dead_belowcomma> <t>				: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<Multi_key> <semicolon> <t>			: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<Multi_key> <t> <semicolon>			: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
 <dead_caron> <H>				: "Ȟ"	U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <c> <H>				: "Ȟ"	U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <v> <H>				: "Ȟ"	U021E # LATIN CAPITAL LETTER H WITH CARON
@@ -1393,18 +1384,12 @@ XCOMM Latin Extended-B
 <Multi_key> <period> <O>			: "Ȯ"	U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 <dead_abovedot> <o>				: "ȯ"	U022F # LATIN SMALL LETTER O WITH DOT ABOVE
 <Multi_key> <period> <o>			: "ȯ"	U022F # LATIN SMALL LETTER O WITH DOT ABOVE
-<dead_macron> <U022E>				: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U022E>			: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U022E>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
 <dead_macron> <dead_abovedot> <O>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
 <dead_macron> <Multi_key> <period> <O>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
 <Multi_key> <macron> <dead_abovedot> <O>	: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
 <Multi_key> <macron> <period> <O>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
 <Multi_key> <underscore> <dead_abovedot> <O>	: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
 <Multi_key> <underscore> <period> <O>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_macron> <U022F>				: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U022F>			: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U022F>		: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_macron> <dead_abovedot> <o>		: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_macron> <Multi_key> <period> <o>		: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <Multi_key> <macron> <dead_abovedot> <o>	: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
@@ -1417,8 +1402,17 @@ XCOMM Latin Extended-B
 <dead_macron> <y>				: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
 <Multi_key> <macron> <y>			: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
 <Multi_key> <underscore> <y>			: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
-<Multi_key> <e> <e>				: "ə"	U0259 # LATIN SMALL LETTER SCHWA
+<dead_stroke> <B>				: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
+<Multi_key> <slash> <B>				: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
+<Multi_key> <KP_Divide> <B>			: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
+/* Four sequences for Samogitian. */
+<Multi_key> <minus> <period> <E>		: "Ė̄"	# LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <underscore> <period> <E>		: "Ė̄"	# LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <minus> <period> <e>		: "ė̄"	# LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <underscore> <period> <e>		: "ė̄"	# LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron
 
+XCOMM IPA Extensions
+<Multi_key> <e> <e>				: "ə"	U0259 # LATIN SMALL LETTER SCHWA
 <dead_stroke> <i>				: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
 <Multi_key> <slash> <i>				: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
 <Multi_key> <KP_Divide> <i>			: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
@@ -1495,9 +1489,6 @@ XCOMM Greek
 <Multi_key> <acute> <Greek_OMEGA>			: "Ώ"	U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 <Multi_key> <apostrophe> <Greek_OMEGA>			: "Ώ"	U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 <Multi_key> <Greek_OMEGA> <apostrophe>			: "Ώ"	U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
-<dead_acute> <Greek_iotadieresis>			: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<Multi_key> <acute> <Greek_iotadieresis>		: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<Multi_key> <apostrophe> <Greek_iotadieresis>		: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 <dead_acute> <dead_diaeresis> <Greek_iota>		: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 <dead_diaeresis> <dead_acute> <Greek_iota>		: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 <dead_acute> <Multi_key> <quotedbl> <Greek_iota>	: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
@@ -1505,7 +1496,6 @@ XCOMM Greek
 <Multi_key> <acute> <quotedbl> <Greek_iota>		: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 <Multi_key> <apostrophe> <dead_diaeresis> <Greek_iota>	: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 <Multi_key> <apostrophe> <quotedbl> <Greek_iota>	: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<Greek_accentdieresis> <Greek_iota>			: "ΐ"	U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 <dead_diaeresis> <Greek_IOTA>				: "Ϊ"	U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
 <Multi_key> <quotedbl> <Greek_IOTA>			: "Ϊ"	U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
 <Multi_key> <Greek_IOTA> <quotedbl>			: "Ϊ"	U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
@@ -1527,9 +1517,6 @@ XCOMM Greek
 <dead_acute> <Greek_iota>				: "ί"	U03AF # GREEK SMALL LETTER IOTA WITH TONOS
 <Multi_key> <acute> <Greek_iota>			: "ί"	U03AF # GREEK SMALL LETTER IOTA WITH TONOS
 <Multi_key> <apostrophe> <Greek_iota>			: "ί"	U03AF # GREEK SMALL LETTER IOTA WITH TONOS
-<dead_acute> <Greek_upsilondieresis>			: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<Multi_key> <acute> <Greek_upsilondieresis>		: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<Multi_key> <apostrophe> <Greek_upsilondieresis>	: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <dead_acute> <dead_diaeresis> <Greek_upsilon>		: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <dead_acute> <Multi_key> <quotedbl> <Greek_upsilon>	: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <Multi_key> <acute> <dead_diaeresis> <Greek_upsilon>	: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
@@ -1537,7 +1524,6 @@ XCOMM Greek
 <Multi_key> <apostrophe><dead_diaeresis> <Greek_upsilon>: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <Multi_key> <apostrophe> <quotedbl> <Greek_upsilon>	: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <dead_diaeresis> <dead_acute> <Greek_upsilon>		: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<Greek_accentdieresis> <Greek_upsilon>			: "ΰ"	U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <dead_diaeresis> <Greek_iota>				: "ϊ"	U03CA # GREEK SMALL LETTER IOTA WITH DIALYTIKA
 <Multi_key> <quotedbl> <Greek_iota>			: "ϊ"	U03CA # GREEK SMALL LETTER IOTA WITH DIALYTIKA
 <Multi_key> <Greek_iota> <quotedbl>			: "ϊ"	U03CA # GREEK SMALL LETTER IOTA WITH DIALYTIKA
@@ -2079,9 +2065,6 @@ XCOMM Latin Extended Additional
 <dead_belowcircumflex> <e>			: "ḙ"	U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
 <dead_belowtilde> <E>				: "Ḛ"	U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
 <dead_belowtilde> <e>				: "ḛ"	U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
-<dead_breve> <U0228>				: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <U0228>				: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <b> <U0228>				: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
 <dead_breve> <dead_cedilla> <E>			: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
 <dead_breve> <Multi_key> <comma> <E>		: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
 <dead_breve> <Multi_key> <cedilla> <E>		: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
@@ -2091,9 +2074,6 @@ XCOMM Latin Extended Additional
 <Multi_key> <b> <dead_cedilla> <E>		: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
 <Multi_key> <b> <comma> <E>			: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
 <Multi_key> <b> <cedilla> <E>			: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<dead_breve> <U0229>				: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <U0229>				: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <b> <U0229>				: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
 <dead_breve> <dead_cedilla> <e>			: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
 <dead_breve> <Multi_key> <comma> <e>		: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
 <dead_breve> <Multi_key> <cedilla> <e>		: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
@@ -2496,6 +2476,8 @@ XCOMM Latin Extended Additional
 <Multi_key> <o> <y>				: "ẙ"	U1E99 # LATIN SMALL LETTER Y WITH RING ABOVE
 <dead_abovedot> <U017F>				: "ẛ"	U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
 <Multi_key> <period> <U017F>			: "ẛ"	U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+<dead_abovedot> <Multi_key> <f> <s>		: "ẛ"	U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+<Multi_key> <dead_abovedot> <f> <s>		: "ẛ"	U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
 <dead_belowdot> <A>				: "Ạ"	U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
 <Multi_key> <exclam> <A>			: "Ạ"	U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
 <dead_belowdot> <a>				: "ạ"	U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
@@ -2558,15 +2540,11 @@ XCOMM Latin Extended Additional
 <dead_tilde> <Multi_key> <asciicircum> <a>	: "ẫ"	U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <a>	: "ẫ"	U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <a>	: "ẫ"	U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <U1EA0>			: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U1EA0>		: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <A>		: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <A>	: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <A>	: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <A>		: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_belowdot> <Acircumflex>			: "Ậ"	U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <U1EA1>			: "ậ"	U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U1EA1>		: "ậ"	U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <a>		: "ậ"	U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <a>	: "ậ"	U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <a>	: "ậ"	U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
@@ -2634,9 +2612,6 @@ XCOMM Latin Extended Additional
 <dead_tilde> <Multi_key> <b> <a>		: "ẵ"	U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <dead_breve> <a>	: "ẵ"	U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <b> <a>		: "ẵ"	U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<dead_breve> <U1EA0>				: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <U1EA0>				: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <U1EA0>				: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <dead_breve> <dead_belowdot> <A>		: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <dead_breve> <Multi_key> <exclam> <A>		: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <U> <dead_belowdot> <A>		: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
@@ -2644,9 +2619,6 @@ XCOMM Latin Extended Additional
 <Multi_key> <b> <dead_belowdot> <A>		: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <exclam> <A>			: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <dead_belowdot> <Abreve>			: "Ặ"	U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<dead_breve> <U1EA1>				: "ặ"	U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <U1EA1>				: "ặ"	U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <U1EA1>				: "ặ"	U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <dead_breve> <dead_belowdot> <a>		: "ặ"	U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <dead_breve> <Multi_key> <exclam> <a>		: "ặ"	U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <U> <dead_belowdot> <a>		: "ặ"	U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
@@ -2980,44 +2952,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_alpha>	: "ἀ"	U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
 <dead_dasia> <Greek_alpha>		: "ἁ"	U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
 <Multi_key> <parenleft> <Greek_alpha>	: "ἁ"	U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
-<dead_grave> <U1F00>			: "ἂ"	U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F00>		: "ἂ"	U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_alpha>	: "ἂ"	U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_alpha>	: "ἂ"	U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_alpha>	: "ἂ"	U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_alpha>	: "ἂ"	U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<dead_grave> <U1F01>			: "ἃ"	U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F01>		: "ἃ"	U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_alpha>	: "ἃ"	U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_alpha>	: "ἃ"	U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_alpha>	: "ἃ"	U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_alpha>	: "ἃ"	U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<dead_acute> <U1F00>			: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F00>		: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F00>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_alpha>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_alpha>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_alpha>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_alpha>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_alpha>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_alpha>	: "ἄ"	U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<dead_acute> <U1F01>			: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F01>		: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F01>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_alpha>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_alpha>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_alpha>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_alpha>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_alpha>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_alpha>	: "ἅ"	U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<dead_tilde> <U1F00>			: "ἆ"	U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F00>	: "ἆ"	U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_alpha>	: "ἆ"	U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_alpha>	: "ἆ"	U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_alpha>	: "ἆ"	U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_alpha>	: "ἆ"	U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F01>			: "ἇ"	U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F01>	: "ἇ"	U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_alpha>	: "ἇ"	U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_alpha>	: "ἇ"	U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_alpha>	: "ἇ"	U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
@@ -3026,44 +2984,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_ALPHA>	: "Ἀ"	U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
 <dead_dasia> <Greek_ALPHA>		: "Ἁ"	U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
 <Multi_key> <parenleft> <Greek_ALPHA>	: "Ἁ"	U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
-<dead_grave> <U1F08>			: "Ἂ"	U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F08>		: "Ἂ"	U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_ALPHA>	: "Ἂ"	U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_ALPHA>	: "Ἂ"	U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_ALPHA>	: "Ἂ"	U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_ALPHA>	: "Ἂ"	U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<dead_grave> <U1F09>			: "Ἃ"	U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F09>		: "Ἃ"	U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_ALPHA>	: "Ἃ"	U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_ALPHA>	: "Ἃ"	U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_ALPHA>	: "Ἃ"	U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_ALPHA>	: "Ἃ"	U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<dead_acute> <U1F08>			: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F08>		: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F08>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_ALPHA>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_ALPHA>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_ALPHA>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_ALPHA>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_ALPHA>	: "Ἄ"	U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<dead_acute> <U1F09>			: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F09>		: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F09>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_ALPHA>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_ALPHA>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_ALPHA>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_ALPHA>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_ALPHA>	: "Ἅ"	U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<dead_tilde> <U1F08>			: "Ἆ"	U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F08>	: "Ἆ"	U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_ALPHA>	: "Ἆ"	U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_ALPHA>	: "Ἆ"	U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_ALPHA>	: "Ἆ"	U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_ALPHA>	: "Ἆ"	U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F09>			: "Ἇ"	U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F09>	: "Ἇ"	U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_ALPHA>	: "Ἇ"	U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_ALPHA>	: "Ἇ"	U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_ALPHA>	: "Ἇ"	U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
@@ -3072,30 +3016,20 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_epsilon>	: "ἐ"	U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
 <dead_dasia> <Greek_epsilon>		: "ἑ"	U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
 <Multi_key> <parenleft> <Greek_epsilon>	: "ἑ"	U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
-<dead_grave> <U1F10>			: "ἒ"	U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F10>		: "ἒ"	U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_epsilon>	: "ἒ"	U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_epsilon>	: "ἒ"	U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_epsilon>	: "ἒ"	U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_epsilon>	: "ἒ"	U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<dead_grave> <U1F11>			: "ἓ"	U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F11>		: "ἓ"	U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_epsilon>	: "ἓ"	U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_epsilon>	: "ἓ"	U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_epsilon>	: "ἓ"	U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_epsilon>	: "ἓ"	U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<dead_acute> <U1F10>			: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F10>		: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F10>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_epsilon>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_epsilon>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_epsilon>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_epsilon>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_epsilon>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_epsilon>	: "ἔ"	U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<dead_acute> <U1F11>			: "ἕ"	U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F11>		: "ἕ"	U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F11>	: "ἕ"	U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_epsilon>	: "ἕ"	U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_epsilon>	: "ἕ"	U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_epsilon>	: "ἕ"	U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
@@ -3106,30 +3040,20 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_EPSILON>	: "Ἐ"	U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
 <dead_dasia> <Greek_EPSILON>		: "Ἑ"	U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
 <Multi_key> <parenleft> <Greek_EPSILON>	: "Ἑ"	U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
-<dead_grave> <U1F18>			: "Ἒ"	U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F18>		: "Ἒ"	U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_EPSILON>	: "Ἒ"	U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_EPSILON>	: "Ἒ"	U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_EPSILON>	: "Ἒ"	U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_EPSILON>	: "Ἒ"	U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<dead_grave> <U1F19>			: "Ἓ"	U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F19>		: "Ἓ"	U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_EPSILON>	: "Ἓ"	U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_EPSILON>	: "Ἓ"	U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_EPSILON>	: "Ἓ"	U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_EPSILON>	: "Ἓ"	U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<dead_acute> <U1F18>			: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F18>		: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F18>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_EPSILON>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_EPSILON>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_EPSILON>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_EPSILON>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_EPSILON>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_EPSILON>	: "Ἔ"	U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<dead_acute> <U1F19>			: "Ἕ"	U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F19>		: "Ἕ"	U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F19>	: "Ἕ"	U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_EPSILON>	: "Ἕ"	U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_EPSILON>	: "Ἕ"	U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_EPSILON>	: "Ἕ"	U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
@@ -3140,44 +3064,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_eta>	: "ἠ"	U1F20 # GREEK SMALL LETTER ETA WITH PSILI
 <dead_dasia> <Greek_eta>		: "ἡ"	U1F21 # GREEK SMALL LETTER ETA WITH DASIA
 <Multi_key> <parenleft> <Greek_eta>	: "ἡ"	U1F21 # GREEK SMALL LETTER ETA WITH DASIA
-<dead_grave> <U1F20>			: "ἢ"	U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F20>		: "ἢ"	U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_eta>	: "ἢ"	U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_eta>	: "ἢ"	U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_eta>	: "ἢ"	U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_eta>	: "ἢ"	U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<dead_grave> <U1F21>			: "ἣ"	U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F21>		: "ἣ"	U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_eta>	: "ἣ"	U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_eta>	: "ἣ"	U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_eta>	: "ἣ"	U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_eta>	: "ἣ"	U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<dead_acute> <U1F20>			: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F20>		: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F20>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_eta>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_eta>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_eta>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_eta>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_eta>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_eta>	: "ἤ"	U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<dead_acute> <U1F21>			: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F21>		: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F21>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_eta>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_eta>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_eta>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_eta>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_eta>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_eta>	: "ἥ"	U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<dead_tilde> <U1F20>			: "ἦ"	U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F20>	: "ἦ"	U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_eta>	: "ἦ"	U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_eta>	: "ἦ"	U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_eta>	: "ἦ"	U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_eta>	: "ἦ"	U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F21>			: "ἧ"	U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F21>	: "ἧ"	U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_eta>	: "ἧ"	U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_eta>	: "ἧ"	U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_eta>	: "ἧ"	U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
@@ -3186,44 +3096,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_ETA>	: "Ἠ"	U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
 <dead_dasia> <Greek_ETA>		: "Ἡ"	U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
 <Multi_key> <parenleft> <Greek_ETA>	: "Ἡ"	U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
-<dead_grave> <U1F28>			: "Ἢ"	U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F28>		: "Ἢ"	U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_ETA>	: "Ἢ"	U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_ETA>	: "Ἢ"	U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_ETA>	: "Ἢ"	U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_ETA>	: "Ἢ"	U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<dead_grave> <U1F29>			: "Ἣ"	U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F29>		: "Ἣ"	U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_ETA>	: "Ἣ"	U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_ETA>	: "Ἣ"	U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_ETA>	: "Ἣ"	U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_ETA>	: "Ἣ"	U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<dead_acute> <U1F28>			: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F28>		: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F28>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_ETA>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_ETA>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_ETA>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_ETA>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_ETA>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_ETA>	: "Ἤ"	U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<dead_acute> <U1F29>			: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F29>		: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F29>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_ETA>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_ETA>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_ETA>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_ETA>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_ETA>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_ETA>	: "Ἥ"	U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<dead_tilde> <U1F28>			: "Ἦ"	U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F28>	: "Ἦ"	U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_ETA>	: "Ἦ"	U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_ETA>	: "Ἦ"	U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_ETA>	: "Ἦ"	U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_ETA>	: "Ἦ"	U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F29>			: "Ἧ"	U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F29>	: "Ἧ"	U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_ETA>	: "Ἧ"	U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_ETA>	: "Ἧ"	U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_ETA>	: "Ἧ"	U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
@@ -3232,44 +3128,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_iota>	: "ἰ"	U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
 <dead_dasia> <Greek_iota>		: "ἱ"	U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
 <Multi_key> <parenleft> <Greek_iota>	: "ἱ"	U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
-<dead_grave> <U1F30>			: "ἲ"	U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F30>		: "ἲ"	U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_iota>	: "ἲ"	U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_iota>	: "ἲ"	U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_iota>	: "ἲ"	U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_iota>	: "ἲ"	U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<dead_grave> <U1F31>			: "ἳ"	U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F31>		: "ἳ"	U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_iota>	: "ἳ"	U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_iota>	: "ἳ"	U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_iota>	: "ἳ"	U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_iota>	: "ἳ"	U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<dead_acute> <U1F30>			: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F30>		: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F30>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_iota>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_iota>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_iota>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_iota>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_iota>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_iota>	: "ἴ"	U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<dead_acute> <U1F31>			: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F31>		: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F31>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_iota>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_iota>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_iota>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_iota>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_iota>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_iota>	: "ἵ"	U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<dead_tilde> <U1F30>			: "ἶ"	U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F30>	: "ἶ"	U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_iota>	: "ἶ"	U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_iota>	: "ἶ"	U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_iota>	: "ἶ"	U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_iota>	: "ἶ"	U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F31>			: "ἷ"	U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F31>	: "ἷ"	U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_iota>	: "ἷ"	U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_iota>	: "ἷ"	U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_iota>	: "ἷ"	U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
@@ -3278,44 +3160,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_IOTA>	: "Ἰ"	U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
 <dead_dasia> <Greek_IOTA>		: "Ἱ"	U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
 <Multi_key> <parenleft> <Greek_IOTA>	: "Ἱ"	U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
-<dead_grave> <U1F38>			: "Ἲ"	U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F38>		: "Ἲ"	U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_IOTA>	: "Ἲ"	U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_IOTA>	: "Ἲ"	U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_IOTA>	: "Ἲ"	U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_IOTA>	: "Ἲ"	U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<dead_grave> <U1F39>			: "Ἳ"	U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F39>		: "Ἳ"	U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_IOTA>	: "Ἳ"	U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_IOTA>	: "Ἳ"	U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_IOTA>	: "Ἳ"	U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_IOTA>	: "Ἳ"	U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<dead_acute> <U1F38>			: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F38>		: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F38>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_IOTA>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_IOTA>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_IOTA>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_IOTA>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_IOTA>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_IOTA>	: "Ἴ"	U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<dead_acute> <U1F39>			: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F39>		: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F39>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_IOTA>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_IOTA>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_IOTA>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_IOTA>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_IOTA>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_IOTA>	: "Ἵ"	U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<dead_tilde> <U1F38>			: "Ἶ"	U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F38>	: "Ἶ"	U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_IOTA>	: "Ἶ"	U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_IOTA>	: "Ἶ"	U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_IOTA>	: "Ἶ"	U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_IOTA>	: "Ἶ"	U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F39>			: "Ἷ"	U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F39>	: "Ἷ"	U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_IOTA>	: "Ἷ"	U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_IOTA>	: "Ἷ"	U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_IOTA>	: "Ἷ"	U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
@@ -3324,30 +3192,20 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_omicron>	: "ὀ"	U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
 <dead_dasia> <Greek_omicron>		: "ὁ"	U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
 <Multi_key> <parenleft> <Greek_omicron>	: "ὁ"	U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
-<dead_grave> <U1F40>			: "ὂ"	U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F40>		: "ὂ"	U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_omicron>	: "ὂ"	U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_omicron>	: "ὂ"	U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_omicron>	: "ὂ"	U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_omicron>	: "ὂ"	U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<dead_grave> <U1F41>			: "ὃ"	U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F41>		: "ὃ"	U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_omicron>	: "ὃ"	U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_omicron>	: "ὃ"	U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_omicron>	: "ὃ"	U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_omicron>	: "ὃ"	U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<dead_acute> <U1F40>			: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F40>		: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F40>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_omicron>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_omicron>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_omicron>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_omicron>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_omicron>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_omicron>	: "ὄ"	U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<dead_acute> <U1F41>			: "ὅ"	U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F41>		: "ὅ"	U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F41>	: "ὅ"	U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_omicron>	: "ὅ"	U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_omicron>	: "ὅ"	U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_omicron>	: "ὅ"	U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
@@ -3358,30 +3216,20 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_OMICRON>	: "Ὀ"	U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
 <dead_dasia> <Greek_OMICRON>		: "Ὁ"	U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
 <Multi_key> <parenleft> <Greek_OMICRON>	: "Ὁ"	U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
-<dead_grave> <U1F48>			: "Ὂ"	U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F48>		: "Ὂ"	U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_OMICRON>	: "Ὂ"	U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_OMICRON>	: "Ὂ"	U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_OMICRON>	: "Ὂ"	U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_OMICRON>	: "Ὂ"	U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<dead_grave> <U1F49>			: "Ὃ"	U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F49>		: "Ὃ"	U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_OMICRON>	: "Ὃ"	U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_OMICRON>	: "Ὃ"	U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_OMICRON>	: "Ὃ"	U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_OMICRON>	: "Ὃ"	U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<dead_acute> <U1F48>			: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F48>		: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F48>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_OMICRON>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_OMICRON>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_OMICRON>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_OMICRON>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_OMICRON>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_OMICRON>	: "Ὄ"	U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<dead_acute> <U1F49>			: "Ὅ"	U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F49>		: "Ὅ"	U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F49>	: "Ὅ"	U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_OMICRON>	: "Ὅ"	U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_OMICRON>	: "Ὅ"	U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_OMICRON>	: "Ὅ"	U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
@@ -3392,67 +3240,46 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_upsilon>	: "ὐ"	U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
 <dead_dasia> <Greek_upsilon>		: "ὑ"	U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
 <Multi_key> <parenleft> <Greek_upsilon>	: "ὑ"	U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
-<dead_grave> <U1F50>			: "ὒ"	U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F50>		: "ὒ"	U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_upsilon>	: "ὒ"	U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_upsilon>	: "ὒ"	U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_upsilon>	: "ὒ"	U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_upsilon>	: "ὒ"	U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<dead_grave> <U1F51>			: "ὓ"	U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F51>		: "ὓ"	U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_upsilon>	: "ὓ"	U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_upsilon>	: "ὓ"	U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_upsilon>	: "ὓ"	U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_upsilon>	: "ὓ"	U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<dead_acute> <U1F50>			: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F50>		: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F50>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_upsilon>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_upsilon>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_upsilon>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_upsilon>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_upsilon>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_upsilon>	: "ὔ"	U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<dead_acute> <U1F51>			: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F51>		: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F51>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_upsilon>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_upsilon>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_upsilon>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_upsilon>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_upsilon>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_upsilon>	: "ὕ"	U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<dead_tilde> <U1F50>			: "ὖ"	U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F50>	: "ὖ"	U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_upsilon>	: "ὖ"	U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_upsilon>	: "ὖ"	U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_upsilon>	: "ὖ"	U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_upsilon>	: "ὖ"	U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F51>			: "ὗ"	U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F51>	: "ὗ"	U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_upsilon>	: "ὗ"	U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_upsilon>	: "ὗ"	U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_upsilon>	: "ὗ"	U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_upsilon>	: "ὗ"	U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <dead_dasia> <Greek_UPSILON>		: "Ὑ"	U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
 <Multi_key> <parenleft> <Greek_UPSILON>	: "Ὑ"	U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
-<dead_grave> <U1F59>			: "Ὓ"	U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F59>		: "Ὓ"	U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_UPSILON>	: "Ὓ"	U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_UPSILON>	: "Ὓ"	U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_UPSILON>	: "Ὓ"	U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_UPSILON>	: "Ὓ"	U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<dead_acute> <U1F59>			: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F59>		: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F59>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_UPSILON>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_UPSILON>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_UPSILON>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_UPSILON>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_UPSILON>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_UPSILON>	: "Ὕ"	U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<dead_tilde> <U1F59>			: "Ὗ"	U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F59>	: "Ὗ"	U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_UPSILON>	: "Ὗ"	U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_UPSILON>	: "Ὗ"	U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_UPSILON>	: "Ὗ"	U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
@@ -3461,44 +3288,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_omega>	: "ὠ"	U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
 <dead_dasia> <Greek_omega>		: "ὡ"	U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
 <Multi_key> <parenleft> <Greek_omega>	: "ὡ"	U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
-<dead_grave> <U1F60>			: "ὢ"	U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F60>		: "ὢ"	U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_omega>	: "ὢ"	U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_omega>	: "ὢ"	U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_omega>	: "ὢ"	U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_omega>	: "ὢ"	U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<dead_grave> <U1F61>			: "ὣ"	U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F61>		: "ὣ"	U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_omega>	: "ὣ"	U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_omega>	: "ὣ"	U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_omega>	: "ὣ"	U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_omega>	: "ὣ"	U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<dead_acute> <U1F60>			: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F60>		: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F60>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_omega>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_omega>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_omega>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_omega>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_omega>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_omega>	: "ὤ"	U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<dead_acute> <U1F61>			: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F61>		: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F61>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_omega>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_omega>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_omega>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_omega>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_omega>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_omega>	: "ὥ"	U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<dead_tilde> <U1F60>			: "ὦ"	U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F60>	: "ὦ"	U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_omega>	: "ὦ"	U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_omega>	: "ὦ"	U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_omega>	: "ὦ"	U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_omega>	: "ὦ"	U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F61>			: "ὧ"	U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F61>	: "ὧ"	U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_omega>	: "ὧ"	U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_omega>	: "ὧ"	U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_omega>	: "ὧ"	U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
@@ -3507,44 +3320,30 @@ XCOMM Greek Extended
 <Multi_key> <parenright> <Greek_OMEGA>	: "Ὠ"	U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
 <dead_dasia> <Greek_OMEGA>		: "Ὡ"	U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
 <Multi_key> <parenleft> <Greek_OMEGA>	: "Ὡ"	U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
-<dead_grave> <U1F68>			: "Ὢ"	U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<Multi_key> <grave> <U1F68>		: "Ὢ"	U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
 <dead_grave> <dead_psili> <Greek_OMEGA>	: "Ὢ"	U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
 <dead_grave> <Multi_key> <parenright> <Greek_OMEGA>	: "Ὢ"	U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
 <Multi_key> <grave> <dead_psili> <Greek_OMEGA>	: "Ὢ"	U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
 <Multi_key> <grave> <parenright> <Greek_OMEGA>	: "Ὢ"	U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<dead_grave> <U1F69>			: "Ὣ"	U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<Multi_key> <grave> <U1F69>		: "Ὣ"	U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
 <dead_grave> <dead_dasia> <Greek_OMEGA>	: "Ὣ"	U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
 <dead_grave> <Multi_key> <parenleft> <Greek_OMEGA>	: "Ὣ"	U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
 <Multi_key> <grave> <dead_dasia> <Greek_OMEGA>	: "Ὣ"	U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
 <Multi_key> <grave> <parenleft> <Greek_OMEGA>	: "Ὣ"	U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<dead_acute> <U1F68>			: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <acute> <U1F68>		: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U1F68>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
 <dead_acute> <dead_psili> <Greek_OMEGA>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
 <dead_acute> <Multi_key> <parenright> <Greek_OMEGA>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <acute> <dead_psili> <Greek_OMEGA>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <acute> <parenright> <Greek_OMEGA>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
 <Multi_key> <apostrophe> <parenright> <Greek_OMEGA>	: "Ὤ"	U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<dead_acute> <U1F69>			: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <acute> <U1F69>		: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U1F69>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
 <dead_acute> <dead_dasia> <Greek_OMEGA>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
 <dead_acute> <Multi_key> <parenleft> <Greek_OMEGA>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <acute> <dead_dasia> <Greek_OMEGA>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_OMEGA>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_OMEGA>	: "Ὥ"	U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<dead_tilde> <U1F68>			: "Ὦ"	U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F68>	: "Ὦ"	U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <dead_tilde> <dead_psili> <Greek_OMEGA>	: "Ὦ"	U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenright> <Greek_OMEGA>	: "Ὦ"	U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_psili> <Greek_OMEGA>	: "Ὦ"	U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <Multi_key> <asciitilde> <parenright> <Greek_OMEGA>	: "Ὦ"	U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U1F69>			: "Ὧ"	U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U1F69>	: "Ὧ"	U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <dead_tilde> <dead_dasia> <Greek_OMEGA>	: "Ὧ"	U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <dead_tilde> <Multi_key> <parenleft> <Greek_OMEGA>	: "Ὧ"	U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_dasia> <Greek_OMEGA>	: "Ὧ"	U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
@@ -3563,24 +3362,14 @@ XCOMM Greek Extended
 <Multi_key> <grave> <Greek_upsilon>	: "ὺ"	U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
 <dead_grave> <Greek_omega>		: "ὼ"	U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
 <Multi_key> <grave> <Greek_omega>	: "ὼ"	U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
-<dead_iota> <U1F00>			: "ᾀ"	U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F00>	: "ᾀ"	U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
 <dead_iota> <dead_psili> <Greek_alpha>	: "ᾀ"	U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <parenright> <Greek_alpha>	: "ᾀ"	U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_psili> <Greek_alpha>	: "ᾀ"	U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <parenright> <Greek_alpha>	: "ᾀ"	U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U1F01>			: "ᾁ"	U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F01>	: "ᾁ"	U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
 <dead_iota> <dead_dasia> <Greek_alpha>	: "ᾁ"	U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <parenleft> <Greek_alpha>	: "ᾁ"	U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_dasia> <Greek_alpha>	: "ᾁ"	U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <parenleft> <Greek_alpha>	: "ᾁ"	U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U1F02>			: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F02>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U1F00>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F00>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F00>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F00>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <dead_psili> <Greek_alpha>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_alpha>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_psili> <Greek_alpha>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
@@ -3589,12 +3378,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_alpha>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_alpha>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenright> <Greek_alpha>	: "ᾂ"	U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U1F03>			: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F03>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U1F01>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F01>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F01>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F01>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <dead_dasia> <Greek_alpha>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_alpha>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_alpha>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
@@ -3603,18 +3386,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_alpha>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_alpha>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenleft> <Greek_alpha>	: "ᾃ"	U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U1F04>			: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F04>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U1F00>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F00>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F00>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F00>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F00>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F00>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <dead_psili> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
@@ -3623,18 +3396,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_alpha>	: "ᾄ"	U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U1F05>			: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F05>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U1F01>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F01>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F01>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F01>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F01>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F01>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <dead_dasia> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
@@ -3643,12 +3406,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_alpha>	: "ᾅ"	U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U1F06>			: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F06>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F00>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F00>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F00>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F00>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_psili> <Greek_alpha>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_alpha>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_alpha>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
@@ -3657,12 +3414,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_alpha>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_alpha>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_alpha>	: "ᾆ"	U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U1F07>			: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F07>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F01>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F01>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F01>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F01>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_alpha>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_alpha>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_alpha>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
@@ -3671,24 +3422,14 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_alpha>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_alpha>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_alpha>	: "ᾇ"	U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U1F08>			: "ᾈ"	U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F08>	: "ᾈ"	U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
 <dead_iota> <dead_psili> <Greek_ALPHA>	: "ᾈ"	U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾈ"	U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_psili> <Greek_ALPHA>	: "ᾈ"	U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <parenright> <Greek_ALPHA>	: "ᾈ"	U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U1F09>			: "ᾉ"	U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F09>	: "ᾉ"	U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
 <dead_iota> <dead_dasia> <Greek_ALPHA>	: "ᾉ"	U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾉ"	U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_dasia> <Greek_ALPHA>	: "ᾉ"	U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <parenleft> <Greek_ALPHA>	: "ᾉ"	U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U1F0A>			: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F0A>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U1F08>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F08>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F08>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F08>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <dead_psili> <Greek_ALPHA>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_psili> <Greek_ALPHA>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
@@ -3697,12 +3438,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_ALPHA>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_ALPHA>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenright> <Greek_ALPHA>	: "ᾊ"	U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U1F0B>			: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F0B>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U1F09>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F09>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F09>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F09>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <dead_dasia> <Greek_ALPHA>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_ALPHA>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
@@ -3711,18 +3446,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_ALPHA>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_ALPHA>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ALPHA>	: "ᾋ"	U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U1F0C>			: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F0C>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U1F08>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F08>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F08>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F08>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F08>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F08>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <dead_psili> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
@@ -3731,18 +3456,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ALPHA>	: "ᾌ"	U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U1F0D>			: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F0D>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U1F09>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F09>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F09>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F09>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F09>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F09>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <dead_dasia> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
@@ -3751,12 +3466,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_ALPHA>	: "ᾍ"	U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U1F0E>			: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F0E>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F08>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F08>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F08>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F08>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_psili> <Greek_ALPHA>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_ALPHA>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
@@ -3765,12 +3474,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_ALPHA>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_ALPHA>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_ALPHA>	: "ᾎ"	U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U1F0F>			: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F0F>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F09>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F09>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F09>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F09>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_ALPHA>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
@@ -3779,24 +3482,14 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_ALPHA>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_ALPHA>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_ALPHA>	: "ᾏ"	U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U1F20>			: "ᾐ"	U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F20>	: "ᾐ"	U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
 <dead_iota> <dead_psili> <Greek_eta>	: "ᾐ"	U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <parenright> <Greek_eta>	: "ᾐ"	U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_psili> <Greek_eta>	: "ᾐ"	U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <parenright> <Greek_eta>	: "ᾐ"	U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U1F21>			: "ᾑ"	U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F21>	: "ᾑ"	U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
 <dead_iota> <dead_dasia> <Greek_eta>	: "ᾑ"	U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <parenleft> <Greek_eta>	: "ᾑ"	U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_dasia> <Greek_eta>	: "ᾑ"	U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <parenleft> <Greek_eta>	: "ᾑ"	U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U1F22>			: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F22>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U1F20>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F20>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F20>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F20>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <dead_psili> <Greek_eta>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_eta>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_psili> <Greek_eta>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
@@ -3805,12 +3498,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_eta>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_eta>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenright> <Greek_eta>	: "ᾒ"	U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U1F23>			: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F23>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U1F21>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F21>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F21>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F21>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <dead_dasia> <Greek_eta>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_eta>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_eta>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
@@ -3819,18 +3506,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_eta>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_eta>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenleft> <Greek_eta>	: "ᾓ"	U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U1F24>			: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F24>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U1F20>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F20>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F20>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F20>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F20>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F20>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <dead_psili> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
@@ -3839,18 +3516,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_eta>	: "ᾔ"	U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U1F25>			: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F25>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U1F21>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F21>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F21>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F21>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F21>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F21>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <dead_dasia> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
@@ -3859,12 +3526,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_eta>	: "ᾕ"	U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U1F26>			: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F26>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F20>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F20>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F20>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F20>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_psili> <Greek_eta>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_eta>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_eta>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
@@ -3873,12 +3534,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_eta>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_eta>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_eta>	: "ᾖ"	U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U1F27>			: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F27>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F21>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F21>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F21>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F21>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_eta>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_eta>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_eta>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
@@ -3887,24 +3542,14 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_eta>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_eta>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_eta>	: "ᾗ"	U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U1F28>			: "ᾘ"	U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F28>	: "ᾘ"	U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
 <dead_iota> <dead_psili> <Greek_ETA>	: "ᾘ"	U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <parenright> <Greek_ETA>	: "ᾘ"	U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_psili> <Greek_ETA>	: "ᾘ"	U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <parenright> <Greek_ETA>	: "ᾘ"	U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U1F29>			: "ᾙ"	U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F29>	: "ᾙ"	U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
 <dead_iota> <dead_dasia> <Greek_ETA>	: "ᾙ"	U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <parenleft> <Greek_ETA>	: "ᾙ"	U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_dasia> <Greek_ETA>	: "ᾙ"	U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <parenleft> <Greek_ETA>	: "ᾙ"	U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U1F2A>			: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F2A>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U1F28>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F28>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F28>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F28>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <dead_psili> <Greek_ETA>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_ETA>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_psili> <Greek_ETA>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
@@ -3913,12 +3558,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_ETA>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_ETA>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenright> <Greek_ETA>	: "ᾚ"	U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U1F2B>			: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F2B>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U1F29>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F29>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F29>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F29>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <dead_dasia> <Greek_ETA>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_ETA>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_ETA>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
@@ -3927,18 +3566,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_ETA>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_ETA>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ETA>	: "ᾛ"	U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U1F2C>			: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F2C>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U1F28>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F28>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F28>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F28>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F28>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F28>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <dead_psili> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
@@ -3947,18 +3576,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ETA>	: "ᾜ"	U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U1F2D>			: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F2D>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U1F29>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F29>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F29>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F29>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F29>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F29>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <dead_dasia> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
@@ -3967,12 +3586,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_ETA>	: "ᾝ"	U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U1F2E>			: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F2E>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F28>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F28>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F28>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F28>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_psili> <Greek_ETA>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_ETA>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_ETA>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
@@ -3981,12 +3594,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_ETA>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_ETA>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_ETA>	: "ᾞ"	U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U1F2F>			: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F2F>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F29>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F29>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F29>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F29>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_ETA>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_ETA>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_ETA>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
@@ -3995,24 +3602,14 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_ETA>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_ETA>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_ETA>	: "ᾟ"	U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U1F60>			: "ᾠ"	U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F60>	: "ᾠ"	U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
 <dead_iota> <dead_psili> <Greek_omega>	: "ᾠ"	U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <parenright> <Greek_omega>	: "ᾠ"	U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_psili> <Greek_omega>	: "ᾠ"	U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <parenright> <Greek_omega>	: "ᾠ"	U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U1F61>			: "ᾡ"	U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F61>	: "ᾡ"	U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
 <dead_iota> <dead_dasia> <Greek_omega>	: "ᾡ"	U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <parenleft> <Greek_omega>	: "ᾡ"	U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_dasia> <Greek_omega>	: "ᾡ"	U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <parenleft> <Greek_omega>	: "ᾡ"	U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U1F62>			: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F62>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U1F60>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F60>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F60>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F60>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <dead_psili> <Greek_omega>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_omega>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_psili> <Greek_omega>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
@@ -4021,12 +3618,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_omega>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_omega>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenright> <Greek_omega>	: "ᾢ"	U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U1F63>			: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F63>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U1F61>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F61>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F61>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F61>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <dead_dasia> <Greek_omega>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_omega>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_omega>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
@@ -4035,18 +3626,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_omega>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_omega>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenleft> <Greek_omega>	: "ᾣ"	U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U1F64>			: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F64>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U1F60>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F60>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F60>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F60>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F60>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F60>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <dead_psili> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
@@ -4055,18 +3636,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_omega>	: "ᾤ"	U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U1F65>			: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F65>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U1F61>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F61>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F61>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F61>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F61>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F61>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <dead_dasia> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
@@ -4075,12 +3646,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_omega>	: "ᾥ"	U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U1F66>			: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F66>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F60>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F60>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F60>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F60>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_psili> <Greek_omega>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_omega>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_omega>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
@@ -4089,12 +3654,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_omega>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_omega>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_omega>	: "ᾦ"	U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U1F67>			: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F67>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F61>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F61>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F61>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F61>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_omega>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_omega>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_omega>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
@@ -4103,24 +3662,14 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_omega>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_omega>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_omega>	: "ᾧ"	U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U1F68>			: "ᾨ"	U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F68>	: "ᾨ"	U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
 <dead_iota> <dead_psili> <Greek_OMEGA>	: "ᾨ"	U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾨ"	U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_psili> <Greek_OMEGA>	: "ᾨ"	U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <parenright> <Greek_OMEGA>	: "ᾨ"	U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U1F69>			: "ᾩ"	U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F69>	: "ᾩ"	U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
 <dead_iota> <dead_dasia> <Greek_OMEGA>	: "ᾩ"	U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾩ"	U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_dasia> <Greek_OMEGA>	: "ᾩ"	U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <parenleft> <Greek_OMEGA>	: "ᾩ"	U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U1F6A>			: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F6A>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U1F68>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F68>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F68>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F68>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <dead_psili> <Greek_OMEGA>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_psili> <Greek_OMEGA>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
@@ -4129,12 +3678,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_OMEGA>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_OMEGA>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenright> <Greek_OMEGA>	: "ᾪ"	U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U1F6B>			: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F6B>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U1F69>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U1F69>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U1F69>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U1F69>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <dead_dasia> <Greek_OMEGA>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_OMEGA>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
@@ -4143,18 +3686,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_OMEGA>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_OMEGA>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <parenleft> <Greek_OMEGA>	: "ᾫ"	U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U1F6C>			: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F6C>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U1F68>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F68>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F68>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F68>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F68>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F68>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <dead_psili> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
@@ -4163,18 +3696,8 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_OMEGA>	: "ᾬ"	U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U1F6D>			: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F6D>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U1F69>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U1F69>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U1F69>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U1F69>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U1F69>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U1F69>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <dead_dasia> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
@@ -4183,12 +3706,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_OMEGA>	: "ᾭ"	U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U1F6E>			: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F6E>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F68>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F68>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F68>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F68>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_psili> <Greek_OMEGA>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_OMEGA>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
@@ -4197,12 +3714,6 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_OMEGA>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_OMEGA>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_OMEGA>	: "ᾮ"	U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U1F6F>			: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F6F>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U1F69>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U1F69>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U1F69>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U1F69>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_OMEGA>	: "ᾯ"	U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
@@ -4217,26 +3728,19 @@ XCOMM Greek Extended
 <dead_macron> <Greek_alpha>		: "ᾱ"	U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON
 <Multi_key> <macron> <Greek_alpha>	: "ᾱ"	U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON
 <Multi_key> <underscore> <Greek_alpha>	: "ᾱ"	U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON
-<dead_iota> <U1F70>			: "ᾲ"	U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F70>	: "ᾲ"	U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Greek_alpha>	: "ᾲ"	U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <Greek_alpha>	: "ᾲ"	U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <Greek_alpha>	: "ᾲ"	U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <Greek_alpha>	: "ᾲ"	U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <Greek_alpha>		: "ᾳ"	U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_alpha>	: "ᾳ"	U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-<dead_iota> <Greek_alphaaccent>		: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <Greek_alphaaccent>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Greek_alpha>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <Greek_alpha>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <Greek_alpha>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <Greek_alpha>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <Greek_alpha>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <Greek_alpha>	: "ᾴ"	U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 <dead_tilde> <Greek_alpha>		: "ᾶ"	U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_alpha>	: "ᾶ"	U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-<dead_iota> <U1FB6>			: "ᾷ"	U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1FB6>	: "ᾷ"	U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Greek_alpha>	: "ᾷ"	U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <Greek_alpha>	: "ᾷ"	U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <Greek_alpha>	: "ᾷ"	U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
@@ -4253,26 +3757,19 @@ XCOMM Greek Extended
 <Multi_key> <Greek_iota> <Greek_ALPHA>	: "ᾼ"	U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
 <Multi_key> <diaeresis> <dead_tilde>	: "῁"	U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
 <Multi_key> <diaeresis> <asciitilde>	: "῁"	U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
-<dead_iota> <U1F74>			: "ῂ"	U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F74>	: "ῂ"	U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Greek_eta>	: "ῂ"	U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <Greek_eta>	: "ῂ"	U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <Greek_eta>	: "ῂ"	U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <Greek_eta>	: "ῂ"	U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <Greek_eta>			: "ῃ"	U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_eta>	: "ῃ"	U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-<dead_iota> <Greek_etaaccent>		: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <Greek_etaaccent>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Greek_eta>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <Greek_eta>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <Greek_eta>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <Greek_eta>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <Greek_eta>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <Greek_eta>	: "ῄ"	U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 <dead_tilde> <Greek_eta>		: "ῆ"	U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_eta>	: "ῆ"	U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
-<dead_iota> <U1FC6>			: "ῇ"	U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1FC6>	: "ῇ"	U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Greek_eta>	: "ῇ"	U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <Greek_eta>	: "ῇ"	U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <Greek_eta>	: "ῇ"	U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
@@ -4283,29 +3780,18 @@ XCOMM Greek Extended
 <Multi_key> <grave> <Greek_ETA>		: "Ὴ"	U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
 <dead_iota> <Greek_ETA>			: "ῌ"	U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_ETA>	: "ῌ"	U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-<Multi_key> <U1FBF> <dead_grave>	: "῍"	U1FCD # GREEK PSILI AND VARIA
-<Multi_key> <U1FBF> <grave>		: "῍"	U1FCD # GREEK PSILI AND VARIA
-<Multi_key> <U1FBF> <dead_acute>	: "῎"	U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U1FBF> <acute>		: "῎"	U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U1FBF> <apostrophe>	: "῎"	U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U1FBF> <dead_tilde>	: "῏"	U1FCF # GREEK PSILI AND PERISPOMENI
-<Multi_key> <U1FBF> <asciitilde>	: "῏"	U1FCF # GREEK PSILI AND PERISPOMENI
 <dead_breve> <Greek_iota>		: "ῐ"	U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
 <Multi_key> <U> <Greek_iota>		: "ῐ"	U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
 <Multi_key> <b> <Greek_iota>		: "ῐ"	U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
 <dead_macron> <Greek_iota>		: "ῑ"	U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON
 <Multi_key> <macron> <Greek_iota>	: "ῑ"	U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON
 <Multi_key> <underscore> <Greek_iota>	: "ῑ"	U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON
-<dead_grave> <Greek_iotadieresis>	: "ῒ"	U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<Multi_key> <grave> <Greek_iotadieresis>	: "ῒ"	U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
 <dead_grave> <dead_diaeresis> <Greek_iota>	: "ῒ"	U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
 <dead_grave> <Multi_key> <quotedbl> <Greek_iota>	: "ῒ"	U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
 <Multi_key> <grave> <dead_diaeresis> <Greek_iota>	: "ῒ"	U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
 <Multi_key> <grave> <quotedbl> <Greek_iota>	: "ῒ"	U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
 <dead_tilde> <Greek_iota>		: "ῖ"	U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_iota>	: "ῖ"	U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
-<dead_tilde> <Greek_iotadieresis>	: "ῗ"	U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-<Multi_key> <asciitilde> <Greek_iotadieresis>	: "ῗ"	U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
 <dead_tilde> <dead_diaeresis> <Greek_iota>	: "ῗ"	U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
 <dead_tilde> <Multi_key> <quotedbl> <Greek_iota>	: "ῗ"	U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_diaeresis> <Greek_iota>	: "ῗ"	U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
@@ -4318,21 +3804,12 @@ XCOMM Greek Extended
 <Multi_key> <underscore> <Greek_IOTA>	: "Ῑ"	U1FD9 # GREEK CAPITAL LETTER IOTA WITH MACRON
 <dead_grave> <Greek_IOTA>		: "Ὶ"	U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
 <Multi_key> <grave> <Greek_IOTA>	: "Ὶ"	U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
-<Multi_key> <U1FFE> <dead_grave>	: "῝"	U1FDD # GREEK DASIA AND VARIA
-<Multi_key> <U1FFE> <grave>		: "῝"	U1FDD # GREEK DASIA AND VARIA
-<Multi_key> <U1FFE> <dead_acute>	: "῞"	U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U1FFE> <acute>		: "῞"	U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U1FFE> <apostrophe>	: "῞"	U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U1FFE> <dead_tilde>	: "῟"	U1FDF # GREEK DASIA AND PERISPOMENI
-<Multi_key> <U1FFE> <asciitilde>	: "῟"	U1FDF # GREEK DASIA AND PERISPOMENI
 <dead_breve> <Greek_upsilon>		: "ῠ"	U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
 <Multi_key> <U> <Greek_upsilon>		: "ῠ"	U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
 <Multi_key> <b> <Greek_upsilon>		: "ῠ"	U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
 <dead_macron> <Greek_upsilon>		: "ῡ"	U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON
 <Multi_key> <macron> <Greek_upsilon>	: "ῡ"	U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON
 <Multi_key> <underscore> <Greek_upsilon>	: "ῡ"	U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON
-<dead_grave> <Greek_upsilondieresis>	: "ῢ"	U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<Multi_key> <grave> <Greek_upsilondieresis>	: "ῢ"	U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
 <dead_grave> <dead_diaeresis> <Greek_upsilon>	: "ῢ"	U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
 <dead_grave> <Multi_key> <quotedbl> <Greek_upsilon>	: "ῢ"	U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
 <Multi_key> <grave> <dead_diaeresis> <Greek_upsilon>	: "ῢ"	U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
@@ -4343,8 +3820,6 @@ XCOMM Greek Extended
 <Multi_key> <parenleft> <Greek_rho>	: "ῥ"	U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
 <dead_tilde> <Greek_upsilon>		: "ῦ"	U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_upsilon>	: "ῦ"	U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-<dead_tilde> <Greek_upsilondieresis>	: "ῧ"	U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-<Multi_key> <asciitilde> <Greek_upsilondieresis>	: "ῧ"	U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
 <dead_tilde> <dead_diaeresis> <Greek_upsilon>	: "ῧ"	U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
 <dead_tilde> <Multi_key> <quotedbl> <Greek_upsilon>	: "ῧ"	U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
 <Multi_key> <asciitilde> <dead_diaeresis> <Greek_upsilon>	: "ῧ"	U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
@@ -4361,26 +3836,19 @@ XCOMM Greek Extended
 <Multi_key> <parenleft> <Greek_RHO>	: "Ῥ"	U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
 <Multi_key> <diaeresis> <dead_grave>	: "῭"	U1FED # GREEK DIALYTIKA AND VARIA
 <Multi_key> <diaeresis> <grave>		: "῭"	U1FED # GREEK DIALYTIKA AND VARIA
-<dead_iota> <U1F7C>			: "ῲ"	U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1F7C>	: "ῲ"	U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <dead_grave> <Greek_omega>	: "ῲ"	U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <Greek_omega>	: "ῲ"	U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <Greek_omega>	: "ῲ"	U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <grave> <Greek_omega>	: "ῲ"	U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
 <dead_iota> <Greek_omega>		: "ῳ"	U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_omega>	: "ῳ"	U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-<dead_iota> <Greek_omegaaccent>		: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <Greek_omegaaccent>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 <dead_iota> <dead_acute> <Greek_omega>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <Greek_omega>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <apostrophe> <Greek_omega>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <Greek_omega>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <Greek_omega>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <apostrophe> <Greek_omega>	: "ῴ"	U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
 <dead_tilde> <Greek_omega>		: "ῶ"	U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_omega>	: "ῶ"	U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-<dead_iota> <U1FF6>			: "ῷ"	U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U1FF6>	: "ῷ"	U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <dead_tilde> <Greek_omega>	: "ῷ"	U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <Greek_omega>	: "ῷ"	U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <Greek_omega>	: "ῷ"	U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
@@ -4428,6 +3896,7 @@ XCOMM Superscripts and Subscripts
 <dead_circumflex> <KP_Add>			: "⁺"	U207A # SUPERSCRIPT PLUS SIGN
 <Multi_key> <asciicircum> <KP_Add>		: "⁺"	U207A # SUPERSCRIPT PLUS SIGN
 <dead_circumflex> <minus>			: "⁻"	U207B # SUPERSCRIPT MINUS
+<Multi_key> <asciicircum> <minus>		: "⁻"	U207B # SUPERSCRIPT MINUS
 <dead_circumflex> <U2212>			: "⁻"	U207B # SUPERSCRIPT MINUS
 <Multi_key> <asciicircum> <U2212>		: "⁻"	U207B # SUPERSCRIPT MINUS
 <dead_circumflex> <equal>			: "⁼"	U207C # SUPERSCRIPT EQUALS SIGN
@@ -4440,49 +3909,62 @@ XCOMM Superscripts and Subscripts
 <Multi_key> <asciicircum> <parenright>		: "⁾"	U207E # SUPERSCRIPT RIGHT PARENTHESIS
 <dead_circumflex> <Multi_key> <underscore> <n>	: "ⁿ"	U207F # SUPERSCRIPT LATIN SMALL LETTER N
 <Multi_key> <asciicircum> <underscore> <n>	: "ⁿ"	U207F # SUPERSCRIPT LATIN SMALL LETTER N
+<dead_caron> <0>				: "₀"	U2080 # SUBSCRIPT ZERO
 <Multi_key> <underscore> <0>			: "₀"	U2080 # SUBSCRIPT ZERO
 <Multi_key> <underscore> <KP_0>			: "₀"	U2080 # SUBSCRIPT ZERO
+<dead_caron> <1>				: "₁"	U2081 # SUBSCRIPT ONE
 <Multi_key> <underscore> <1>			: "₁"	U2081 # SUBSCRIPT ONE
 <Multi_key> <underscore> <KP_1>			: "₁"	U2081 # SUBSCRIPT ONE
+<dead_caron> <2>				: "₂"	U2082 # SUBSCRIPT TWO
 <Multi_key> <underscore> <2>			: "₂"	U2082 # SUBSCRIPT TWO
 <Multi_key> <underscore> <KP_2>			: "₂"	U2082 # SUBSCRIPT TWO
+<dead_caron> <3>				: "₃"	U2083 # SUBSCRIPT THREE
 <Multi_key> <underscore> <3>			: "₃"	U2083 # SUBSCRIPT THREE
 <Multi_key> <underscore> <KP_3>			: "₃"	U2083 # SUBSCRIPT THREE
+<dead_caron> <4>				: "₄"	U2084 # SUBSCRIPT FOUR
 <Multi_key> <underscore> <4>			: "₄"	U2084 # SUBSCRIPT FOUR
 <Multi_key> <underscore> <KP_4>			: "₄"	U2084 # SUBSCRIPT FOUR
+<dead_caron> <5>				: "₅"	U2085 # SUBSCRIPT FIVE
 <Multi_key> <underscore> <5>			: "₅"	U2085 # SUBSCRIPT FIVE
 <Multi_key> <underscore> <KP_5>			: "₅"	U2085 # SUBSCRIPT FIVE
+<dead_caron> <6>				: "₆"	U2086 # SUBSCRIPT SIX
 <Multi_key> <underscore> <6>			: "₆"	U2086 # SUBSCRIPT SIX
 <Multi_key> <underscore> <KP_6>			: "₆"	U2086 # SUBSCRIPT SIX
+<dead_caron> <7>				: "₇"	U2087 # SUBSCRIPT SEVEN
 <Multi_key> <underscore> <7>			: "₇"	U2087 # SUBSCRIPT SEVEN
 <Multi_key> <underscore> <KP_7>			: "₇"	U2087 # SUBSCRIPT SEVEN
+<dead_caron> <8>				: "₈"	U2088 # SUBSCRIPT EIGHT
 <Multi_key> <underscore> <8>			: "₈"	U2088 # SUBSCRIPT EIGHT
 <Multi_key> <underscore> <KP_8>			: "₈"	U2088 # SUBSCRIPT EIGHT
+<dead_caron> <9>				: "₉"	U2089 # SUBSCRIPT NINE
 <Multi_key> <underscore> <9>			: "₉"	U2089 # SUBSCRIPT NINE
 <Multi_key> <underscore> <KP_9>			: "₉"	U2089 # SUBSCRIPT NINE
+<dead_caron> <plus>				: "₊"	U208A # SUBSCRIPT PLUS SIGN
 <Multi_key> <underscore> <plus>			: "₊"	U208A # SUBSCRIPT PLUS SIGN
 <Multi_key> <underscore> <KP_Add>		: "₊"	U208A # SUBSCRIPT PLUS SIGN
+<dead_caron> <minus>				: "₋"	U208B # SUBSCRIPT MINUS
+<Multi_key> <underscore> <minus>		: "₋"	U208B # SUBSCRIPT MINUS
 <Multi_key> <underscore> <U2212>		: "₋"	U208B # SUBSCRIPT MINUS
+<dead_caron> <equal>				: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <Multi_key> <underscore> <equal>		: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <Multi_key> <underscore> <KP_Equal>		: "₌"	U208C # SUBSCRIPT EQUALS SIGN
+<dead_caron> <parenleft>			: "₍"	U208D # SUBSCRIPT LEFT PARENTHESIS
 <Multi_key> <underscore> <parenleft>		: "₍"	U208D # SUBSCRIPT LEFT PARENTHESIS
+<dead_caron> <parenright>			: "₎"	U208E # SUBSCRIPT RIGHT PARENTHESIS
 <Multi_key> <underscore> <parenright>		: "₎"	U208E # SUBSCRIPT RIGHT PARENTHESIS
 
 XCOMM Letterlike Symbols
+<Multi_key> <C> <C>			: "ℂ"	U2102 # DOUBLE-STRUCK CAPITAL C
+<Multi_key> <N> <N>			: "ℕ"	U2115 # DOUBLE-STRUCK CAPITAL N
+<Multi_key> <Q> <Q>			: "ℚ"	U211A # DOUBLE-STRUCK CAPITAL Q
+<Multi_key> <R> <R>			: "ℝ"	U211D # DOUBLE-STRUCK CAPITAL R
+<Multi_key> <Z> <Z>			: "ℤ"	U2124 # DOUBLE-STRUCK CAPITAL Z
 <dead_circumflex> <Multi_key> <S> <M>	: "℠"	U2120 # SERVICE MARK
 <Multi_key> <S> <M>			: "℠"	U2120 # SERVICE MARK
-<dead_circumflex> <Multi_key> <s> <M>	: "℠"	U2120 # SERVICE MARK
-<Multi_key> <s> <M>			: "℠"	U2120 # SERVICE MARK
-<dead_circumflex> <Multi_key> <S> <m>	: "℠"	U2120 # SERVICE MARK
-<Multi_key> <S> <m>			: "℠"	U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <s> <m>	: "℠"	U2120 # SERVICE MARK
 <Multi_key> <s> <m>			: "℠"	U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <T> <M>	: "™"	U2122 # TRADE MARK SIGN
 <Multi_key> <T> <M>			: "™"	U2122 # TRADE MARK SIGN
-<dead_circumflex> <Multi_key> <t> <M>	: "™"	U2122 # TRADE MARK SIGN
-<Multi_key> <t> <M>			: "™"	U2122 # TRADE MARK SIGN
-<dead_circumflex> <Multi_key> <T> <m>	: "™"	U2122 # TRADE MARK SIGN
-<Multi_key> <T> <m>			: "™"	U2122 # TRADE MARK SIGN
 <dead_circumflex> <Multi_key> <t> <m>	: "™"	U2122 # TRADE MARK SIGN
 <Multi_key> <t> <m>			: "™"	U2122 # TRADE MARK SIGN
 
@@ -4525,54 +4007,50 @@ XCOMM Arrows
 <Multi_key> <equal> <v>			: "⇓"	U21D3 # DOWNWARDS DOUBLE ARROW
 
 XCOMM Mathematical Operators
-<Multi_key> <U2203> <U0338>		: "∄"	U2204 # THERE DOES NOT EXIST
+<Multi_key> <U2203> <slash>		: "∄"	U2204 # THERE DOES NOT EXIST
 <Multi_key> <braceleft> <braceright>	: "∅"	U2205 # EMPTY SET
-<Multi_key> <U2208> <U0338>		: "∉"	U2209 # NOT AN ELEMENT OF
-<Multi_key> <U220B> <U0338>		: "∌"	U220C # DOES NOT CONTAIN AS MEMBER
-<Multi_key> <U2223> <U0338>		: "∤"	U2224 # DOES NOT DIVIDE
-<Multi_key> <U2225> <U0338>		: "∦"	U2226 # NOT PARALLEL TO
-<Multi_key> <U223C> <U0338>		: "≁"	U2241 # NOT TILDE
-<Multi_key> <U2243> <U0338>		: "≄"	U2244 # NOT ASYMPTOTICALLY EQUAL TO
-<Multi_key> <approximate> <U0338>	: "≇"	U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
-<Multi_key> <U2248> <U0338>		: "≉"	U2249 # NOT ALMOST EQUAL TO
+<Multi_key> <U2208> <slash>		: "∉"	U2209 # NOT AN ELEMENT OF
+<Multi_key> <U220B> <slash>		: "∌"	U220C # DOES NOT CONTAIN AS MEMBER
+<Multi_key> <minus> <underscore>	: "−"	U2212 # MINUS SIGN
+<Multi_key> <U2223> <slash>		: "∤"	U2224 # DOES NOT DIVIDE
+<Multi_key> <U2225> <slash>		: "∦"	U2226 # NOT PARALLEL TO
+<Multi_key> <U223C> <slash>		: "≁"	U2241 # NOT TILDE
+<Multi_key> <U2243> <slash>		: "≄"	U2244 # NOT ASYMPTOTICALLY EQUAL TO
+<Multi_key> <approximate> <slash>	: "≇"	U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
+<Multi_key> <U2248> <slash>		: "≉"	U2249 # NOT ALMOST EQUAL TO
 <Multi_key> <slash> <equal>		: "≠"	U2260 # NOT EQUAL TO
 <Multi_key> <equal> <slash>		: "≠"	U2260 # NOT EQUAL TO
-<Multi_key> <equal> <U0338>		: "≠"	U2260 # NOT EQUAL TO
-<Multi_key> <KP_Equal> <U0338>		: "≠"	U2260 # NOT EQUAL TO
-<Multi_key> <identical> <U0338>		: "≢"	U2262 # NOT IDENTICAL TO
+<Multi_key> <KP_Equal> <slash>		: "≠"	U2260 # NOT EQUAL TO
+<Multi_key> <identical> <slash>		: "≢"	U2262 # NOT IDENTICAL TO
 <Multi_key> <less> <equal>		: "≤"	U2264 # LESS-THAN OR EQUAL TO
 <Multi_key> <greater> <equal>		: "≥"	U2265 # GREATER-THAN OR EQUAL TO
-<Multi_key> <U224D> <U0338>		: "≭"	U226D # NOT EQUIVALENT TO
-<Multi_key> <less> <U0338>		: "≮"	U226E # NOT LESS-THAN
-<Multi_key> <leftcaret> <U0338>		: "≮"	U226E # NOT LESS-THAN
-<Multi_key> <greater> <U0338>		: "≯"	U226F # NOT GREATER-THAN
-<Multi_key> <rightcaret> <U0338>	: "≯"	U226F # NOT GREATER-THAN
-<Multi_key> <lessthanequal> <U0338>	: "≰"	U2270 # NEITHER LESS-THAN NOR EQUAL TO
-<Multi_key> <greaterthanequal> <U0338>	: "≱"	U2271 # NEITHER GREATER-THAN NOR EQUAL TO
-<Multi_key> <U2272> <U0338>		: "≴"	U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO
-<Multi_key> <U2273> <U0338>		: "≵"	U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO
-<Multi_key> <U2276> <U0338>		: "≸"	U2278 # NEITHER LESS-THAN NOR GREATER-THAN
-<Multi_key> <U2277> <U0338>		: "≹"	U2279 # NEITHER GREATER-THAN NOR LESS-THAN
-<Multi_key> <U227A> <U0338>		: "⊀"	U2280 # DOES NOT PRECEDE
-<Multi_key> <U227B> <U0338>		: "⊁"	U2281 # DOES NOT SUCCEED
-<Multi_key> <includedin> <U0338>	: "⊄"	U2284 # NOT A SUBSET OF
-<Multi_key> <leftshoe> <U0338>		: "⊄"	U2284 # NOT A SUBSET OF
-<Multi_key> <includes> <U0338>		: "⊅"	U2285 # NOT A SUPERSET OF
-<Multi_key> <rightshoe> <U0338>		: "⊅"	U2285 # NOT A SUPERSET OF
-<Multi_key> <U2286> <U0338>		: "⊈"	U2288 # NEITHER A SUBSET OF NOR EQUAL TO
-<Multi_key> <U2287> <U0338>		: "⊉"	U2289 # NEITHER A SUPERSET OF NOR EQUAL TO
-<Multi_key> <righttack> <U0338>		: "⊬"	U22AC # DOES NOT PROVE
-<Multi_key> <U22A8> <U0338>		: "⊭"	U22AD # NOT TRUE
-<Multi_key> <U22A9> <U0338>		: "⊮"	U22AE # DOES NOT FORCE
-<Multi_key> <U22AB> <U0338>		: "⊯"	U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
-<Multi_key> <U227C> <U0338>		: "⋠"	U22E0 # DOES NOT PRECEDE OR EQUAL
-<Multi_key> <U227D> <U0338>		: "⋡"	U22E1 # DOES NOT SUCCEED OR EQUAL
-<Multi_key> <U2291> <U0338>		: "⋢"	U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO
-<Multi_key> <U2292> <U0338>		: "⋣"	U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO
-<Multi_key> <U22B2> <U0338>		: "⋪"	U22EA # NOT NORMAL SUBGROUP OF
-<Multi_key> <U22B3> <U0338>		: "⋫"	U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP
-<Multi_key> <U22B4> <U0338>		: "⋬"	U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO
-<Multi_key> <U22B5> <U0338>		: "⋭"	U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
+<Multi_key> <U224D> <slash>		: "≭"	U226D # NOT EQUIVALENT TO
+<Multi_key> <less> <slash>		: "≮"	U226E # NOT LESS-THAN
+<Multi_key> <greater> <slash>		: "≯"	U226F # NOT GREATER-THAN
+<Multi_key> <lessthanequal> <slash>	: "≰"	U2270 # NEITHER LESS-THAN NOR EQUAL TO
+<Multi_key> <greaterthanequal> <slash>	: "≱"	U2271 # NEITHER GREATER-THAN NOR EQUAL TO
+<Multi_key> <U2272> <slash>		: "≴"	U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO
+<Multi_key> <U2273> <slash>		: "≵"	U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO
+<Multi_key> <U2276> <slash>		: "≸"	U2278 # NEITHER LESS-THAN NOR GREATER-THAN
+<Multi_key> <U2277> <slash>		: "≹"	U2279 # NEITHER GREATER-THAN NOR LESS-THAN
+<Multi_key> <U227A> <slash>		: "⊀"	U2280 # DOES NOT PRECEDE
+<Multi_key> <U227B> <slash>		: "⊁"	U2281 # DOES NOT SUCCEED
+<Multi_key> <includedin> <slash>	: "⊄"	U2284 # NOT A SUBSET OF
+<Multi_key> <includes> <slash>		: "⊅"	U2285 # NOT A SUPERSET OF
+<Multi_key> <U2286> <slash>		: "⊈"	U2288 # NEITHER A SUBSET OF NOR EQUAL TO
+<Multi_key> <U2287> <slash>		: "⊉"	U2289 # NEITHER A SUPERSET OF NOR EQUAL TO
+<Multi_key> <righttack> <slash>		: "⊬"	U22AC # DOES NOT PROVE
+<Multi_key> <U22A8> <slash>		: "⊭"	U22AD # NOT TRUE
+<Multi_key> <U22A9> <slash>		: "⊮"	U22AE # DOES NOT FORCE
+<Multi_key> <U22AB> <slash>		: "⊯"	U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
+<Multi_key> <U227C> <slash>		: "⋠"	U22E0 # DOES NOT PRECEDE OR EQUAL
+<Multi_key> <U227D> <slash>		: "⋡"	U22E1 # DOES NOT SUCCEED OR EQUAL
+<Multi_key> <U2291> <slash>		: "⋢"	U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO
+<Multi_key> <U2292> <slash>		: "⋣"	U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO
+<Multi_key> <U22B2> <slash>		: "⋪"	U22EA # NOT NORMAL SUBGROUP OF
+<Multi_key> <U22B3> <slash>		: "⋫"	U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP
+<Multi_key> <U22B4> <slash>		: "⋬"	U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO
+<Multi_key> <U22B5> <slash>		: "⋭"	U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
 
 <Multi_key> <d> <i>			: "⌀"	U2300 # DIAMETER SIGN
 
@@ -4596,48 +4074,26 @@ XCOMM Enclosed Alphanumerics
 <Multi_key> <parenleft> <9> <parenright>		: "⑨"	U2468 # CIRCLED DIGIT NINE
 <Multi_key> <parenleft> <KP_9> <parenright>		: "⑨"	U2468 # CIRCLED DIGIT NINE
 <Multi_key> <parenleft> <1> <0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
-<Multi_key> <parenleft> <1> <KP_0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
-<Multi_key> <parenleft> <KP_1> <0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
 <Multi_key> <parenleft> <KP_1> <KP_0> <parenright>	: "⑩"	U2469 # CIRCLED NUMBER TEN
 <Multi_key> <parenleft> <1> <1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
-<Multi_key> <parenleft> <1> <KP_1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
-<Multi_key> <parenleft> <KP_1> <1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
 <Multi_key> <parenleft> <KP_1> <KP_1> <parenright>	: "⑪"	U246A # CIRCLED NUMBER ELEVEN
 <Multi_key> <parenleft> <1> <2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
-<Multi_key> <parenleft> <1> <KP_2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
-<Multi_key> <parenleft> <KP_1> <2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
 <Multi_key> <parenleft> <KP_1> <KP_2> <parenright>	: "⑫"	U246B # CIRCLED NUMBER TWELVE
 <Multi_key> <parenleft> <1> <3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
-<Multi_key> <parenleft> <1> <KP_3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
-<Multi_key> <parenleft> <KP_1> <3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
 <Multi_key> <parenleft> <KP_1> <KP_3> <parenright>	: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
 <Multi_key> <parenleft> <1> <4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
-<Multi_key> <parenleft> <1> <KP_4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
-<Multi_key> <parenleft> <KP_1> <4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
 <Multi_key> <parenleft> <KP_1> <KP_4> <parenright>	: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
 <Multi_key> <parenleft> <1> <5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
-<Multi_key> <parenleft> <1> <KP_5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
-<Multi_key> <parenleft> <KP_1> <5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
 <Multi_key> <parenleft> <KP_1> <KP_5> <parenright>	: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
 <Multi_key> <parenleft> <1> <6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
-<Multi_key> <parenleft> <1> <KP_6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
-<Multi_key> <parenleft> <KP_1> <6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
 <Multi_key> <parenleft> <KP_1> <KP_6> <parenright>	: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
 <Multi_key> <parenleft> <1> <7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
-<Multi_key> <parenleft> <1> <KP_7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
-<Multi_key> <parenleft> <KP_1> <7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
 <Multi_key> <parenleft> <KP_1> <KP_7> <parenright>	: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
 <Multi_key> <parenleft> <1> <8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
-<Multi_key> <parenleft> <1> <KP_8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
-<Multi_key> <parenleft> <KP_1> <8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
 <Multi_key> <parenleft> <KP_1> <KP_8> <parenright>	: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
 <Multi_key> <parenleft> <1> <9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
-<Multi_key> <parenleft> <1> <KP_9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
-<Multi_key> <parenleft> <KP_1> <9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
 <Multi_key> <parenleft> <KP_1> <KP_9> <parenright>	: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
 <Multi_key> <parenleft> <2> <0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
-<Multi_key> <parenleft> <2> <KP_0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
-<Multi_key> <parenleft> <KP_2> <0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
 <Multi_key> <parenleft> <KP_2> <KP_0> <parenright>	: "⑳"	U2473 # CIRCLED NUMBER TWENTY
 <Multi_key> <parenleft> <A> <parenright>	: "Ⓐ"	U24B6 # CIRCLED LATIN CAPITAL LETTER A
 <Multi_key> <parenleft> <B> <parenright>	: "Ⓑ"	U24B7 # CIRCLED LATIN CAPITAL LETTER B
@@ -4701,7 +4157,7 @@ XCOMM Supplemental Mathematical Operators
 <dead_belowdot> <equal>				: "⩦"	U2A66 # EQUALS SIGN WITH DOT BELOW
 <dead_diaeresis> <dead_belowdiaeresis> <equal>	: "⩷"	U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
 <dead_belowdiaeresis> <dead_diaeresis> <equal>	: "⩷"	U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
-<Multi_key> <U2ADD> <U0338>			: "⫝̸"	U2ADC # FORKING
+<Multi_key> <U2ADD> <slash>			: "⫝̸"	U2ADC # FORKING
 <dead_belowring> <bar>				: "⫰"	U2AF0 # VERTICAL LINE WITH CIRCLE BELOW
 
 XCOMM Hiragana
@@ -4798,64 +4254,34 @@ XCOMM Kanbun
 
 XCOMM Enclosed CJK Letters and Months
 <Multi_key> <parenleft> <2> <1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
-<Multi_key> <parenleft> <2> <KP_1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
-<Multi_key> <parenleft> <KP_2> <1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
 <Multi_key> <parenleft> <KP_2> <KP_1> <parenright>	: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
 <Multi_key> <parenleft> <2> <2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
-<Multi_key> <parenleft> <2> <KP_2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
-<Multi_key> <parenleft> <KP_2> <2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
 <Multi_key> <parenleft> <KP_2> <KP_2> <parenright>	: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
 <Multi_key> <parenleft> <2> <3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
-<Multi_key> <parenleft> <2> <KP_3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
-<Multi_key> <parenleft> <KP_2> <3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
 <Multi_key> <parenleft> <KP_2> <KP_3> <parenright>	: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
 <Multi_key> <parenleft> <2> <4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
-<Multi_key> <parenleft> <2> <KP_4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
-<Multi_key> <parenleft> <KP_2> <4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
 <Multi_key> <parenleft> <KP_2> <KP_4> <parenright>	: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
 <Multi_key> <parenleft> <2> <5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
-<Multi_key> <parenleft> <2> <KP_5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
-<Multi_key> <parenleft> <KP_2> <5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
 <Multi_key> <parenleft> <KP_2> <KP_5> <parenright>	: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
 <Multi_key> <parenleft> <2> <6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
-<Multi_key> <parenleft> <2> <KP_6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
-<Multi_key> <parenleft> <KP_2> <6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
 <Multi_key> <parenleft> <KP_2> <KP_6> <parenright>	: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
 <Multi_key> <parenleft> <2> <7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
-<Multi_key> <parenleft> <2> <KP_7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
-<Multi_key> <parenleft> <KP_2> <7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
 <Multi_key> <parenleft> <KP_2> <KP_7> <parenright>	: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
 <Multi_key> <parenleft> <2> <8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
-<Multi_key> <parenleft> <2> <KP_8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
-<Multi_key> <parenleft> <KP_2> <8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
 <Multi_key> <parenleft> <KP_2> <KP_8> <parenright>	: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
 <Multi_key> <parenleft> <2> <9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
-<Multi_key> <parenleft> <2> <KP_9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
-<Multi_key> <parenleft> <KP_2> <9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
 <Multi_key> <parenleft> <KP_2> <KP_9> <parenright>	: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
 <Multi_key> <parenleft> <3> <0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
-<Multi_key> <parenleft> <3> <KP_0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
-<Multi_key> <parenleft> <KP_3> <0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
 <Multi_key> <parenleft> <KP_3> <KP_0> <parenright>	: "㉚"	U325A # CIRCLED NUMBER THIRTY
 <Multi_key> <parenleft> <3> <1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
-<Multi_key> <parenleft> <3> <KP_1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
-<Multi_key> <parenleft> <KP_3> <1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
 <Multi_key> <parenleft> <KP_3> <KP_1> <parenright>	: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
 <Multi_key> <parenleft> <3> <2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
-<Multi_key> <parenleft> <3> <KP_2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
-<Multi_key> <parenleft> <KP_3> <2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
 <Multi_key> <parenleft> <KP_3> <KP_2> <parenright>	: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
 <Multi_key> <parenleft> <3> <3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
-<Multi_key> <parenleft> <3> <KP_3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
-<Multi_key> <parenleft> <KP_3> <3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
 <Multi_key> <parenleft> <KP_3> <KP_3> <parenright>	: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
 <Multi_key> <parenleft> <3> <4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
-<Multi_key> <parenleft> <3> <KP_4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
-<Multi_key> <parenleft> <KP_3> <4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
 <Multi_key> <parenleft> <KP_3> <KP_4> <parenright>	: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
 <Multi_key> <parenleft> <3> <5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
-<Multi_key> <parenleft> <3> <KP_5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
-<Multi_key> <parenleft> <KP_3> <5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
 <Multi_key> <parenleft> <KP_3> <KP_5> <parenright>	: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
 <Multi_key> <parenleft> <U1100> <parenright>		: "㉠"	U3260 # CIRCLED HANGUL KIYEOK
 <Multi_key> <parenleft> <U1102> <parenright>		: "㉡"	U3261 # CIRCLED HANGUL NIEUN
@@ -4935,64 +4361,34 @@ XCOMM Enclosed CJK Letters and Months
 <Multi_key> <parenleft> <U5354> <parenright>	: "㊯"	U32AF # CIRCLED IDEOGRAPH ALLIANCE
 <Multi_key> <parenleft> <U591C> <parenright>	: "㊰"	U32B0 # CIRCLED IDEOGRAPH NIGHT
 <Multi_key> <parenleft> <3> <6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
-<Multi_key> <parenleft> <3> <KP_6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
-<Multi_key> <parenleft> <KP_3> <6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
 <Multi_key> <parenleft> <KP_3> <KP_6> <parenright>	: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
 <Multi_key> <parenleft> <3> <7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
-<Multi_key> <parenleft> <3> <KP_7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
-<Multi_key> <parenleft> <KP_3> <7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
 <Multi_key> <parenleft> <KP_3> <KP_7> <parenright>	: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
 <Multi_key> <parenleft> <3> <8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
-<Multi_key> <parenleft> <3> <KP_8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
-<Multi_key> <parenleft> <KP_3> <8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
 <Multi_key> <parenleft> <KP_3> <KP_8> <parenright>	: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
 <Multi_key> <parenleft> <3> <9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
-<Multi_key> <parenleft> <3> <KP_9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
-<Multi_key> <parenleft> <KP_3> <9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
 <Multi_key> <parenleft> <KP_3> <KP_9> <parenright>	: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
 <Multi_key> <parenleft> <4> <0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
-<Multi_key> <parenleft> <4> <KP_0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
-<Multi_key> <parenleft> <KP_4> <0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
 <Multi_key> <parenleft> <KP_4> <KP_0> <parenright>	: "㊵"	U32B5 # CIRCLED NUMBER FORTY
 <Multi_key> <parenleft> <4> <1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
-<Multi_key> <parenleft> <4> <KP_1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
-<Multi_key> <parenleft> <KP_4> <1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
 <Multi_key> <parenleft> <KP_4> <KP_1> <parenright>	: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
 <Multi_key> <parenleft> <4> <2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
-<Multi_key> <parenleft> <4> <KP_2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
-<Multi_key> <parenleft> <KP_4> <2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
 <Multi_key> <parenleft> <KP_4> <KP_2> <parenright>	: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
 <Multi_key> <parenleft> <4> <3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
-<Multi_key> <parenleft> <4> <KP_3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
-<Multi_key> <parenleft> <KP_4> <3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
 <Multi_key> <parenleft> <KP_4> <KP_3> <parenright>	: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
 <Multi_key> <parenleft> <4> <4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
-<Multi_key> <parenleft> <4> <KP_4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
-<Multi_key> <parenleft> <KP_4> <4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
 <Multi_key> <parenleft> <KP_4> <KP_4> <parenright>	: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
 <Multi_key> <parenleft> <4> <5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
-<Multi_key> <parenleft> <4> <KP_5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
-<Multi_key> <parenleft> <KP_4> <5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
 <Multi_key> <parenleft> <KP_4> <KP_5> <parenright>	: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
 <Multi_key> <parenleft> <4> <6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
-<Multi_key> <parenleft> <4> <KP_6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
-<Multi_key> <parenleft> <KP_4> <6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
 <Multi_key> <parenleft> <KP_4> <KP_6> <parenright>	: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
 <Multi_key> <parenleft> <4> <7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
-<Multi_key> <parenleft> <4> <KP_7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
-<Multi_key> <parenleft> <KP_4> <7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
 <Multi_key> <parenleft> <KP_4> <KP_7> <parenright>	: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
 <Multi_key> <parenleft> <4> <8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
-<Multi_key> <parenleft> <4> <KP_8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
-<Multi_key> <parenleft> <KP_4> <8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
 <Multi_key> <parenleft> <KP_4> <KP_8> <parenright>	: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
 <Multi_key> <parenleft> <4> <9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
-<Multi_key> <parenleft> <4> <KP_9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
-<Multi_key> <parenleft> <KP_4> <9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
 <Multi_key> <parenleft> <KP_4> <KP_9> <parenright>	: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
 <Multi_key> <parenleft> <5> <0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
-<Multi_key> <parenleft> <5> <KP_0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
-<Multi_key> <parenleft> <KP_5> <0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
 <Multi_key> <parenleft> <KP_5> <KP_0> <parenright>	: "㊿"	U32BF # CIRCLED NUMBER FIFTY
 <Multi_key> <parenleft> <kana_A> <parenright>	: "㋐"	U32D0 # CIRCLED KATAKANA A
 <Multi_key> <parenleft> <kana_I> <parenright>	: "㋑"	U32D1 # CIRCLED KATAKANA I
@@ -5096,111 +4492,75 @@ XCOMM Musical notes
 <Multi_key> <U1D1BC> <U1D16F>		: "𝆺𝅥𝅯"	U1D1C0 # MUSICAL SYMBOL FUSA BLACK
 
 XCOMM Khmer digraphs
-<U17ff> : "ាំ"
-<U17fe> : "ោះ"
-<U17fd> : "េះ"
-<U17fc> : "ុំ"
-<U17fb> : "ុះ"
+<U17ff>	: "ាំ"	# KHMER VOWEL SIGN AA plus KHMER SIGN NIKAHIT
+<U17fe>	: "ោះ"	# KHMER VOWEL SIGN OO plus KHMER SIGN REAHMUK
+<U17fd>	: "េះ"	# KHMER VOWEL SIGN E plus KHMER SIGN REAHMUK
+<U17fc>	: "ុំ"	# KHMER VOWEL SIGN U plus KHMER SIGN NIKAHIT
+<U17fb>	: "ុះ"	# KHMER VOWEL SIGN U plus KHMER SIGN REAHMUK
 
-XCOMM Arabic Lam-Alef ligatures
-<UFEFB>	: "لا" # ARABIC LIGATURE LAM WITH ALEF
-<UFEF7>	: "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
-<UFEF9>	: "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
-<UFEF5>	: "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
+XCOMM Decomposition of four Arabic Lam-Alef ligatures
+<UFEFB>	: "لا"	# ARABIC LETTER LAM plus ARABIC LETTER ALEF
+<UFEF7>	: "لأ"	# ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH HAMZA ABOVE
+<UFEF9>	: "لإ"	# ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH HAMZA BELOW
+<UFEF5>	: "لآ"	# ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH MADDA ABOVE
+
+XCOMM Breton N-graphs
+<ch>	: "ch"	# LATIN SMALL LETTER C plus LATIN SMALL LETTER H
+<Ch>	: "Ch"	# LATIN CAPITAL LETTER C plus LATIN SMALL LETTER H
+<CH>	: "CH"	# LATIN CAPITAL LETTER C plus LATIN CAPITAL LETTER H
+<c_h>	: "c’h"	# LATIN SMALL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN SMALL LETTER H
+<C_h>	: "C’h"	# LATIN CAPITAL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN SMALL LETTER H
+<C_H>	: "C’H"	# LATIN CAPITAL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN CAPITAL LETTER H
 
 XCOMM French-Dvorak Bépo compositions
-<dead_abovedot> <Amacron>		: "Ǡ"	U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <amacron>		: "ǡ"	U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
 <dead_abovedot> <j>			: "ȷ"	U0237 # LATIN SMALL LETTER DOTLESS J
 <dead_abovedot> <L>			: "Ŀ"	U013F # LATIN CAPITAL LETTER L WITH MIDDLE DOT
 <dead_abovedot> <l>			: "ŀ"	U0140 # LATIN SMALL LETTER L WITH MIDDLE DOT
-<dead_abovedot> <Omacron>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_abovedot> <omacron>		: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_abovedot> <nobreakspace>		: "̇"	U0307 #  COMBINING DOT ABOVE
-<dead_acute> <Sabovedot>		: "Ṥ"	U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_acute> <sabovedot>		: "ṥ"	U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
+<dead_abovering> <Aacute>		: "Ǻ"	U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+<dead_abovering> <aacute>		: "ǻ"	U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+<dead_abovering> <nobreakspace>		: "̊"	U030A # COMBINING RING ABOVE
 <dead_acute> <V>			: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <v>			: "ǘ"	U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <nobreakspace>		: "́"	U0301 # COMBINING ACUTE ACCENT
-<dead_belowdot> <Sabovedot>		: "Ṩ"	U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_belowdot> <sabovedot>		: "ṩ"	U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_belowdot> <dead_belowdot>		: "̣"	U0323 # COMBINING DOT BELOW
 <dead_belowdot> <nobreakspace>		: "̣"	U0323 # COMBINING DOT BELOW
 <dead_belowdot> <space>			: "̣"	U0323 # COMBINING DOT BELOW
 <dead_breve> <Aacute>			: "Ắ"	Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<dead_breve> <Agrave>			: "Ằ"	Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <Ahook>			: "Ẳ"	Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<dead_breve> <Atilde>			: "Ẵ"	Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_breve> <aacute>			: "ắ"	abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE
+<dead_breve> <Agrave>			: "Ằ"	Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <dead_breve> <agrave>			: "ằ"	abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <ahook>			: "ẳ"	abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+<dead_breve> <Atilde>			: "Ẵ"	Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_breve> <atilde>			: "ẵ"	abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <dead_breve> <nobreakspace>		: "̆"	U0306 # COMBINING BREVE
-<dead_caron> <parenleft>		: "₍"	U208D # SUBSCRIPT LEFT PARENTHESIS
-<dead_caron> <parenright>		: "₎"	U208E # SUBSCRIPT RIGHT PARENTHESIS
-<dead_caron> <plus>			: "₊"	U208A # SUBSCRIPT PLUS SIGN
-<dead_caron> <minus>			: "₋"	U208B # SUBSCRIPT MINUS
-<dead_caron> <0>			: "₀"	zerosubscript # SUBSCRIPT ZERO
-<dead_caron> <1>			: "₁"	onesubscript # SUBSCRIPT ONE
-<dead_caron> <2>			: "₂"	twosubscript # SUBSCRIPT TWO
-<dead_caron> <3>			: "₃"	threesubscript # SUBSCRIPT THREE
-<dead_caron> <4>			: "₄"	foursubscript # SUBSCRIPT FOUR
-<dead_caron> <5>			: "₅"	fivesubscript # SUBSCRIPT FIVE
-<dead_caron> <6>			: "₆"	sixsubscript # SUBSCRIPT SIX
-<dead_caron> <7>			: "₇"	sevensubscript # SUBSCRIPT SEVEN
-<dead_caron> <8>			: "₈"	eightsubscript # SUBSCRIPT EIGHT
-<dead_caron> <9>			: "₉"	ninesubscript # SUBSCRIPT NINE
-<dead_caron> <equal>			: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <dead_caron> <U01F2>			: "Dž"	U01C5 # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
-<dead_caron> <Sabovedot>		: "Ṧ"	U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-<dead_caron> <sabovedot>		: "ṧ"	U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
 <dead_caron> <V>			: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <v>			: "ǚ"	U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <nobreakspace>		: "̌"	U030C # COMBINING CARON
 <dead_cedilla> <Cacute>			: "Ḉ"	U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<dead_cedilla> <ColonSign>		: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <cacute>			: "ḉ"	U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<dead_cedilla> <cent>			: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <U0114>			: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
 <dead_cedilla> <U0115>			: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
 <dead_cedilla> <nobreakspace>		: "̧"	U0327 # COMBINING CEDILLA
 <dead_circumflex> <Aacute>		: "Ấ"	Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<dead_circumflex> <Agrave>		: "Ầ"	Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ahook>		: "Ẩ"	Acircumflexhook # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<dead_circumflex> <Atilde>		: "Ẫ"	Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <aacute>		: "ấ"	acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+<dead_circumflex> <Agrave>		: "Ầ"	Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_circumflex> <agrave>		: "ầ"	acircumflexgrave # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ahook>		: "ẩ"	acircumflexhook # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_circumflex> <Atilde>		: "Ẫ"	Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <atilde>		: "ẫ"	acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <Eacute>		: "Ế"	Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<dead_circumflex> <Egrave>		: "Ề"	Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ehook>		: "Ể"	Ecircumflexhook # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<dead_circumflex> <Etilde>		: "Ễ"	Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <eacute>		: "ế"	ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+<dead_circumflex> <Egrave>		: "Ề"	Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_circumflex> <egrave>		: "ề"	ecircumflexgrave # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ehook>		: "ể"	ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_circumflex> <Etilde>		: "Ễ"	Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <etilde>		: "ễ"	ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <Oacute>		: "Ố"	Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<dead_circumflex> <Ograve>		: "Ồ"	Ocircumflexgrave # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ohook>		: "Ổ"	Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<dead_circumflex> <Otilde>		: "Ỗ"	Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <oacute>		: "ố"	ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+<dead_circumflex> <Ograve>		: "Ồ"	Ocircumflexgrave # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_circumflex> <ograve>		: "ồ"	ocircumflexgrave # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ohook>		: "ổ"	ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_circumflex> <Otilde>		: "Ỗ"	Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <otilde>		: "ỗ"	ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <nobreakspace>	: "̂"	U0302 # COMBINING CIRCUMFLEX ACCENT
-<dead_belowcomma> <S>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<Multi_key> <semicolon> <S>		: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<Multi_key> <S> <semicolon>		: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<dead_belowcomma> <s>			: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<Multi_key> <semicolon> <s>		: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<Multi_key> <s> <semicolon>		: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<dead_belowcomma> <T>			: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<Multi_key> <semicolon> <T>		: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<Multi_key> <T> <semicolon>		: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<dead_belowcomma> <t>			: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
-<Multi_key> <semicolon> <t>		: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
-<Multi_key> <t> <semicolon>		: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
 <dead_belowcomma> <dead_belowcomma>	: ","	comma # COMMA
 <dead_belowcomma> <nobreakspace>	: "̦"	U0326 # COMBINING COMMA BELOW
 <dead_belowcomma> <space>		: ","	comma # COMMA
@@ -5208,10 +4568,12 @@ XCOMM French-Dvorak Bépo compositions
 <dead_currency> <a>			: "؋"	U060B # AFGHANI SIGN
 <dead_currency> <B>			: "₱"	U20B1 # PESO SIGN
 <dead_currency> <b>			: "฿"	Thai_baht # THAI CURRENCY SYMBOL BAHT
-<dead_currency> <Ccedilla>		: "₵"	U20B5 # CEDI SIGN
 <dead_currency> <C>			: "₡"	ColonSign # COLON SIGN
-<dead_currency> <ccedilla>		: "₵"	U20B5 # CEDI SIGN
 <dead_currency> <c>			: "¢"	cent # CENT SIGN
+<dead_currency> <Ccedilla>		: "₵"	U20B5 # CEDI SIGN
+<dead_currency> <ccedilla>		: "₵"	U20B5 # CEDI SIGN
+<dead_currency> <dead_cedilla> <C>	: "₵"	U20B5 # CEDI SIGN
+<dead_currency> <dead_cedilla> <c>	: "₵"	U20B5 # CEDI SIGN
 <dead_currency> <D>			: "₯"	U20AF # DRACHMA SIGN
 <dead_currency> <d>			: "₫"	DongSign # DONG SIGN
 <dead_currency> <E>			: "₠"	EcuSign # EURO-CURRENCY SIGN
@@ -5253,17 +4615,11 @@ XCOMM French-Dvorak Bépo compositions
 <dead_currency> <dead_currency>		: "¤"	currency # CURRENCY SIGN
 <dead_currency> <nobreakspace>		: "¤"	currency # CURRENCY SIGN
 <dead_currency> <space>			: "¤"	currency # CURRENCY SIGN
-<dead_diaeresis> <Amacron>		: "Ǟ"	U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <amacron>		: "ǟ"	U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
 <dead_diaeresis> <Iacute>		: "Ḯ"	U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <dead_diaeresis> <iacute>		: "ḯ"	U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <Omacron>		: "Ȫ"	U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<dead_diaeresis> <omacron>		: "ȫ"	U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
 <dead_diaeresis> <Uacute>		: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <U01D3>		: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-<dead_diaeresis> <Ugrave>		: "Ǜ"	U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <dead_diaeresis> <uacute>		: "ǘ"	U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <U01D4>		: "ǚ"	U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+<dead_diaeresis> <Ugrave>		: "Ǜ"	U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <dead_diaeresis> <ugrave>		: "ǜ"	U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_diaeresis> <nobreakspace>		: "̈"	U0308 # COMBINING DIAERESIS
 <dead_doubleacute> <nobreakspace>	: "̋"	U030B # COMBINING DOUBLE ACUTE ACCENT
@@ -5327,13 +4683,11 @@ XCOMM French-Dvorak Bépo compositions
 <dead_hook> <c>				: "ƈ"	U0188 # LATIN SMALL LETTER C WITH HOOK
 <dead_hook> <D>				: "Ɗ"	U018A # LATIN CAPITAL LETTER D WITH HOOK
 <dead_hook> <d>				: "ɗ"	U0257 # LATIN SMALL LETTER D WITH HOOK
-<dead_hook> <U0256>			: "ᶑ"	U1D91 # LATIN SMALL LETTER D WITH HOOK AND TAIL
 <dead_hook> <F>				: "Ƒ"	U0191 # LATIN CAPITAL LETTER F WITH HOOK
 <dead_hook> <f>				: "ƒ"	function # LATIN SMALL LETTER F WITH HOOK
 <dead_hook> <G>				: "Ɠ"	U0193 # LATIN CAPITAL LETTER G WITH HOOK
 <dead_hook> <g>				: "ɠ"	U0260 # LATIN SMALL LETTER G WITH HOOK
 <dead_hook> <h>				: "ɦ"	U0266 # LATIN SMALL LETTER H WITH HOOK
-<dead_hook> <U025F>			: "ʄ"	U0284 # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
 <dead_hook> <K>				: "Ƙ"	U0198 # LATIN CAPITAL LETTER K WITH HOOK
 <dead_hook> <k>				: "ƙ"	U0199 # LATIN SMALL LETTER K WITH HOOK
 <dead_hook> <M>				: "Ɱ"	U2C6E # LATIN CAPITAL LETTER M WITH HOOK
@@ -5343,13 +4697,11 @@ XCOMM French-Dvorak Bépo compositions
 <dead_hook> <P>				: "Ƥ"	U01A4 # LATIN CAPITAL LETTER P WITH HOOK
 <dead_hook> <p>				: "ƥ"	U01A5 # LATIN SMALL LETTER P WITH HOOK
 <dead_hook> <q>				: "ʠ"	U02A0 # LATIN SMALL LETTER Q WITH HOOK
-<dead_hook> <U025C>			: "ɝ"	U025D # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK
 <dead_hook> <r>				: "ɼ"	U027C # LATIN SMALL LETTER R WITH LONG LEG
 <dead_hook> <s>				: "ʂ"	U0282 # LATIN SMALL LETTER S WITH HOOK
 <dead_hook> <schwa>			: "ɚ"	U025A # LATIN SMALL LETTER SCHWA WITH HOOK
 <dead_hook> <T>				: "Ƭ"	U01AC # LATIN CAPITAL LETTER T WITH HOOK
 <dead_hook> <t>				: "ƭ"	U01AD # LATIN SMALL LETTER T WITH HOOK
-<dead_hook> <U0279>			: "ɻ"	U027B # LATIN SMALL LETTER TURNED R WITH HOOK
 <dead_hook> <V>				: "Ʋ"	U01B2 # LATIN CAPITAL LETTER V WITH HOOK
 <dead_hook> <v>				: "ʋ"	U028B # LATIN SMALL LETTER V WITH HOOK
 <dead_hook> <W>				: "Ⱳ"	U2C72 # LATIN CAPITAL LETTER W WITH HOOK
@@ -5360,50 +4712,32 @@ XCOMM French-Dvorak Bépo compositions
 <dead_hook> <nobreakspace>		: "̉"	U0309 # COMBINING HOOK ABOVE
 <dead_hook> <space>			: "̉"	U0309 # COMBINING HOOK ABOVE
 <dead_horn> <Oacute>			: "Ớ"	Ohornacute # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<dead_horn> <Obelowdot>			: "Ợ"	Ohornbelowdot # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<dead_horn> <Ograve>			: "Ờ"	Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<dead_horn> <Ohook>			: "Ở"	Ohornhook # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <Otilde>			: "Ỡ"	Ohorntilde # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_horn> <oacute>			: "ớ"	ohornacute # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<dead_horn> <obelowdot>			: "ợ"	ohornbelowdot # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+<dead_horn> <Ograve>			: "Ờ"	Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_horn> <ograve>			: "ờ"	ohorngrave # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<dead_horn> <ohook>			: "ở"	ohornhook # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <otilde>			: "ỡ"	ohorntilde # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_horn> <Uacute>			: "Ứ"	Uhornacute # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<dead_horn> <Ubelowdot>			: "Ự"	Uhornbelowdot # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<dead_horn> <Ugrave>			: "Ừ"	Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<dead_horn> <Uhook>			: "Ử"	Uhornhook # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <Utilde>			: "Ữ"	Uhorntilde # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_horn> <uacute>			: "ứ"	uhornacute # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<dead_horn> <ubelowdot>			: "ự"	uhornbelowdot # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+<dead_horn> <Ugrave>			: "Ừ"	Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_horn> <ugrave>			: "ừ"	uhorngrave # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<dead_horn> <uhook>			: "ử"	uhornhook # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <utilde>			: "ữ"	uhorntilde # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_horn> <dead_horn>			: "̛"	U031B # COMBINING HORN
 <dead_horn> <nobreakspace>		: "̛"	U031B # COMBINING HORN
 <dead_horn> <space>			: "̛"	U031B # COMBINING HORN
 <dead_macron> <Eacute>			: "Ḗ"	U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<dead_macron> <Egrave>			: "Ḕ"	U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <dead_macron> <eacute>			: "ḗ"	U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
+<dead_macron> <Egrave>			: "Ḕ"	U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <dead_macron> <egrave>			: "ḕ"	U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <dead_macron> <Oacute>			: "Ṓ"	U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<dead_macron> <Ograve>			: "Ṑ"	U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <dead_macron> <oacute>			: "ṓ"	U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
+<dead_macron> <Ograve>			: "Ṑ"	U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <dead_macron> <ograve>			: "ṑ"	U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <dead_macron> <V>			: "Ǖ"	U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <v>			: "ǖ"	U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <nobreakspace>		: "̄"	U0304 # COMBINING MACRON
-<dead_ogonek> <Omacron>			: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_ogonek> <omacron>			: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 <dead_ogonek> <nobreakspace>		: "̨"	U0328 # COMBINING OGONEK
-<dead_abovering> <Aacute>		: "Ǻ"	U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<dead_abovering> <aacute>		: "ǻ"	U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<dead_abovering> <nobreakspace>		: "̊"	U030A # COMBINING RING ABOVE
 <dead_stroke> <2>			: "ƻ"	U01BB # LATIN LETTER TWO WITH STROKE
 <dead_stroke> <equal>			: "≠"	notequal # NOT EQUAL TO
 <dead_stroke> <A>			: "Ⱥ"	U023A # LATIN CAPITAL LETTER A WITH STROKE
 <dead_stroke> <a>			: "ⱥ"	U2C65 # LATIN SMALL LETTER A WITH STROKE
-<dead_stroke> <B>			: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
 <dead_stroke> <C>			: "Ȼ"	U023B # LATIN CAPITAL LETTER C WITH STROKE
 <dead_stroke> <c>			: "ȼ"	U023C # LATIN SMALL LETTER C WITH STROKE
 <dead_stroke> <E>			: "Ɇ"	U0246 # LATIN CAPITAL LETTER E WITH STROKE
@@ -5430,87 +4764,27 @@ XCOMM French-Dvorak Bépo compositions
 <dead_stroke> <nobreakspace>		: "̸"	U0338 # COMBINING LONG SOLIDUS OVERLAY
 <dead_stroke> <space>			: "/"	slash # SOLIDUS
 <dead_tilde> <Oacute>			: "Ṍ"	U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<dead_tilde> <Odiaeresis>		: "Ṏ"	U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <Omacron>			: "Ȭ"	U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <dead_tilde> <oacute>			: "ṍ"	U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
+<dead_tilde> <Odiaeresis>		: "Ṏ"	U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_tilde> <odiaeresis>		: "ṏ"	U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <omacron>			: "ȭ"	U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_tilde> <Uacute>			: "Ṹ"	U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <dead_tilde> <uacute>			: "ṹ"	U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <dead_tilde> <equal>			: "≃"	similarequal # ASYMPTOTICALLY EQUAL TO
 <dead_tilde> <less>			: "≲"	U2272 # LESS-THAN OR EQUIVALENT TO
 <dead_tilde> <greater>			: "≳"	U2273 # GREATER-THAN OR EQUIVALENT TO
 <dead_tilde> <nobreakspace>		: "̃"	U0303 # COMBINING TILDE
-<dead_acute> <dead_abovedot> <S>	: "Ṥ"	U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_acute> <dead_abovedot> <s>	: "ṥ"	U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_belowdot> <dead_abovedot> <S>	: "Ṩ"	U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_belowdot> <dead_abovedot> <s>	: "ṩ"	U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_caron> <dead_abovedot> <S>	: "Ṧ"	U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-<dead_caron> <dead_abovedot> <s>	: "ṧ"	U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
-<dead_abovedot> <dead_macron> <A>	: "Ǡ"	U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <dead_macron> <a>	: "ǡ"	U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <dead_macron> <O>	: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_abovedot> <dead_macron> <o>	: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_abovedot> <dead_stroke> <j>	: "ɟ"	U025F # LATIN SMALL LETTER DOTLESS J WITH STROKE
 <dead_stroke> <dead_abovedot> <j>	: "ɟ"	U025F # LATIN SMALL LETTER DOTLESS J WITH STROKE
-<dead_breve> <dead_acute> <A>		: "Ắ"	Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<dead_breve> <dead_acute> <a>		: "ắ"	abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<dead_cedilla> <dead_acute> <C>		: "Ḉ"	U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<dead_cedilla> <dead_acute> <c>		: "ḉ"	U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <dead_circumflex> <dead_acute> <A>	: "Ấ"	Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <a>	: "ấ"	acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <E>	: "Ế"	Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <e>	: "ế"	ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <O>	: "Ố"	Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <o>	: "ố"	ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<dead_diaeresis> <dead_acute> <I>	: "Ḯ"	U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <dead_acute> <i>	: "ḯ"	U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <dead_acute> <U>	: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <dead_acute> <u>	: "ǘ"	U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<dead_horn> <dead_acute> <O>		: "Ớ"	Ohornacute # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<dead_horn> <dead_acute> <o>		: "ớ"	ohornacute # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<dead_horn> <dead_acute> <U>		: "Ứ"	Uhornacute # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<dead_horn> <dead_acute> <u>		: "ứ"	uhornacute # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<dead_macron> <dead_acute> <E>		: "Ḗ"	U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<dead_macron> <dead_acute> <e>		: "ḗ"	U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<dead_macron> <dead_acute> <O>		: "Ṓ"	U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<dead_macron> <dead_acute> <o>		: "ṓ"	U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<dead_abovering> <dead_acute> <A>	: "Ǻ"	U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<dead_abovering> <dead_acute> <a>	: "ǻ"	U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<dead_tilde> <dead_acute> <O>		: "Ṍ"	U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<dead_tilde> <dead_acute> <o>		: "ṍ"	U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<dead_tilde> <dead_acute> <U>		: "Ṹ"	U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<dead_tilde> <dead_acute> <u>		: "ṹ"	U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<dead_belowdot> <dead_breve> <A>	: "Ặ"	Abrevebelowdot # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<dead_belowdot> <dead_breve> <a>	: "ặ"	abrevebelowdot # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <A>	: "Ậ"	Acircumflexbelowdot # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <a>	: "ậ"	acircumflexbelowdot # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <E>	: "Ệ"	Ecircumflexbelowdot # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <e>	: "ệ"	ecircumflexbelowdot # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <O>	: "Ộ"	Ocircumflexbelowdot # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <o>	: "ộ"	ocircumflexbelowdot # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_horn> <dead_belowdot> <O>		: "Ợ"	Ohornbelowdot # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_horn> <dead_belowdot> <o>		: "ợ"	ohornbelowdot # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_horn> <dead_belowdot> <U>		: "Ự"	Uhornbelowdot # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_horn> <dead_belowdot> <u>		: "ự"	uhornbelowdot # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<dead_belowdot> <dead_macron> <L>	: "Ḹ"	U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<dead_belowdot> <dead_macron> <l>	: "ḹ"	U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<dead_belowdot> <dead_macron> <R>	: "Ṝ"	U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<dead_belowdot> <dead_macron> <r>	: "ṝ"	U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<dead_cedilla> <dead_breve> <E>		: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<dead_cedilla> <dead_breve> <e>		: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<dead_breve> <dead_grave> <A>		: "Ằ"	Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <dead_grave> <a>		: "ằ"	abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <dead_hook> <A>		: "Ẳ"	Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<dead_breve> <dead_hook> <a>		: "ẳ"	abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<dead_breve> <dead_tilde> <A>		: "Ẵ"	Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<dead_breve> <dead_tilde> <a>		: "ẵ"	abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<dead_diaeresis> <dead_caron> <U>	: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-<dead_diaeresis> <dead_caron> <u>	: "ǚ"	U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-<dead_cedilla> <dead_currency> <C>	: "₵"	U20B5 # CEDI SIGN
-<dead_currency> <dead_cedilla> <C>	: "₵"	U20B5 # CEDI SIGN
-<dead_cedilla> <dead_currency> <c>	: "₵"	U20B5 # CEDI SIGN
-<dead_currency> <dead_cedilla> <c>	: "₵"	U20B5 # CEDI SIGN
 <dead_circumflex> <dead_grave> <A>	: "Ầ"	Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_circumflex> <dead_grave> <a>	: "ầ"	acircumflexgrave # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_circumflex> <dead_grave> <E>	: "Ề"	Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
@@ -5523,40 +4797,6 @@ XCOMM French-Dvorak Bépo compositions
 <dead_circumflex> <dead_hook> <e>	: "ể"	ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <dead_hook> <O>	: "Ổ"	Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <dead_hook> <o>	: "ổ"	ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<dead_circumflex> <dead_tilde> <A>	: "Ẫ"	Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <a>	: "ẫ"	acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <E>	: "Ễ"	Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <e>	: "ễ"	ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <O>	: "Ỗ"	Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <o>	: "ỗ"	ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<dead_diaeresis> <dead_grave> <U>	: "Ǜ"	U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<dead_diaeresis> <dead_grave> <u>	: "ǜ"	U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<dead_diaeresis> <dead_macron> <A>	: "Ǟ"	U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <dead_macron> <a>	: "ǟ"	U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <dead_macron> <O>	: "Ȫ"	U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<dead_diaeresis> <dead_macron> <o>	: "ȫ"	U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
-<dead_tilde> <dead_diaeresis> <O>	: "Ṏ"	U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <dead_diaeresis> <o>	: "ṏ"	U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_horn> <dead_grave> <O>		: "Ờ"	Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<dead_horn> <dead_grave> <o>		: "ờ"	ohorngrave # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<dead_horn> <dead_grave> <U>		: "Ừ"	Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<dead_horn> <dead_grave> <u>		: "ừ"	uhorngrave # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<dead_macron> <dead_grave> <E>		: "Ḕ"	U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<dead_macron> <dead_grave> <e>		: "ḕ"	U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<dead_macron> <dead_grave> <O>		: "Ṑ"	U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<dead_macron> <dead_grave> <o>		: "ṑ"	U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<dead_horn> <dead_hook> <O>		: "Ở"	Ohornhook # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_hook> <o>		: "ở"	ohornhook # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_hook> <U>		: "Ử"	Uhornhook # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_hook> <u>		: "ử"	uhornhook # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_tilde> <O>		: "Ỡ"	Ohorntilde # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<dead_horn> <dead_tilde> <o>		: "ỡ"	ohorntilde # LATIN SMALL LETTER O WITH HORN AND TILDE
-<dead_horn> <dead_tilde> <U>		: "Ữ"	Uhorntilde # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<dead_horn> <dead_tilde> <u>		: "ữ"	uhorntilde # LATIN SMALL LETTER U WITH HORN AND TILDE
-<dead_ogonek> <dead_macron> <O>		: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_ogonek> <dead_macron> <o>		: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<dead_tilde> <dead_macron> <O>		: "Ȭ"	U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<dead_tilde> <dead_macron> <o>		: "ȭ"	U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_greek> <dead_hook> <U>		: "ϒ"	U03D2 # GREEK UPSILON WITH HOOK SYMBOL
 <dead_hook> <dead_greek> <U>		: "ϒ"	U03D2 # GREEK UPSILON WITH HOOK SYMBOL
 <dead_greek> <dead_macron> <A>		: "Ᾱ"	U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON
@@ -5575,166 +4815,166 @@ XCOMM French-Dvorak Bépo compositions
 <dead_stroke> <dead_greek> <r>		: "ϼ"	U03FC # GREEK RHO WITH STROKE SYMBOL
 
 XCOMM Cyrillic (NFDs -- Normalized Form Canonical Decomposition)
-<dead_doublegrave> <Cyrillic_a>		: "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_a>	: "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_a>	: "а̑" # CYRILLIC SMALL LETTER A WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_a>		: "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_a>	: "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_a>		: "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_a>	: "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_a>	: "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_a>		: "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_a>	: "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_a>	: "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_a>		: "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_a>	: "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_A>		: "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_A>	: "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_A>	: "А̑" # CYRILLIC CAPITAL LETTER A WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_A>		: "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_A>	: "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_A>		: "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_A>	: "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_A>	: "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_A>		: "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_A>	: "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_A>	: "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_A>		: "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_A>	: "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_ie>	: "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_ie>: "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_ie>	: "е̑" # CYRILLIC SMALL LETTER IE WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_ie>		: "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_ie>	: "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_ie>	: "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_ie>		: "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_ie>	: "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_ie>	: "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_ie>		: "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_ie>	: "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_IE>	: "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_IE>: "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_IE>	: "Е̑" # CYRILLIC CAPITAL LETTER IE WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_IE>		: "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_IE>	: "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_IE>	: "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_IE>		: "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_IE>	: "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_IE>	: "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_IE>		: "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_IE>	: "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_i>		: "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_i>	: "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_i>	: "и̑" # CYRILLIC SMALL LETTER I WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_i>		: "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_i>	: "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_i>	: "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_i>		: "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_i>	: "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_I>		: "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_I>	: "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_I>	: "И̑" # CYRILLIC CAPITAL LETTER I WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_I>		: "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_I>	: "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_I>	: "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_I>		: "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_I>	: "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_o>		: "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_o>	: "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_o>	: "о̑" # CYRILLIC SMALL LETTER O WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_o>		: "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_o>	: "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_o>		: "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_o>	: "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_o>	: "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_o>		: "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_o>	: "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_o>	: "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_o>		: "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_o>	: "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_O>		: "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_O>	: "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_O>	: "О̑" # CYRILLIC CAPITAL LETTER O WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_O>		: "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_O>	: "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_O>		: "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_O>	: "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_O>	: "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_O>		: "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_O>	: "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_O>	: "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_O>		: "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_O>	: "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_u>		: "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_u>	: "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_u>	: "у̑" # CYRILLIC SMALL LETTER U WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_u>		: "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_u>	: "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_u>		: "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_u>	: "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_u>	: "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_u>		: "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_u>	: "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_U>		: "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_U>	: "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_U>	: "У̑" # CYRILLIC CAPITAL LETTER U WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_U>		: "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_U>	: "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_U>		: "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_U>	: "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_U>	: "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_U>		: "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_U>	: "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_er>	: "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_er>: "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_er>	: "р̑" # CYRILLIC SMALL LETTER ER WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_er>		: "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_er>	: "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_er>		: "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_er>	: "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_er>	: "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_er>		: "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_er>	: "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_er>	: "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_er>		: "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_er>	: "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_ER>	: "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_ER>: "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_ER>	: "Р̑" # CYRILLIC CAPITAL LETTER ER WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_ER>		: "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_ER>	: "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_ER>		: "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_ER>	: "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_ER>	: "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_ER>		: "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_ER>	: "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_ER>	: "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_ER>		: "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_ER>	: "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<dead_acute> <Cyrillic_yeru>		: "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_yeru>	: "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_yeru>: "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_YERU>		: "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_YERU>	: "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_YERU>: "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_e>		: "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_e>	: "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_e>	: "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_E>		: "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_E>	: "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_E>	: "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_yu>		: "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_yu>	: "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_yu>	: "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_YU>		: "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_YU>	: "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_YU>	: "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_ya>		: "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_ya>	: "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_ya>	: "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_YA>		: "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_YA>	: "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_YA>	: "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
+<dead_doublegrave> <Cyrillic_a>		: "а̏" # CYRILLIC SMALL LETTER A plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_a>	: "а̏" # CYRILLIC SMALL LETTER A plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_a>	: "а̑" # CYRILLIC SMALL LETTER A plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_a>		: "а̀" # CYRILLIC SMALL LETTER A plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_a>	: "а̀" # CYRILLIC SMALL LETTER A plus COMBINING GRAVE
+<dead_acute> <Cyrillic_a>		: "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_a>	: "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_a>	: "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE
+<dead_macron> <Cyrillic_a>		: "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_a>	: "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_a>	: "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_a>		: "а̂" # CYRILLIC SMALL LETTER A plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_a>	: "а̂" # CYRILLIC SMALL LETTER A plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_A>		: "А̏" # CYRILLIC CAPITAL LETTER A plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_A>	: "А̏" # CYRILLIC CAPITAL LETTER A plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_A>	: "А̑" # CYRILLIC CAPITAL LETTER A plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_A>		: "А̀" # CYRILLIC CAPITAL LETTER A plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_A>	: "А̀" # CYRILLIC CAPITAL LETTER A plus COMBINING GRAVE
+<dead_acute> <Cyrillic_A>		: "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_A>	: "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_A>	: "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE
+<dead_macron> <Cyrillic_A>		: "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_A>	: "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_A>	: "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_A>		: "А̂" # CYRILLIC CAPITAL LETTER A plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_A>	: "А̂" # CYRILLIC CAPITAL LETTER A plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_ie>	: "е̏" # CYRILLIC SMALL LETTER IE plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_ie>: "е̏" # CYRILLIC SMALL LETTER IE plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_ie>	: "е̑" # CYRILLIC SMALL LETTER IE plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_ie>		: "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_ie>	: "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_ie>	: "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE
+<dead_macron> <Cyrillic_ie>		: "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_ie>	: "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_ie>	: "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_ie>		: "е̂" # CYRILLIC SMALL LETTER IE plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_ie>	: "е̂" # CYRILLIC SMALL LETTER IE plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_IE>	: "Е̏" # CYRILLIC CAPITAL LETTER IE plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_IE>: "Е̏" # CYRILLIC CAPITAL LETTER IE plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_IE>	: "Е̑" # CYRILLIC CAPITAL LETTER IE plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_IE>		: "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_IE>	: "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_IE>	: "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE
+<dead_macron> <Cyrillic_IE>		: "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_IE>	: "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_IE>	: "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_IE>		: "Е̂" # CYRILLIC CAPITAL LETTER IE plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_IE>	: "Е̂" # CYRILLIC CAPITAL LETTER IE plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_i>		: "и̏" # CYRILLIC SMALL LETTER I plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_i>	: "и̏" # CYRILLIC SMALL LETTER I plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_i>	: "и̑" # CYRILLIC SMALL LETTER I plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_i>		: "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_i>	: "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_i>	: "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_i>		: "и̂" # CYRILLIC SMALL LETTER I plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_i>	: "и̂" # CYRILLIC SMALL LETTER I plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_I>		: "И̏" # CYRILLIC CAPITAL LETTER I plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_I>	: "И̏" # CYRILLIC CAPITAL LETTER I plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_I>	: "И̑" # CYRILLIC CAPITAL LETTER I plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_I>		: "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_I>	: "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_I>	: "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_I>		: "И̂" # CYRILLIC CAPITAL LETTER I plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_I>	: "И̂" # CYRILLIC CAPITAL LETTER I plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_o>		: "о̏" # CYRILLIC SMALL LETTER O plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_o>	: "о̏" # CYRILLIC SMALL LETTER O plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_o>	: "о̑" # CYRILLIC SMALL LETTER O plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_o>		: "о̀" # CYRILLIC SMALL LETTER O plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_o>	: "о̀" # CYRILLIC SMALL LETTER O plus COMBINING GRAVE
+<dead_acute> <Cyrillic_o>		: "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_o>	: "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_o>	: "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE
+<dead_macron> <Cyrillic_o>		: "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_o>	: "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_o>	: "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_o>		: "о̂" # CYRILLIC SMALL LETTER O plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_o>	: "о̂" # CYRILLIC SMALL LETTER O plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_O>		: "О̏" # CYRILLIC CAPITAL LETTER O plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_O>	: "О̏" # CYRILLIC CAPITAL LETTER O plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_O>	: "О̑" # CYRILLIC CAPITAL LETTER O plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_O>		: "О̀" # CYRILLIC CAPITAL LETTER O plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_O>	: "О̀" # CYRILLIC CAPITAL LETTER O plus COMBINING GRAVE
+<dead_acute> <Cyrillic_O>		: "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_O>	: "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_O>	: "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE
+<dead_macron> <Cyrillic_O>		: "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_O>	: "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_O>	: "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_O>		: "О̂" # CYRILLIC CAPITAL LETTER O plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_O>	: "О̂" # CYRILLIC CAPITAL LETTER O plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_u>		: "у̏" # CYRILLIC SMALL LETTER U plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_u>	: "у̏" # CYRILLIC SMALL LETTER U plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_u>	: "у̑" # CYRILLIC SMALL LETTER U plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_u>		: "у̀" # CYRILLIC SMALL LETTER U plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_u>	: "у̀" # CYRILLIC SMALL LETTER U plus COMBINING GRAVE
+<dead_acute> <Cyrillic_u>		: "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_u>	: "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_u>	: "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_u>		: "у̂" # CYRILLIC SMALL LETTER U plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_u>	: "у̂" # CYRILLIC SMALL LETTER U plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_U>		: "У̏" # CYRILLIC CAPITAL LETTER U plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_U>	: "У̏" # CYRILLIC CAPITAL LETTER U plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_U>	: "У̑" # CYRILLIC CAPITAL LETTER U plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_U>		: "У̀" # CYRILLIC CAPITAL LETTER U plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_U>	: "У̀" # CYRILLIC CAPITAL LETTER U plus COMBINING GRAVE
+<dead_acute> <Cyrillic_U>		: "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_U>	: "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_U>	: "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_U>		: "У̂" # CYRILLIC CAPITAL LETTER U plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_U>	: "У̂" # CYRILLIC CAPITAL LETTER U plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_er>	: "р̏" # CYRILLIC SMALL LETTER ER plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_er>: "р̏" # CYRILLIC SMALL LETTER ER plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_er>	: "р̑" # CYRILLIC SMALL LETTER ER plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_er>		: "р̀" # CYRILLIC SMALL LETTER ER plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_er>	: "р̀" # CYRILLIC SMALL LETTER ER plus COMBINING GRAVE
+<dead_acute> <Cyrillic_er>		: "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_er>	: "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_er>	: "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE
+<dead_macron> <Cyrillic_er>		: "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_er>	: "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_er>	: "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_er>		: "р̂" # CYRILLIC SMALL LETTER ER plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_er>	: "р̂" # CYRILLIC SMALL LETTER ER plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_ER>	: "Р̏" # CYRILLIC CAPITAL LETTER ER plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_ER>: "Р̏" # CYRILLIC CAPITAL LETTER ER plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_ER>	: "Р̑" # CYRILLIC CAPITAL LETTER ER plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_ER>		: "Р̀" # CYRILLIC CAPITAL LETTER ER plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_ER>	: "Р̀" # CYRILLIC CAPITAL LETTER ER plus COMBINING GRAVE
+<dead_acute> <Cyrillic_ER>		: "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_ER>	: "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_ER>	: "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE
+<dead_macron> <Cyrillic_ER>		: "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_ER>	: "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_ER>	: "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_ER>		: "Р̂" # CYRILLIC CAPITAL LETTER ER plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_ER>	: "Р̂" # CYRILLIC CAPITAL LETTER ER plus COMBINING CIRCUMFLEX
+<dead_acute> <Cyrillic_yeru>		: "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_yeru>	: "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_yeru>: "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_YERU>		: "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_YERU>	: "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_YERU>: "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_e>		: "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_e>	: "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_e>	: "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE
+<dead_acute> <Cyrillic_E>		: "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_E>	: "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_E>	: "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE
+<dead_acute> <Cyrillic_yu>		: "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_yu>	: "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_yu>	: "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_YU>		: "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_YU>	: "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_YU>	: "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_ya>		: "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_ya>	: "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_ya>	: "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE
+<dead_acute> <Cyrillic_YA>		: "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_YA>	: "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_YA>	: "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE
 
 /*
  * APL support, by Geoff Streeter, 2012-01-04
@@ -5752,7 +4992,10 @@ XCOMM Characters from "Mathematical Operators"
 <Multi_key> <v> <slash>			: "√"	U221a # v / SQUARE ROOT
 <Multi_key> <slash> <v>			: "√"	U221a # / v SQUARE ROOT
 <Multi_key> <8> <8>			: "∞"	U221e # 8 8 INFINITY
+<Multi_key> <colon> <period>		: "∴"	U2234 # : . THEREFORE
+<Multi_key> <period> <colon>		: "∵"	U2235 # . : BECAUSE
 <Multi_key> <asciitilde> <asciitilde>	: "≈"	U2248 # ~ ~ ALMOST EQUAL TO
+<Multi_key> <dead_tilde> <dead_tilde>	: "≈"	U2248 # ~ ~ ALMOST EQUAL TO
 <Multi_key> <equal> <underscore>	: "≡"	U2261 # = _ IDENTICAL TO
 <Multi_key> <underscore> <U2260>	: "≢"	U2262 # _ ≠ NOT IDENTICAL TO
 <Multi_key> <U2260> <underscore>	: "≢"	U2262 # ≠ _ NOT IDENTICAL TO
@@ -5766,14 +5009,12 @@ XCOMM Characters from "Mathematical Operators"
 <Multi_key> <U2283> <underscore>	: "⊇"	U2287 # ⊃ _ SUPERSET OF OR EQUAL TO
 <Multi_key> <U25cb> <minus>		: "⊖"	U2296 # ○ - CIRCLED MINUS
 <Multi_key> <minus> <U25cb>		: "⊖"	U2296 # - ○ CIRCLED MINUS
-<Multi_key> <U25cb> <period>		: "⊙"	U2299 # ○ - CIRCLED DOT
-<Multi_key> <period> <U25cb>		: "⊙"	U2299 # - ○ CIRCLED DOT
+<Multi_key> <U25cb> <period>		: "⊙"	U2299 # ○ . CIRCLED DOT OPERATOR
+<Multi_key> <period> <U25cb>		: "⊙"	U2299 # . ○ CIRCLED DOT OPERATOR
 <Multi_key> <less> <greater>		: "⋄"	U22c4 # < > DIAMOND OPERATOR
 <Multi_key> <greater> <less>		: "⋄"	U22c4 # > < DIAMOND OPERATOR
 <Multi_key> <U2227> <U2228>		: "⋄"	U22c4 # ∧ ∨ DIAMOND OPERATOR
 <Multi_key> <U2228> <U2227>		: "⋄"	U22c4 # ∨ ∧ DIAMOND OPERATOR
-<Multi_key> <colon> <period>		: "∴"	therefore # : . THEREFORE
-<Multi_key> <period> <colon>		: "∵"	because # . : BECAUSE
 
 XCOMM Characters from "Miscellaneous Technical"
 <Multi_key> <U22a5> <U22a4>		: "⌶"	U2336 # ⊥ ⊤ APL FUNCTIONAL SYMBOL I-BEAM
@@ -5906,103 +5147,103 @@ XCOMM Characters from "Miscellaneous Technical"
 <Multi_key> <underscore> <U2375>	: "⍹"	U2379 # _ ⍵ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR
 
 XCOMM Diacritics used in African languages
-<dead_acute> <U025B>			: "ɛ́" # LATIN SMALL LETTER EPSILON WITH ACUTE
-<dead_grave> <U025B>			: "ɛ̀" # LATIN SMALL LETTER EPSILON WITH GRAVE
-<dead_circumflex> <U025B>		: "ɛ̂" # LATIN SMALL LETTER EPSILON WITH CIRCUMFLEX
-<dead_caron> <U025B>			: "ɛ̌" # LATIN SMALL LETTER EPSILON WITH CARON
-<dead_macron> <U025B>			: "ɛ̄" # LATIN SMALL LETTER EPSILON WITH MACRON
-<dead_tilde> <U025B>			: "ɛ̃" # LATIN SMALL LETTER EPSILON WITH TILDE
-<dead_acute> <dead_tilde> <U025B>	: "ɛ̃́" # LATIN SMALL LETTER EPSILON WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U025B>	: "ɛ̃̀" # LATIN SMALL LETTER EPSILON WITH TILDE AND GRAVE
-<dead_acute> <U0190>			: "Ɛ́" # LATIN CAPITAL LETTER EPSILON WITH ACUTE
-<dead_grave> <U0190>			: "Ɛ̀" # LATIN CAPITAL LETTER EPSILON WITH GRAVE
-<dead_circumflex> <U0190>		: "Ɛ̂" # LATIN CAPITAL LETTER EPSILON WITH CIRCUMFLEX
-<dead_caron> <U0190>			: "Ɛ̌" # LATIN CAPITAL LETTER EPSILON WITH CARON
-<dead_macron> <U0190>			: "Ɛ̄" # LATIN CAPITAL LETTER EPSILON WITH MACRON
-<dead_tilde> <U0190>			: "Ɛ̃" # LATIN CAPITAL LETTER EPSILON WITH TILDE
-<dead_acute> <dead_tilde> <U0190>	: "Ɛ̃́" # LATIN CAPITAL LETTER EPSILON WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U0190>	: "Ɛ̃̀" # LATIN CAPITAL LETTER EPSILON WITH TILDE AND GRAVE
-<dead_acute> <U0269>			: "ɩ́" # LATIN SMALL LETTER IOTA WITH ACUTE
-<dead_grave> <U0269>			: "ɩ̀" # LATIN SMALL LETTER IOTA WITH GRAVE
-<dead_circumflex> <U0269>		: "ɩ̂" # LATIN SMALL LETTER IOTA WITH CIRCUMFLEX
-<dead_caron> <U0269>			: "ɩ̌" # LATIN SMALL LETTER IOTA WITH CARON
-<dead_macron> <U0269>			: "ɩ̄" # LATIN SMALL LETTER IOTA WITH MACRON
-<dead_acute> <U0196>			: "Ɩ́" # LATIN CAPITAL LETTER IOTA WITH ACUTE
-<dead_grave> <U0196>			: "Ɩ̀" # LATIN CAPITAL LETTER IOTA WITH GRAVE
-<dead_circumflex> <U0196>		: "Ɩ̂" # LATIN CAPITAL LETTER IOTA WITH CIRCUMFLEX
-<dead_caron> <U0196>			: "Ɩ̌" # LATIN CAPITAL LETTER IOTA WITH CARON
-<dead_macron> <U0196>			: "Ɩ̄" # LATIN CAPITAL LETTER IOTA WITH MACRON
-<dead_acute> <U0254>			: "ɔ́" # LATIN SMALL LETTER OPEN O WITH ACUTE
-<dead_grave> <U0254>			: "ɔ̀" # LATIN SMALL LETTER OPEN O WITH GRAVE
-<dead_circumflex> <U0254>		: "ɔ̂" # LATIN SMALL LETTER OPEN O WITH CIRCUMFLEX
-<dead_caron> <U0254>			: "ɔ̌" # LATIN SMALL LETTER OPEN O WITH CARON
-<dead_macron> <U0254>			: "ɔ̄" # LATIN SMALL LETTER OPEN O WITH MACRON
-<dead_tilde> <U0254>			: "ɔ̃" # LATIN SMALL LETTER OPEN O WITH TILDE
-<dead_acute> <dead_tilde> <U0254>	: "ɔ̃́" # LATIN SMALL LETTER OPEN O WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U0254>	: "ɔ̃̀" # LATIN SMALL LETTER OPEN O WITH TILDE AND GRAVE
-<dead_acute> <U0186>			: "Ɔ́" # LATIN CAPITAL LETTER OPEN O WITH ACUTE
-<dead_grave> <U0186>			: "Ɔ̀" # LATIN CAPITAL LETTER OPEN O WITH GRAVE
-<dead_circumflex> <U0186>		: "Ɔ̂" # LATIN CAPITAL LETTER OPEN O WITH CIRCUMFLEX
-<dead_caron> <U0186>			: "Ɔ̌" # LATIN CAPITAL LETTER OPEN O WITH CARON
-<dead_macron> <U0186>			: "Ɔ̄" # LATIN CAPITAL LETTER OPEN O WITH MACRON
-<dead_tilde> <U0186>			: "Ɔ̃" # LATIN CAPITAL LETTER OPEN O WITH TILDE
-<dead_acute> <dead_tilde> <U0186>	: "Ɔ̃́" # LATIN CAPITAL LETTER OPEN O WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U0186>	: "Ɔ̃̀" # LATIN CAPITAL LETTER OPEN O WITH TILDE AND GRAVE
-<dead_acute> <U01DD>			: "ǝ́" # LATIN SMALL LETTER TURNED E WITH ACUTE
-<dead_grave> <U01DD>			: "ǝ̀" # LATIN SMALL LETTER TURNED E WITH GRAVE
-<dead_circumflex> <U01DD>		: "ǝ̂" # LATIN SMALL LETTER TURNED E WITH CIRCUMFLEX
-<dead_caron> <U01DD>			: "ǝ̌" # LATIN SMALL LETTER TURNED E WITH CARON
-<dead_macron> <U01DD>			: "ǝ̄" # LATIN SMALL LETTER TURNED E WITH MACRON
-<dead_tilde> <U01DD>			: "ǝ̃" # LATIN SMALL LETTER TURNED E WITH TILDE
-<dead_acute> <dead_tilde> <U01DD>	: "ǝ̃́" # LATIN SMALL LETTER TURNED E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U01DD>	: "ǝ̃̀" # LATIN SMALL LETTER TURNED E WITH TILDE AND GRAVE
-<dead_acute> <U018E>			: "Ǝ́" # LATIN CAPITAL LETTER TURNED E WITH ACUTE
-<dead_grave> <U018E>			: "Ǝ̀" # LATIN CAPITAL LETTER TURNED E WITH GRAVE
-<dead_circumflex> <U018E>		: "Ǝ̂" # LATIN CAPITAL LETTER TURNED E WITH CIRCUMFLEX
-<dead_caron> <U018E>			: "Ǝ̌" # LATIN CAPITAL LETTER TURNED E WITH CARON
-<dead_macron> <U018E>			: "Ǝ̄" # LATIN CAPITAL LETTER TURNED E WITH MACRON
-<dead_tilde> <U018E>			: "Ǝ̃" # LATIN CAPITAL LETTER TURNED E WITH TILDE
-<dead_acute> <dead_tilde> <U018E>	: "Ǝ̃́" # LATIN CAPITAL LETTER TURNED E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U018E>	: "Ǝ̃̀" # LATIN CAPITAL LETTER TURNED E WITH TILDE AND GRAVE
-<dead_acute> <U028B>			: "ʋ́" # LATIN SMALL LETTER V WITH HOOK WITH ACUTE
-<dead_grave> <U028B>			: "ʋ̀" # LATIN SMALL LETTER V WITH HOOK WITH GRAVE
-<dead_circumflex> <U028B>		: "ʋ̂" # LATIN SMALL LETTER V WITH HOOK WITH CIRCUMFLEX
-<dead_caron> <U028B>			: "ʋ̌" # LATIN SMALL LETTER V WITH HOOK WITH CARON
-<dead_macron> <U028B>			: "ʋ̄" # LATIN SMALL LETTER V WITH HOOK WITH MACRON
-<dead_acute> <U01B2>			: "Ʋ́" # LATIN CAPITAL LETTER V WITH HOOK WITH ACUTE
-<dead_grave> <U01B2>			: "Ʋ̀" # LATIN CAPITAL LETTER V WITH HOOK WITH GRAVE
-<dead_circumflex> <U01B2>		: "Ʋ̂" # LATIN CAPITAL LETTER V WITH HOOK WITH CIRCUMFLEX
-<dead_caron> <U01B2>			: "Ʋ̌" # LATIN CAPITAL LETTER V WITH HOOK WITH CARON
-<dead_macron> <U01B2>			: "Ʋ̄" # LATIN CAPITAL LETTER V WITH HOOK WITH MACRON
-<dead_acute> <U028A>			: "ʊ́" # LATIN SMALL LETTER UPSILON WITH ACUTE
-<dead_grave> <U028A>			: "ʊ̀" # LATIN SMALL LETTER UPSILONK WITH GRAVE
-<dead_circumflex> <U028A>		: "ʊ̂" # LATIN SMALL LETTER UPSILON WITH CIRCUMFLEX
-<dead_caron> <U028A>			: "ʊ̌" # LATIN SMALL LETTER UPSILON WITH CARON
-<dead_macron> <U028A>			: "ʊ̄" # LATIN SMALL LETTER UPSILON WITH MACRON
-<dead_acute> <U01B1>			: "Ʊ́" # LATIN CAPITAL LETTER UPSILON WITH ACUTE
-<dead_grave> <U01B1>			: "Ʊ̀" # LATIN CAPITAL LETTER UPSILONK WITH GRAVE
-<dead_circumflex> <U01B1>		: "Ʊ̂" # LATIN CAPITAL LETTER UPSILON WITH CIRCUMFLEX
-<dead_caron> <U01B1>			: "Ʊ̌" # LATIN CAPITAL LETTER UPSILON WITH CARON
-<dead_macron> <U01B1>			: "Ʊ̄" # LATIN CAPITAL LETTER UPSILON WITH MACRON
-<dead_acute> <dead_tilde> <a>		: "ã́" # LATIN SMALL LETTER A WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <a>		: "ã̀" # LATIN SMALL LETTER A WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <A>		: "Ã́" # LATIN CAPITAL LETTER A WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <A>		: "Ã̀" # LATIN CAPITAL LETTER A WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <e>		: "ẽ́" # LATIN SMALL LETTER E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <e>		: "ẽ̀" # LATIN SMALL LETTER E WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <E>		: "Ẽ́" # LATIN CAPITAL LETTER E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <E>		: "Ẽ̀" # LATIN CAPITAL LETTER E WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <i>		: "ĩ́" # LATIN SMALL LETTER I WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <i>		: "ĩ̀" # LATIN SMALL LETTER I WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <I>		: "Ĩ́" # LATIN CAPITAL LETTER I WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <I>		: "Ĩ̀" # LATIN CAPITAL LETTER I WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <o>		: "õ̀" # LATIN SMALL LETTER O WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <O>		: "Õ̀" # LATIN CAPITAL LETTER O WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <u>		: "ũ̀" # LATIN SMALL LETTER U WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <U>		: "Ũ̀" # LATIN CAPITAL LETTER U WITH TILDE AND GRAVE
-<dead_grave> <m>			: "m̀" # LATIN SMALL LETTER M WITH GRAVE
-<dead_grave> <M>			: "M̀" # LATIN CAPITAL LETTER M WITH GRAVE
-<dead_acute> <eng>			: "ŋ́" # LATIN SMALL LETTER ENG WITH ACUTE
-<dead_grave> <eng>			: "ŋ̀" # LATIN SMALL LETTER ENG WITH GRAVE
-<dead_acute> <ENG>			: "Ŋ́" # LATIN CAPITAL LETTER ENG WITH ACUTE
-<dead_grave> <ENG>			: "Ŋ̀" # LATIN CAPITAL LETTER ENG WITH GRAVE
+<dead_acute> <U025B>			: "ɛ́" # LATIN SMALL LETTER EPSILON plus COMBINING ACUTE
+<dead_grave> <U025B>			: "ɛ̀" # LATIN SMALL LETTER EPSILON plus COMBINING GRAVE
+<dead_circumflex> <U025B>		: "ɛ̂" # LATIN SMALL LETTER EPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U025B>			: "ɛ̌" # LATIN SMALL LETTER EPSILON plus COMBINING CARON
+<dead_macron> <U025B>			: "ɛ̄" # LATIN SMALL LETTER EPSILON plus COMBINING MACRON
+<dead_tilde> <U025B>			: "ɛ̃" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U025B>	: "ɛ̃́" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U025B>	: "ɛ̃̀" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U0190>			: "Ɛ́" # LATIN CAPITAL LETTER EPSILON plus COMBINING ACUTE
+<dead_grave> <U0190>			: "Ɛ̀" # LATIN CAPITAL LETTER EPSILON plus COMBINING GRAVE
+<dead_circumflex> <U0190>		: "Ɛ̂" # LATIN CAPITAL LETTER EPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U0190>			: "Ɛ̌" # LATIN CAPITAL LETTER EPSILON plus COMBINING CARON
+<dead_macron> <U0190>			: "Ɛ̄" # LATIN CAPITAL LETTER EPSILON plus COMBINING MACRON
+<dead_tilde> <U0190>			: "Ɛ̃" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U0190>	: "Ɛ̃́" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U0190>	: "Ɛ̃̀" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U0269>			: "ɩ́" # LATIN SMALL LETTER IOTA plus COMBINING ACUTE
+<dead_grave> <U0269>			: "ɩ̀" # LATIN SMALL LETTER IOTA plus COMBINING GRAVE
+<dead_circumflex> <U0269>		: "ɩ̂" # LATIN SMALL LETTER IOTA plus COMBINING CIRCUMFLEX
+<dead_caron> <U0269>			: "ɩ̌" # LATIN SMALL LETTER IOTA plus COMBINING CARON
+<dead_macron> <U0269>			: "ɩ̄" # LATIN SMALL LETTER IOTA plus COMBINING MACRON
+<dead_acute> <U0196>			: "Ɩ́" # LATIN CAPITAL LETTER IOTA plus COMBINING ACUTE
+<dead_grave> <U0196>			: "Ɩ̀" # LATIN CAPITAL LETTER IOTA plus COMBINING GRAVE
+<dead_circumflex> <U0196>		: "Ɩ̂" # LATIN CAPITAL LETTER IOTA plus COMBINING CIRCUMFLEX
+<dead_caron> <U0196>			: "Ɩ̌" # LATIN CAPITAL LETTER IOTA plus COMBINING CARON
+<dead_macron> <U0196>			: "Ɩ̄" # LATIN CAPITAL LETTER IOTA plus COMBINING MACRON
+<dead_acute> <U0254>			: "ɔ́" # LATIN SMALL LETTER OPEN O plus COMBINING ACUTE
+<dead_grave> <U0254>			: "ɔ̀" # LATIN SMALL LETTER OPEN O plus COMBINING GRAVE
+<dead_circumflex> <U0254>		: "ɔ̂" # LATIN SMALL LETTER OPEN O plus COMBINING CIRCUMFLEX
+<dead_caron> <U0254>			: "ɔ̌" # LATIN SMALL LETTER OPEN O plus COMBINING CARON
+<dead_macron> <U0254>			: "ɔ̄" # LATIN SMALL LETTER OPEN O plus COMBINING MACRON
+<dead_tilde> <U0254>			: "ɔ̃" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U0254>	: "ɔ̃́" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U0254>	: "ɔ̃̀" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U0186>			: "Ɔ́" # LATIN CAPITAL LETTER OPEN O plus COMBINING ACUTE
+<dead_grave> <U0186>			: "Ɔ̀" # LATIN CAPITAL LETTER OPEN O plus COMBINING GRAVE
+<dead_circumflex> <U0186>		: "Ɔ̂" # LATIN CAPITAL LETTER OPEN O plus COMBINING CIRCUMFLEX
+<dead_caron> <U0186>			: "Ɔ̌" # LATIN CAPITAL LETTER OPEN O plus COMBINING CARON
+<dead_macron> <U0186>			: "Ɔ̄" # LATIN CAPITAL LETTER OPEN O plus COMBINING MACRON
+<dead_tilde> <U0186>			: "Ɔ̃" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U0186>	: "Ɔ̃́" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U0186>	: "Ɔ̃̀" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U01DD>			: "ǝ́" # LATIN SMALL LETTER TURNED E plus COMBINING ACUTE
+<dead_grave> <U01DD>			: "ǝ̀" # LATIN SMALL LETTER TURNED E plus COMBINING GRAVE
+<dead_circumflex> <U01DD>		: "ǝ̂" # LATIN SMALL LETTER TURNED E plus COMBINING CIRCUMFLEX
+<dead_caron> <U01DD>			: "ǝ̌" # LATIN SMALL LETTER TURNED E plus COMBINING CARON
+<dead_macron> <U01DD>			: "ǝ̄" # LATIN SMALL LETTER TURNED E plus COMBINING MACRON
+<dead_tilde> <U01DD>			: "ǝ̃" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U01DD>	: "ǝ̃́" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U01DD>	: "ǝ̃̀" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U018E>			: "Ǝ́" # LATIN CAPITAL LETTER TURNED E plus COMBINING ACUTE
+<dead_grave> <U018E>			: "Ǝ̀" # LATIN CAPITAL LETTER TURNED E plus COMBINING GRAVE
+<dead_circumflex> <U018E>		: "Ǝ̂" # LATIN CAPITAL LETTER TURNED E plus COMBINING CIRCUMFLEX
+<dead_caron> <U018E>			: "Ǝ̌" # LATIN CAPITAL LETTER TURNED E plus COMBINING CARON
+<dead_macron> <U018E>			: "Ǝ̄" # LATIN CAPITAL LETTER TURNED E plus COMBINING MACRON
+<dead_tilde> <U018E>			: "Ǝ̃" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U018E>	: "Ǝ̃́" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U018E>	: "Ǝ̃̀" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U028B>			: "ʋ́" # LATIN SMALL LETTER V WITH HOOK plus COMBINING ACUTE
+<dead_grave> <U028B>			: "ʋ̀" # LATIN SMALL LETTER V WITH HOOK plus COMBINING GRAVE
+<dead_circumflex> <U028B>		: "ʋ̂" # LATIN SMALL LETTER V WITH HOOK plus COMBINING CIRCUMFLEX
+<dead_caron> <U028B>			: "ʋ̌" # LATIN SMALL LETTER V WITH HOOK plus COMBINING CARON
+<dead_macron> <U028B>			: "ʋ̄" # LATIN SMALL LETTER V WITH HOOK plus COMBINING MACRON
+<dead_acute> <U01B2>			: "Ʋ́" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING ACUTE
+<dead_grave> <U01B2>			: "Ʋ̀" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING GRAVE
+<dead_circumflex> <U01B2>		: "Ʋ̂" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING CIRCUMFLEX
+<dead_caron> <U01B2>			: "Ʋ̌" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING CARON
+<dead_macron> <U01B2>			: "Ʋ̄" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING MACRON
+<dead_acute> <U028A>			: "ʊ́" # LATIN SMALL LETTER UPSILON plus COMBINING ACUTE
+<dead_grave> <U028A>			: "ʊ̀" # LATIN SMALL LETTER UPSILONK plus COMBINING GRAVE
+<dead_circumflex> <U028A>		: "ʊ̂" # LATIN SMALL LETTER UPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U028A>			: "ʊ̌" # LATIN SMALL LETTER UPSILON plus COMBINING CARON
+<dead_macron> <U028A>			: "ʊ̄" # LATIN SMALL LETTER UPSILON plus COMBINING MACRON
+<dead_acute> <U01B1>			: "Ʊ́" # LATIN CAPITAL LETTER UPSILON plus COMBINING ACUTE
+<dead_grave> <U01B1>			: "Ʊ̀" # LATIN CAPITAL LETTER UPSILONK plus COMBINING GRAVE
+<dead_circumflex> <U01B1>		: "Ʊ̂" # LATIN CAPITAL LETTER UPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U01B1>			: "Ʊ̌" # LATIN CAPITAL LETTER UPSILON plus COMBINING CARON
+<dead_macron> <U01B1>			: "Ʊ̄" # LATIN CAPITAL LETTER UPSILON plus COMBINING MACRON
+<dead_acute> <dead_tilde> <a>		: "ã́" # LATIN SMALL LETTER A plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <a>		: "ã̀" # LATIN SMALL LETTER A plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <A>		: "Ã́" # LATIN CAPITAL LETTER A plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <A>		: "Ã̀" # LATIN CAPITAL LETTER A plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <e>		: "ẽ́" # LATIN SMALL LETTER E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <e>		: "ẽ̀" # LATIN SMALL LETTER E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <E>		: "Ẽ́" # LATIN CAPITAL LETTER E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <E>		: "Ẽ̀" # LATIN CAPITAL LETTER E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <i>		: "ĩ́" # LATIN SMALL LETTER I plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <i>		: "ĩ̀" # LATIN SMALL LETTER I plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <I>		: "Ĩ́" # LATIN CAPITAL LETTER I plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <I>		: "Ĩ̀" # LATIN CAPITAL LETTER I plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <o>		: "õ̀" # LATIN SMALL LETTER O plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <O>		: "Õ̀" # LATIN CAPITAL LETTER O plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <u>		: "ũ̀" # LATIN SMALL LETTER U plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <U>		: "Ũ̀" # LATIN CAPITAL LETTER U plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <m>			: "m̀" # LATIN SMALL LETTER M plus COMBINING GRAVE
+<dead_grave> <M>			: "M̀" # LATIN CAPITAL LETTER M plus COMBINING GRAVE
+<dead_acute> <eng>			: "ŋ́" # LATIN SMALL LETTER ENG plus COMBINING ACUTE
+<dead_grave> <eng>			: "ŋ̀" # LATIN SMALL LETTER ENG plus COMBINING GRAVE
+<dead_acute> <ENG>			: "Ŋ́" # LATIN CAPITAL LETTER ENG plus COMBINING ACUTE
+<dead_grave> <ENG>			: "Ŋ̀" # LATIN CAPITAL LETTER ENG plus COMBINING GRAVE
diff --git a/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre b/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
index 35d009f24..7b794a9a5 100644
--- a/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
+++ b/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
@@ -83,7 +83,7 @@ fs7	{
 		primary	ISO8859-7:GR
 	}
 }
-XCOMM	fs9 class (ISO8859 families)
+XCOMM	fs8 class (ISO8859 families)
 fs8	{
 	charset	{
 		name	ISO8859-9:GR
@@ -92,7 +92,7 @@ fs8	{
 		primary	ISO8859-9:GR
 	}
 }
-XCOMM	fs13 class (ISO8859 families)
+XCOMM	fs9 class (ISO8859 families)
 fs9	{
 	charset	{
 		name	ISO8859-13:GR
@@ -101,7 +101,7 @@ fs9	{
 		primary	ISO8859-13:GR
 	}
 }
-XCOMM	fs14 class (ISO8859 families)
+XCOMM	fs10 class (ISO8859 families)
 fs10	{
 	charset	{
 		name	ISO8859-14:GR
@@ -110,7 +110,7 @@ fs10	{
 		primary	ISO8859-14:GR
 	}
 }
-XCOMM	fs15 class (ISO8859 families)
+XCOMM	fs11 class (ISO8859 families)
 fs11	{
 	charset	{
 		name	ISO8859-15:GR
@@ -119,7 +119,7 @@ fs11	{
 		primary	ISO8859-15:GR
 	}
 }
-XCOMM 	fs16 class (Kanji)
+XCOMM 	fs12 class (Kanji)
 fs12	{
 	charset	{
 		name	JISX0208.1983-0:GL
@@ -128,7 +128,7 @@ fs12	{
 		primary	JISX0208.1983-0:GL
 	}
 }
-XCOMM   fs17 class (Korean Character)
+XCOMM   fs13 class (Korean Character)
 fs13	{
 	charset	{
 		name	KSC5601.1987-0:GL
@@ -137,7 +137,7 @@ fs13	{
 		primary	KSC5601.1987-0:GL
 	}
 }
-XCOMM   fs18 class (Chinese Han Character)
+XCOMM   fs14 class (Chinese Han Character)
 fs14	{
 	charset	{
 		name	GB2312.1980-0:GL
@@ -146,7 +146,7 @@ fs14	{
 		primary	GB2312.1980-0:GL
 	}
 }
-XCOMM	fs20 class (Half Kana)
+XCOMM	fs15 class (Half Kana)
 fs15	{
 	charset	{
 		name	JISX0201.1976-0:GR
@@ -157,7 +157,7 @@ fs15	{
 	}
 }
 XCOMM	ISO10646 should come last so the fonts above will actually be used
-XCOMM	fs24 class
+XCOMM	fs16 class
 fs16	{
 	charset	{
 		name	ISO10646-1
@@ -223,76 +223,69 @@ XCOMM	cs6 class
 cs6     {
         side            GR
         length          1
-        ct_encoding     KOI8-R:GR
+        ct_encoding     ISO8859-7:GR
 }
  
 XCOMM	cs7 class
 cs7     {
         side            GR
         length          1
-        ct_encoding     ISO8859-7:GR
-}
- 
-XCOMM	cs9 class
-cs8     {
-        side            GR
-        length          1
         ct_encoding     ISO8859-9:GR
 }
  
-XCOMM	cs13 class
-cs9     {
+XCOMM	cs8 class
+cs8     {
         side            GR
         length          1
         ct_encoding     ISO8859-13:GR
 }
  
-XCOMM	cs14 class
-cs10     {
+XCOMM	cs9 class
+cs9     {
         side            GR
         length          1
         ct_encoding     ISO8859-14:GR
 }
  
-XCOMM	cs15 class
-cs11     {
+XCOMM	cs10 class
+cs10    {
         side            GR
         length          1
         ct_encoding     ISO8859-15:GR
 }
  
-XCOMM	cs16 class
-cs12	{
+XCOMM	cs11 class
+cs11	{
 	side		GR
 	length		2
 	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
 			JISX0208.1983-1:GL; JISX0208.1983-1:GR
 }
 
-XCOMM	cs17 class
-cs13     {
+XCOMM	cs12 class
+cs12    {
         side            GL
         length          2
         ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
                         KSC5601.1987-1:GL; KSC5601.1987-1:GR
 }
  
-XCOMM	cs18 class
-cs14     {
+XCOMM	cs13 class
+cs13    {
         side            GR
         length          2
         ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
 }
  
-XCOMM	cs20 class
-cs15	{
+XCOMM	cs14 class
+cs14	{
 	side		GR
 	length		1
 	ct_encoding	JISX0201.1976-0:GR
 }
  
-XCOMM	cs24 class
-cs16	{
+XCOMM	cs15 class
+cs15	{
 	side		none
 	ct_encoding	ISO10646-1
 }
diff --git a/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre b/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre
index 5064f1541..be320cba8 100644
--- a/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre
+++ b/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre
@@ -2,7 +2,6 @@ XCOMM
 XCOMM  XLocale Database Sample for ja_JP.sjis
 XCOMM 
 
-#ifndef __uxp__
 
 XCOMM 
 XCOMM 	XLC_FONTSET category
@@ -167,216 +166,3 @@ XCOMM }
 
 END XLC_XLOCALE
 
-#else /* __uxp__ */
-
-XCOMM  For UXP/DS plat form
-XCOMM
-XCOMM       XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0    {
-        charset_name    u90x03.1991-0
-        side            GL
-        length          2
-        gc_number       94
-        string_encoding False
-        sequence        \x1b\x25\x28\x32
-        encoding_name   fujitsu.U90X03
-}
-
-csd1    {
-        charset_name    u90x03.1991-0
-        side            GR
-        length          2
-        gc_number       94
-        string_encoding False
-        sequence        \x1b\x25\x2f\x32
-        encoding_name   fujitsu.U90X03
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM 
-XCOMM 	XLC_FONTSET category
-XCOMM 
-XLC_FONTSET
-XCOMM 	fs0 class (7 bit ASCII)
-fs0	{
-	charset	{
-		name		JISX0201.1976-0:GL
-	}
-	font	{
-		primary		JISX0201.1976-0:GL
-		substitute	ISO8859-1:GL
-		vertical_rotate all
-	}
-}
-XCOMM 	fs1 class (Kanji)
-fs1	{
-	charset	{
-		name		JISX0208.1983-0:GL
-	}
-	font	{
-                primary         fujitsu.u90x01.1991-0:GL
-                substitute      u90x01.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-		vertical_map    u90x01.1991-0.2:GL,\
-                        [\x2122,\x2125]->\x7d21,[\x2131,\x2132]->\x7d25,\
-                        [\x213c,\x213e]->\x7d27,[\x2141,\x215b]->\x7d2a,\
-                        [\x2421,\x2421]->\x7d45,[\x2423,\x2423]->\x7d46,\
-                        [\x2425,\x2425]->\x7d47,[\x2427,\x2427]->\x7d48,\
-                        [\x2429,\x2429]->\x7d49,[\x2443,\x2443]->\x7d4a,\
-                        [\x2463,\x2463]->\x7d4b,[\x2465,\x2465]->\x7d4c,\
-                        [\x2467,\x2467]->\x7d4d,[\x246e,\x246e]->\x7d4e,\
-                        [\x2521,\x2521]->\x7d4f,[\x2523,\x2523]->\x7d50,\
-                        [\x2525,\x2525]->\x7d51,[\x2527,\x2527]->\x7d52,\
-                        [\x2529,\x2529]->\x7d53,[\x2543,\x2543]->\x7d54,\
-                        [\x2563,\x2563]->\x7d55,[\x2565,\x2565]->\x7d56,\
-                        [\x2567,\x2567]->\x7d57,[\x256e,\x256e]->\x7d58,\
-                        [\x2575,\x2576]->\x7d59,[\x2475,\x2476]->\x7d5b
-	}
-}
-XCOMM 	fs2 class (Half Kana)
-fs2	{
-	charset	{
-		name		JISX0201.1976-0:GR
-	}
-	font	{
-		primary		JISX0201.1976-0:GR
-		vertical_rotate all
-	}
-}
-XCOMM 	fs3 class (Supplementary Kanji)
-fs3	{
-	charset	{
-		name		u90x03.1991-0:GL; u90x03.1991-0:GR
-		udc_area        \x6521,\x787e
-	}
-	font	{
-                primary         fujitsu.u90x03.1991-0:GL
-                substitute      u90x03.1991-0:GL;\
-                                JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-                                JISX0208.1983-1:GL; JISX0208.1983-1:GR;\
-                                JISX0208.1990-0:GL; JISX0208.1990-0:GR
-	}
-}
-END XLC_FONTSET
-
-XCOMM 
-XCOMM 	XLC_XLOCALE category
-XCOMM 
-XLC_XLOCALE
-
-encoding_name		ja.sjis
-mb_cur_max		2
-state_depend_encoding	False
-
-wc_encoding_mask	\x30000000
-wc_shift_bits		7
-
-
-XCOMM 	cs0 class
-cs0	{
-	side		GL:Default
-	length		1
-	wc_encoding	\x00000000
-	ct_encoding	JISX0201.1976-0:GL; ISO8859-1:GL
-}
-
-XCOMM 	cs1 class
-cs1	{
-	side		none
-	length		2
-	byte1		\x81,\x9f;\xe0,\xef
-	byte2		\x40,\x7e;\x80,\xfc
-
-	wc_encoding	\x30000000
-
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
-			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-	mb_conversion	\
-    [\x8140,\x817e]->\x2121,[\x8180,\x819e]->\x2160,[\x819f,\x81fc]->\x2221,\
-    [\x8240,\x827e]->\x2321,[\x8280,\x829e]->\x2360,[\x829f,\x82fc]->\x2421,\
-    [\x8340,\x837e]->\x2521,[\x8380,\x839e]->\x2560,[\x839f,\x83fc]->\x2621,\
-    [\x8440,\x847e]->\x2721,[\x8480,\x849e]->\x2760,[\x849f,\x84fc]->\x2821,\
-    [\x8540,\x857e]->\x2921,[\x8580,\x859e]->\x2960,[\x859f,\x85fc]->\x2a21,\
-    [\x8640,\x867e]->\x2b21,[\x8680,\x869e]->\x2b60,[\x869f,\x86fc]->\x2c21,\
-    [\x8740,\x877e]->\x2d21,[\x8780,\x879e]->\x2d60,[\x879f,\x87fc]->\x2e21,\
-    [\x8840,\x887e]->\x2f21,[\x8880,\x889e]->\x2f60,[\x889f,\x88fc]->\x3021,\
-    [\x8940,\x897e]->\x3121,[\x8980,\x899e]->\x3160,[\x899f,\x89fc]->\x3221,\
-    [\x8a40,\x8a7e]->\x3321,[\x8a80,\x8a9e]->\x3360,[\x8a9f,\x8afc]->\x3421,\
-    [\x8b40,\x8b7e]->\x3521,[\x8b80,\x8b9e]->\x3560,[\x8b9f,\x8bfc]->\x3621,\
-    [\x8c40,\x8c7e]->\x3721,[\x8c80,\x8c9e]->\x3760,[\x8c9f,\x8cfc]->\x3821,\
-    [\x8d40,\x8d7e]->\x3921,[\x8d80,\x8d9e]->\x3960,[\x8d9f,\x8dfc]->\x3a21,\
-    [\x8e40,\x8e7e]->\x3b21,[\x8e80,\x8e9e]->\x3b60,[\x8e9f,\x8efc]->\x3c21,\
-    [\x8f40,\x8f7e]->\x3d21,[\x8f80,\x8f9e]->\x3d60,[\x8f9f,\x8ffc]->\x3e21,\
-    [\x9040,\x907e]->\x3f21,[\x9080,\x909e]->\x3f60,[\x909f,\x90fc]->\x4021,\
-    [\x9140,\x917e]->\x4121,[\x9180,\x919e]->\x4160,[\x919f,\x91fc]->\x4221,\
-    [\x9240,\x927e]->\x4321,[\x9280,\x929e]->\x4360,[\x929f,\x92fc]->\x4421,\
-    [\x9340,\x937e]->\x4521,[\x9380,\x939e]->\x4560,[\x939f,\x93fc]->\x4621,\
-    [\x9440,\x947e]->\x4721,[\x9480,\x949e]->\x4760,[\x949f,\x94fc]->\x4821,\
-    [\x9540,\x957e]->\x4921,[\x9580,\x959e]->\x4960,[\x959f,\x95fc]->\x4a21,\
-    [\x9640,\x967e]->\x4b21,[\x9680,\x969e]->\x4b60,[\x969f,\x96fc]->\x4c21,\
-    [\x9740,\x977e]->\x4d21,[\x9780,\x979e]->\x4d60,[\x979f,\x97fc]->\x4e21,\
-    [\x9840,\x987e]->\x4f21,[\x9880,\x989e]->\x4f60,[\x989f,\x98fc]->\x5021,\
-    [\x9940,\x997e]->\x5121,[\x9980,\x999e]->\x5160,[\x999f,\x99fc]->\x5221,\
-    [\x9a40,\x9a7e]->\x5321,[\x9a80,\x9a9e]->\x5360,[\x9a9f,\x9afc]->\x5421,\
-    [\x9b40,\x9b7e]->\x5521,[\x9b80,\x9b9e]->\x5560,[\x9b9f,\x9bfc]->\x5621,\
-    [\x9c40,\x9c7e]->\x5721,[\x9c80,\x9c9e]->\x5760,[\x9c9f,\x9cfc]->\x5821,\
-    [\x9d40,\x9d7e]->\x5921,[\x9d80,\x9d9e]->\x5960,[\x9d9f,\x9dfc]->\x5a21,\
-    [\x9e40,\x9e7e]->\x5b21,[\x9e80,\x9e9e]->\x5b60,[\x9e9f,\x9efc]->\x5c21,\
-    [\x9f40,\x9f7e]->\x5d21,[\x9f80,\x9f9e]->\x5d60,[\x9f9f,\x9ffc]->\x5e21,\
-    [\xe040,\xe07e]->\x5f21,[\xe080,\xe09e]->\x5f60,[\xe09f,\xe0fc]->\x6021,\
-    [\xe140,\xe17e]->\x6121,[\xe180,\xe19e]->\x6160,[\xe19f,\xe1fc]->\x6221,\
-    [\xe240,\xe27e]->\x6321,[\xe280,\xe29e]->\x6360,[\xe29f,\xe2fc]->\x6421,\
-    [\xe340,\xe37e]->\x6521,[\xe380,\xe39e]->\x6560,[\xe39f,\xe3fc]->\x6621,\
-    [\xe440,\xe47e]->\x6721,[\xe480,\xe49e]->\x6760,[\xe49f,\xe4fc]->\x6821,\
-    [\xe540,\xe57e]->\x6921,[\xe580,\xe59e]->\x6960,[\xe59f,\xe5fc]->\x6a21,\
-    [\xe640,\xe67e]->\x6b21,[\xe680,\xe69e]->\x6b60,[\xe69f,\xe6fc]->\x6c21,\
-    [\xe740,\xe77e]->\x6d21,[\xe780,\xe79e]->\x6d60,[\xe79f,\xe7fc]->\x6e21,\
-    [\xe840,\xe87e]->\x6f21,[\xe880,\xe89e]->\x6f60,[\xe89f,\xe8fc]->\x7021,\
-    [\xe940,\xe97e]->\x7121,[\xe980,\xe99e]->\x7160,[\xe99f,\xe9fc]->\x7221,\
-    [\xea40,\xea7e]->\x7321,[\xea80,\xea9e]->\x7360,[\xea9f,\xeafc]->\x7421,\
-    [\xeb40,\xeb7e]->\x7521,[\xeb80,\xeb9e]->\x7560,[\xeb9f,\xebfc]->\x7621,\
-    [\xec40,\xec7e]->\x7721,[\xec80,\xec9e]->\x7760,[\xec9f,\xecfc]->\x7821,\
-    [\xed40,\xed7e]->\x7921,[\xed80,\xed9e]->\x7960,[\xed9f,\xedfc]->\x7a21,\
-    [\xee40,\xee7e]->\x7b21,[\xee80,\xee9e]->\x7b60,[\xee9f,\xeefc]->\x7c21,\
-    [\xef40,\xef7e]->\x7d21,[\xef80,\xef9e]->\x7d60,[\xef9f,\xeffc]->\x7e21
-}
-
-XCOMM 	cs2 class
-cs2	{
-	side		GR
-	length		1
-	wc_encoding	\x10000000
-	ct_encoding	JISX0201.1976-0:GR
-}
-
-XCOMM 	cs3 class
-cs3	{
-	side		none
-	length		2
-	byte1		\xf0,\xfc
-	byte2		\x40,\x7e;\x80,\xfc
- 	wc_encoding	\x20000000
- 	ct_encoding	u90x03.1991-0:GL; u90x03.1991-0:GR
-	mb_conversion	\
-    [\xf040,\xf07e]->\x6521,[\xf080,\xf09e]->\x6560,[\xf09f,\xf0fc]->\x6621,\
-    [\xf140,\xf17e]->\x6721,[\xf180,\xf19e]->\x6760,[\xf19f,\xf1fc]->\x6821,\
-    [\xf240,\xf27e]->\x6921,[\xf280,\xf29e]->\x6960,[\xf29f,\xf2fc]->\x6a21,\
-    [\xf340,\xf37e]->\x6b21,[\xf380,\xf39e]->\x6b60,[\xf39f,\xf3fc]->\x6c21,\
-    [\xf440,\xf47e]->\x6d21,[\xf480,\xf49e]->\x6d60,[\xf49f,\xf4fc]->\x6e21,\
-    [\xf540,\xf57e]->\x6f21,[\xf580,\xf59e]->\x6f60,[\xf59f,\xf5fc]->\x7021,\
-    [\xf640,\xf67e]->\x7121,[\xf680,\xf69e]->\x7160,[\xf69f,\xf6fc]->\x7221,\
-    [\xf740,\xf77e]->\x7321,[\xf780,\xf79e]->\x7360,[\xf79f,\xf7fc]->\x7421,\
-    [\xf840,\xf87e]->\x7521,[\xf880,\xf89e]->\x7560,[\xf89f,\xf8fc]->\x7621,\
-    [\xf940,\xf97e]->\x7721,[\xf980,\xf99e]->\x7760,[\xf99f,\xf9fc]->\x7821,\
-    [\xfa40,\xfa7e]->\x7921,[\xfa80,\xfa9e]->\x7960,[\xfa9f,\xfafc]->\x7a21,\
-    [\xfb40,\xfb7e]->\x7b21,[\xfb80,\xfb9e]->\x7b60,[\xfb9f,\xfbfc]->\x7c21,\
-    [\xfc40,\xfc7e]->\x7d21,[\xfc80,\xfc9e]->\x7d60,[\xfc9f,\xfcfc]->\x7e21
-}
-
-END XLC_XLOCALE
-
-#endif /* __uxp__ */
diff --git a/lib/libX11/nls/pt_BR.UTF-8/Compose.pre b/lib/libX11/nls/pt_BR.UTF-8/Compose.pre
index 29846c631..4355722f2 100644
--- a/lib/libX11/nls/pt_BR.UTF-8/Compose.pre
+++ b/lib/libX11/nls/pt_BR.UTF-8/Compose.pre
@@ -8,10 +8,6 @@ XCOMM   by Benno Schulenberg <bensberg@justemail.net>
 XCOMM Use the sequences from en_US.UTF-8 as the basis:
 include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
 
-XCOMM This one should probably be deleted, because in
-XCOMM en_US.UTF8 this is lowercase schwa, not uppercase:
-<Multi_key> <e> <e> 			: "Ə" U018f
-
 XCOMM Two nice additions -- maybe add to en_US.UTF8?
 <Multi_key> <quotedbl> <backslash> 	: "〝" U301d	# REVERSED DOUBLE PRIME QUOTATION MARK
 <Multi_key> <quotedbl> <slash>  	: "〞" U301e	# DOUBLE PRIME QUOTATION MARK