[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libx11: Changes to 'upstream-unstable'



 configure.ac                   |   17 
 include/X11/Xlib.h             |   21 
 man/XAllocColor.man            |    2 
 man/xkb/XkbGetKeyboard.man     |    2 
 modules/im/ximcp/imThaiFlt.c   |   50 +
 modules/om/generic/omGeneric.c |    2 
 nls/compose.dir.pre            |   17 
 nls/el_GR.UTF-8/Compose.pre    |  441 -----------
 nls/en_US.UTF-8/Compose.pre    | 1607 -----------------------------------------
 nls/fi_FI.UTF-8/Compose.pre    | 1607 -----------------------------------------
 nls/iso8859-1/Compose.pre      |   16 
 nls/iso8859-15/Compose.pre     |    8 
 nls/iso8859-9/Compose.pre      |    8 
 nls/iso8859-9e/Compose.pre     |    8 
 nls/locale.alias.pre           |   39 
 nls/locale.dir.pre             |   15 
 nls/pt_BR.UTF-8/Compose.pre    | 1495 +-------------------------------------
 nls/th_TH.UTF-8/XLC_LOCALE.pre |   12 
 nls/th_TH/XLC_LOCALE.pre       |    6 
 src/ChkMaskEv.c                |    2 
 src/ChkWinEv.c                 |    2 
 src/MaskEvent.c                |    2 
 src/WinEvent.c                 |    2 
 src/XlibInt.c                  |    2 
 24 files changed, 301 insertions(+), 5082 deletions(-)

New commits:
commit 75fe48e7a42a685d7098e8d7108b9b956c471563
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Jul 10 14:07:34 2009 +1000

    Bump to 1.2.2
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index 5ecd626..ab6d5a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.60)
 AC_INIT([libX11],
-        1.2.1,
+        1.2.2,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libX11)
 AC_CONFIG_SRCDIR([Makefile.am])

commit 5d0fe0e0e92759af5667c5dca2eacb1b6f2d66ea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Jul 2 09:10:25 2009 +1000

    XMaskEvent/XCheckMaskedEvents must not check for GenericEvents.
    
    GenericEvent cannot be selected for in the core event masks and they must
    thus be treated like extension events.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c
index e19a991..bc1a279 100644
--- a/src/ChkMaskEv.c
+++ b/src/ChkMaskEv.c
@@ -59,7 +59,7 @@ Bool XCheckMaskEvent (
 	    for (qelt = prev ? prev->next : dpy->head;
 		 qelt;
 		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.type < LASTEvent) &&
+		if ((qelt->event.type < GenericEvent) &&
 		    (_Xevent_to_mask[qelt->event.type] & mask) &&
 		    ((qelt->event.type != MotionNotify) ||
 		     (mask & AllPointers) ||
diff --git a/src/MaskEvent.c b/src/MaskEvent.c
index 8f0c0d4..acd903f 100644
--- a/src/MaskEvent.c
+++ b/src/MaskEvent.c
@@ -58,7 +58,7 @@ XMaskEvent (
 	    for (qelt = prev ? prev->next : dpy->head;
 		 qelt;
 		 prev = qelt, qelt = qelt->next) {
-		if ((qelt->event.type < LASTEvent) &&
+		if ((qelt->event.type < GenericEvent) &&
 		    (_Xevent_to_mask[qelt->event.type] & mask) &&
 		    ((qelt->event.type != MotionNotify) ||
 		     (mask & AllPointers) ||

commit c1bf65b89f4e361f6178a73dd5334c8f2bd95732
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Jul 2 09:06:05 2009 +1000

    XWindowEvent/XCheckWindowEvent must not return GenericEvents.
    
    GenericEvents have no fixed position for the window, so they must be treated
    like extension events.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/ChkWinEv.c b/src/ChkWinEv.c
index 42720e4..1fd975c 100644
--- a/src/ChkWinEv.c
+++ b/src/ChkWinEv.c
@@ -60,7 +60,7 @@ Bool XCheckWindowEvent (
 		 qelt;
 		 prev = qelt, qelt = qelt->next) {
 		if ((qelt->event.xany.window == w) &&
-		    (qelt->event.type < LASTEvent) &&
+		    (qelt->event.type < GenericEvent) &&
 		    (_Xevent_to_mask[qelt->event.type] & mask) &&
 		    ((qelt->event.type != MotionNotify) ||
 		     (mask & AllPointers) ||
diff --git a/src/WinEvent.c b/src/WinEvent.c
index 7662609..c6daf2a 100644
--- a/src/WinEvent.c
+++ b/src/WinEvent.c
@@ -62,7 +62,7 @@ XWindowEvent (
 		 qelt;
 		 prev = qelt, qelt = qelt->next) {
 		if ((qelt->event.xany.window == w) &&
-		    (qelt->event.type < LASTEvent) &&
+		    (qelt->event.type < GenericEvent) &&
 		    (_Xevent_to_mask[qelt->event.type] & mask) &&
 		    ((qelt->event.type != MotionNotify) ||
 		     (mask & AllPointers) ||

commit 38f9054554d63525d2dd51aafb5eb57821158ab9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Jun 15 19:00:43 2009 -0700

    Drop ancient USG SysV #ifdefs
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index 4869446..682988c 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -38,20 +38,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define XlibSpecificationRelease 6
 
-#ifdef USG
-#ifndef __TYPES__
-#include <sys/types.h>			/* forgot to protect it... */
-#define __TYPES__
-#endif /* __TYPES__ */
-#else
-#if defined(_POSIX_SOURCE) && defined(MOTOROLA)
-#undef _POSIX_SOURCE
-#include <sys/types.h>
-#define _POSIX_SOURCE
-#else
 #include <sys/types.h>
-#endif
-#endif /* USG */
 
 #if defined(__SCO__) || defined(__UNIXWARE__)
 #include <stdint.h>
diff --git a/src/XlibInt.c b/src/XlibInt.c
index ad91400..320e808 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -3231,7 +3231,7 @@ void _XData32(
  *       and so, you may be better off using gethostname (if it exists).
  */
 
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4)
+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4)
 #define NEED_UTSNAME
 #include <sys/utsname.h>
 #endif

commit 7bfe1323f16a1a69cc474659f7ac0c2570b1cf42
Author: Adam Jackson <ajax@redhat.com>
Date:   Fri Jun 12 12:44:01 2009 -0400

    Remove X_NOT_STDC_ENV usage. (#6527)

diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index 44557ea..4869446 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -64,14 +64,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xosdefs.h>
 
 #ifndef X_WCHAR
-#ifdef X_NOT_STDC_ENV
-#ifndef ISC
-#define X_WCHAR
-#endif
-#endif
-#endif
-
-#ifndef X_WCHAR
 #include <stddef.h>
 #else
 #ifdef __UNIXOS2__

commit 6dd74d7fb414ca1e99bae5c13e333961f396eb36
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri May 29 11:18:11 2009 +0200

    nls: remove more duplicated aliases
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index e6ed543..44891d1 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -63,7 +63,6 @@ ar_JO.ISO-8859-6:				ar_JO.ISO8859-6
 ar_JO.utf8:					ar_JO.UTF-8
 ar_KW:						ar_KW.ISO8859-6
 ar_KW.iso88596:					ar_KW.ISO8859-6
-ar_KW.iso88596:					ar_KW.ISO8859-6
 ar_KW.ISO-8859-6:				ar_KW.ISO8859-6
 ar_KW.utf8:					ar_KW.UTF-8
 ar_LB:						ar_LB.ISO8859-6
@@ -702,9 +701,7 @@ ja_JP.S90:					ja_JP.S90
 ja:						ja_JP.eucJP
 ja.JIS:						ja_JP.JIS7
 ja.SJIS:					ja_JP.SJIS
-ja_JP:						ja_JP.eucJP
 ja_JP.ujis:					ja_JP.eucJP
-ja_JP.eucjp:					ja_JP.eucJP
 Jp_JP:						ja_JP.eucJP
 ja_JP.AJEC:					ja_JP.eucJP
 ja_JP.EUC:					ja_JP.eucJP

commit e4b0899f516da224010e68bd2d953d5293d94993
Author: parag <parag@rawhideTM.pnq.redhat.com>
Date:   Thu May 28 11:29:35 2009 +0530

    nls: Add pa_PK locale information and make pa_IN as default for pa.
    
    X.Org bug#21954 <http://bugs.freedesktop.org/show_bug.cgi?id=21954>
    
    [jcristau: removed the pa_PK.UTF-8 alias to itself]
    
    Signed-off-by: parag <pnemade@redhat.com>
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 2a4123e..2ef0bbb 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -370,6 +370,7 @@ en_US.UTF-8/Compose:		ny_NO.UTF-8
 en_US.UTF-8/Compose:		oc_FR.UTF-8
 en_US.UTF-8/Compose:		or_IN.UTF-8
 en_US.UTF-8/Compose:		pa_IN.UTF-8
+en_US.UTF-8/Compose:		pa_PK.UTF-8
 en_US.UTF-8/Compose:		pd_DE.UTF-8
 en_US.UTF-8/Compose:		pd_US.UTF-8
 en_US.UTF-8/Compose:		ph_PH.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 8e00c16..e6ed543 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -898,8 +898,10 @@ oc_FR@euro:					oc_FR.ISO8859-15
 or:						or_IN.UTF-8
 or_IN.utf8:					or_IN.UTF-8
 or_IN.UTF-8:					or_IN.UTF-8
+pa:						pa_IN.UTF-8
 pa_IN.utf8:					pa_IN.UTF-8
 pa_IN.UTF-8:					pa_IN.UTF-8
+pa_PK.utf8:					pa_PK.UTF-8
 pd:						pd_US.ISO8859-1
 pd_DE:						pd_DE.ISO8859-1
 pd_US:						pd_US.ISO8859-1
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index ecc2adf..0fc4a9f 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -392,6 +392,7 @@ en_US.UTF-8/XLC_LOCALE:			ny_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			oc_FR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			or_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pa_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:			pa_PK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pd_DE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pd_US.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ph_PH.UTF-8

commit f0ea1f6d51145592f8617854f9320ec5dbff3299
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri May 29 10:58:20 2009 +0200

    nls: remove broken sd_IN.UTF-8 alias
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index a05e045..8e00c16 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -977,7 +977,6 @@ rw_RW.ISO-8859-1:           rw_RW.ISO8859-1
 rw_RW.utf8:                 rw_RW.UTF-8
 sd:						sd_IN.UTF-8
 sd_IN.utf8:					sd_IN.UTF-8
-sd_IN.UTF-8:					sd_INUTF-8
 sd:						sd_IN@devanagari.UTF-8
 sd_IN@devanagari.utf8:				sd_IN@devanagari.UTF-8
 sd_IN@devanagari.UTF-8:				sd_IN@devanagari.UTF-8

commit e29e010dabdb17d6498f2ef1786f69b8830c18ca
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri May 29 10:57:43 2009 +0200

    nls: remove duplicated en_US* aliases
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 452bd18..a05e045 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -358,15 +358,6 @@ en_US.8859-15:					en_US.ISO8859-15
 en_US.ISO8859-15@euro:				en_US.ISO8859-15
 en_US.utf8:					en_US.UTF-8
 EN_US.UTF-8:					en_US.UTF-8
-en_US.88591.en:					en_US.ISO8859-1
-en_US.iso88591:					en_US.ISO8859-1
-en_US.ISO-8859-1:				en_US.ISO8859-1
-en_US.ISO_8859-1:				en_US.ISO8859-1
-en_US.iso885915:				en_US.ISO8859-15
-en_US.8859-15:					en_US.ISO8859-15
-en_US.ISO8859-15@euro:				en_US.ISO8859-15
-en_US.utf8:					en_US.UTF-8
-EN_US.UTF-8:					en_US.UTF-8
 en_ZA:						en_ZA.ISO8859-1
 en_ZA.88591:					en_ZA.ISO8859-1
 en_ZA.88591.en:					en_ZA.ISO8859-1

commit a89a300d87852c84389ad97db66dcb8930cb45dd
Author: Caolan McNamara <caolanm@redhat.com>
Date:   Thu May 21 18:41:05 2009 +0200

    man: missing space in XAllocColor man page
    
    X.Org bug#21854 <http://bugs.freedesktop.org/show_bug.cgi?id=21854>

diff --git a/man/XAllocColor.man b/man/XAllocColor.man
index ef379b0..50c0f35 100644
--- a/man/XAllocColor.man
+++ b/man/XAllocColor.man
@@ -155,7 +155,7 @@ char *\fIcolor_name\fP\^, XColor *\fIscreen_def_return\fP\^, XColor
 *\fIexact_def_return\fP\^);
 .HP
 Status XAllocColorCells\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
-Bool \fIcontig\fP\^, unsigned long\fIplane_masks_return\fP[\^]\^, unsigned int
+Bool \fIcontig\fP\^, unsigned long \fIplane_masks_return\fP[\^]\^, unsigned int
 \fInplanes\fP\^, unsigned long \fIpixels_return\fP[\^]\^, unsigned int
 \fInpixels\fP\^);
 .HP

commit c1c001e36504fd304f76f69bf6af3643225c49ea
Author: James Cloos <cloos@jhcloos.com>
Date:   Wed May 13 13:03:54 2009 -0400

    [nls] Replace remaining UCS Combining Characters in Compose sequences.
    
    The replaces the instances of keysyms which match <U03[0-6][0-9A-Fa-f]>,
    where the keysym is used as a dead_key, with an actual dead_key symbol.
    
    The only remaining instances of UCS combining characters in the
    compose sequences are of U0338 COMBINING LONG SOLIDUS OVERLAY
    used as a suffix in Multi_key-initiated sequences to create
    mathematics characters such as ∉ U+2209 NOT AN ELEMENT OF
    from ∈ U+2208 ELEMENT OF.

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 3a3889f..26084b9 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1151,30 +1151,30 @@ XCOMM Part 3
 <Multi_key> <acute> <KP_Divide> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <dead_stroke> <dead_acute> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<U030F> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-<U030F> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-<U0311> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-<U0311> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
-<U030F> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-<U030F> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-<U0311> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-<U0311> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
-<U030F> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-<U030F> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-<U0311> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-<U0311> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
-<U030F> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-<U030F> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-<U0311> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-<U0311> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
-<U030F> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-<U030F> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-<U0311> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-<U0311> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
-<U030F> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-<U030F> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-<U0311> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-<U0311> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_double_grave> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_double_grave> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_inverted_breve> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_inverted_breve> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_double_grave> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_double_grave> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_inverted_breve> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_inverted_breve> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_double_grave> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_double_grave> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_inverted_breve> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_inverted_breve> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_double_grave> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_double_grave> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_inverted_breve> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_inverted_breve> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_double_grave> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_double_grave> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_inverted_breve> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_inverted_breve> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_double_grave> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_double_grave> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_inverted_breve> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_inverted_breve> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
 <dead_caron> <H>                 	: "Ȟ"   U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <c> <H>              	: "Ȟ"   U021E # LATIN CAPITAL LETTER H WITH CARON
 <dead_caron> <h>                 	: "ȟ"   U021F # LATIN SMALL LETTER H WITH CARON
@@ -1432,8 +1432,8 @@ XCOMM Part 3
 <dead_breve> <Cyrillic_u>        	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
-<U030F> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<U030F> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_double_grave> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_double_grave> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe> 	: "ғ"   U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
diff --git a/nls/fi_FI.UTF-8/Compose.pre b/nls/fi_FI.UTF-8/Compose.pre
index 1e3f83d..9f7ce16 100644
--- a/nls/fi_FI.UTF-8/Compose.pre
+++ b/nls/fi_FI.UTF-8/Compose.pre
@@ -1147,30 +1147,30 @@ XCOMM Part 3
 <Multi_key> <acute> <KP_Divide> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <dead_stroke> <dead_acute> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<U030F> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-<U030F> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-<U0311> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-<U0311> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
-<U030F> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-<U030F> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-<U0311> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-<U0311> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
-<U030F> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-<U030F> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-<U0311> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-<U0311> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
-<U030F> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-<U030F> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-<U0311> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-<U0311> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
-<U030F> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-<U030F> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-<U0311> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-<U0311> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
-<U030F> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-<U030F> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-<U0311> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-<U0311> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_double_grave> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_double_grave> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_inverted_breve> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_inverted_breve> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_double_grave> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_double_grave> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_inverted_breve> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_inverted_breve> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_double_grave> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_double_grave> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_inverted_breve> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_inverted_breve> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_double_grave> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_double_grave> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_inverted_breve> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_inverted_breve> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_double_grave> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_double_grave> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_inverted_breve> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_inverted_breve> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_double_grave> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_double_grave> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_inverted_breve> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_inverted_breve> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
 <dead_caron> <H>                 	: "Ȟ"   U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <c> <H>              	: "Ȟ"   U021E # LATIN CAPITAL LETTER H WITH CARON
 <dead_caron> <h>                 	: "ȟ"   U021F # LATIN SMALL LETTER H WITH CARON
@@ -1428,8 +1428,8 @@ XCOMM Part 3
 <dead_breve> <Cyrillic_u>        	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
-<U030F> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<U030F> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_double_grave> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_double_grave> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe> 	: "ғ"   U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index 6498e24..5c12af3 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -1084,34 +1084,34 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <Multi_key> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<U030f> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-<U030f> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-<U0311> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-<U0311> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
-<U030f> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-<U030f> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-<U0311> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-<U0311> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
-<U030f> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-<U030f> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-<U0311> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-<U0311> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
-<U030f> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-<U030f> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-<U0311> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-<U0311> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
-<U030f> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-<U030f> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-<U0311> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-<U0311> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
-<U030f> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-<U030f> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-<U0311> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-<U0311> <u>	: "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
-<U0326> <S>	: "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<U0326> <s>	: "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<U0326> <T>	: "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<U0326> <t>	: "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<dead_double_grave> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_double_grave> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_inverted_breve> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_inverted_breve> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_double_grave> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_double_grave> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_inverted_breve> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_inverted_breve> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_double_grave> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_double_grave> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_inverted_breve> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_inverted_breve> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_double_grave> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_double_grave> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_inverted_breve> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_inverted_breve> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_double_grave> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_double_grave> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_inverted_breve> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_inverted_breve> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_double_grave> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_double_grave> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_inverted_breve> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_inverted_breve> <u>	: "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_belowcomma> <S>	: "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <s>	: "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <T>	: "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<dead_belowcomma> <t>	: "ț" 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
 <dead_caron> <h>	: "ȟ" U021F # LATIN SMALL LETTER H WITH CARON
@@ -1369,8 +1369,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_breve> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
-<U030f> <U0474>	: "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<U030f> <U0475>	: "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_double_grave> <U0474>	: "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_double_grave> <U0475>	: "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE>	: "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE>	: "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe>	: "ғ" U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
@@ -1533,8 +1533,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <U0fab> <U0fb7>	: "ྫྷ" U0FAC # TIBETAN SUBJOINED LETTER DZHA
 <Multi_key> <U0f90> <U0fb5>	: "ྐྵ" U0FB9 # TIBETAN SUBJOINED LETTER KSSA
 <Multi_key> <U102e> <U1025>	: "ဦ" U1026 # MYANMAR LETTER UU
-<U0325> <A>	: "Ḁ" U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
-<U0325> <a>	: "ḁ" U1E01 # LATIN SMALL LETTER A WITH RING BELOW
+<dead_belowring> <A>	: "Ḁ" U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
+<dead_belowring> <a>	: "ḁ" U1E01 # LATIN SMALL LETTER A WITH RING BELOW
 <dead_abovedot> <B>	: "Ḃ" U1E02 # LATIN CAPITAL LETTER B WITH DOT ABOVE
 <Multi_key> <period> <B>	: "Ḃ" U1E02 # LATIN CAPITAL LETTER B WITH DOT ABOVE
 <dead_abovedot> <b>	: "ḃ" U1E03 # LATIN SMALL LETTER B WITH DOT ABOVE
@@ -1543,8 +1543,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <exclam> <B>	: "Ḅ" U1E04 # LATIN CAPITAL LETTER B WITH DOT BELOW
 <dead_belowdot> <b>	: "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
 <Multi_key> <exclam> <b>	: "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
-<U0331> <B>	: "Ḇ" U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
-<U0331> <b>	: "ḇ" U1E07 # LATIN SMALL LETTER B WITH LINE BELOW
+<dead_belowmacron> <B>	: "Ḇ" U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
+<dead_belowmacron> <b>	: "ḇ" U1E07 # LATIN SMALL LETTER B WITH LINE BELOW
 <dead_acute> <Ccedilla>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <Ccedilla>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <Ccedilla>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
@@ -1577,16 +1577,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <exclam> <D>	: "Ḍ" U1E0C # LATIN CAPITAL LETTER D WITH DOT BELOW
 <dead_belowdot> <d>	: "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
 <Multi_key> <exclam> <d>	: "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
-<U0331> <D>	: "Ḏ" U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
-<U0331> <d>	: "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
+<dead_belowmacron> <D>	: "Ḏ" U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
+<dead_belowmacron> <d>	: "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
 <dead_cedilla> <D>	: "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
 <Multi_key> <comma> <D>	: "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
 <Multi_key> <cedilla> <D>	: "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
 <dead_cedilla> <d>	: "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
 <Multi_key> <comma> <d>	: "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
 <Multi_key> <cedilla> <d>	: "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
-<U032d> <D>	: "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-<U032d> <d>	: "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
+<dead_belowcircumflex> <D>	: "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+<dead_belowcircumflex> <d>	: "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
 <dead_grave> <Emacron>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <Emacron>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
@@ -1627,10 +1627,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_macron> <e>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <e>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <e>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<U032d> <E>	: "Ḙ" U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-<U032d> <e>	: "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
-<U0330> <E>	: "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
-<U0330> <e>	: "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
+<dead_belowcircumflex> <E>	: "Ḙ" U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+<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
@@ -1683,10 +1683,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_cedilla> <h>	: "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
 <Multi_key> <comma> <h>	: "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
 <Multi_key> <cedilla> <h>	: "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
-<U032e> <H>	: "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
-<U032e> <h>	: "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
-<U0330> <I>	: "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
-<U0330> <i>	: "ḭ" U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW
+<dead_belowbreve> <H>	: "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
+<dead_belowbreve> <h>	: "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
+<dead_belowtilde> <I>	: "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
+<dead_belowtilde> <i>	: "ḭ" U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW
 <dead_acute> <Idiaeresis>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <Idiaeresis>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <Idiaeresis>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
@@ -1715,8 +1715,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <exclam> <K>	: "Ḳ" U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
 <dead_belowdot> <k>	: "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
 <Multi_key> <exclam> <k>	: "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
-<U0331> <K>	: "Ḵ" U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
-<U0331> <k>	: "ḵ" U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
+<dead_belowmacron> <K>	: "Ḵ" U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
+<dead_belowmacron> <k>	: "ḵ" U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
 <dead_belowdot> <L>	: "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
 <Multi_key> <exclam> <L>	: "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
 <dead_belowdot> <l>	: "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
@@ -1739,10 +1739,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <macron> <exclam> <l>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <dead_belowdot> <l>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <exclam> <l>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<U0331> <L>	: "Ḻ" U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
-<U0331> <l>	: "ḻ" U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
-<U032d> <L>	: "Ḽ" U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-<U032d> <l>	: "ḽ" U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
+<dead_belowmacron> <L>	: "Ḻ" U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
+<dead_belowmacron> <l>	: "ḻ" U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
+<dead_belowcircumflex> <L>	: "Ḽ" U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+<dead_belowcircumflex> <l>	: "ḽ" U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
 <dead_acute> <M>	: "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
 <Multi_key> <acute> <M>	: "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
 <Multi_key> <apostrophe> <M>	: "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
@@ -1765,10 +1765,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <exclam> <N>	: "Ṇ" U1E46 # LATIN CAPITAL LETTER N WITH DOT BELOW
 <dead_belowdot> <n>	: "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
 <Multi_key> <exclam> <n>	: "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
-<U0331> <N>	: "Ṉ" U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
-<U0331> <n>	: "ṉ" U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
-<U032d> <N>	: "Ṋ" U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-<U032d> <n>	: "ṋ" U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
+<dead_belowmacron> <N>	: "Ṉ" U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
+<dead_belowmacron> <n>	: "ṉ" U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
+<dead_belowcircumflex> <N>	: "Ṋ" U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+<dead_belowcircumflex> <n>	: "ṋ" U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
 <dead_acute> <Otilde>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <acute> <Otilde>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <Otilde>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
@@ -1875,8 +1875,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <macron> <exclam> <r>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <dead_belowdot> <r>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <exclam> <r>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<U0331> <R>	: "Ṟ" U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
-<U0331> <r>	: "ṟ" U1E5F # LATIN SMALL LETTER R WITH LINE BELOW
+<dead_belowmacron> <R>	: "Ṟ" U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
+<dead_belowmacron> <r>	: "ṟ" U1E5F # LATIN SMALL LETTER R WITH LINE BELOW
 <dead_abovedot> <S>	: "Ṡ" U1E60 # LATIN CAPITAL LETTER S WITH DOT ABOVE
 <Multi_key> <period> <S>	: "Ṡ" U1E60 # LATIN CAPITAL LETTER S WITH DOT ABOVE
 <dead_abovedot> <s>	: "ṡ" U1E61 # LATIN SMALL LETTER S WITH DOT ABOVE
@@ -1933,16 +1933,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <exclam> <T>	: "Ṭ" U1E6C # LATIN CAPITAL LETTER T WITH DOT BELOW
 <dead_belowdot> <t>	: "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
 <Multi_key> <exclam> <t>	: "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
-<U0331> <T>	: "Ṯ" U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
-<U0331> <t>	: "ṯ" U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
-<U032d> <T>	: "Ṱ" U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-<U032d> <t>	: "ṱ" U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
-<U0324> <U>	: "Ṳ" U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-<U0324> <u>	: "ṳ" U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
-<U0330> <U>	: "Ṵ" U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
-<U0330> <u>	: "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
-<U032d> <U>	: "Ṷ" U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-<U032d> <u>	: "ṷ" U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
+<dead_belowmacron> <T>	: "Ṯ" U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
+<dead_belowmacron> <t>	: "ṯ" U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
+<dead_belowcircumflex> <T>	: "Ṱ" U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+<dead_belowcircumflex> <t>	: "ṱ" U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
+<dead_belowdiaeresis> <U>	: "Ṳ" U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+<dead_belowdiaeresis> <u>	: "ṳ" U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
+<dead_belowtilde> <U>	: "Ṵ" U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
+<dead_belowtilde> <u>	: "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
+<dead_belowcircumflex> <U>	: "Ṷ" U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+<dead_belowcircumflex> <u>	: "ṷ" U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
 <dead_acute> <Utilde>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <acute> <Utilde>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <Utilde>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
@@ -2027,9 +2027,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <exclam> <Z>	: "Ẓ" U1E92 # LATIN CAPITAL LETTER Z WITH DOT BELOW
 <dead_belowdot> <z>	: "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
 <Multi_key> <exclam> <z>	: "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
-<U0331> <Z>	: "Ẕ" U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
-<U0331> <z>	: "ẕ" U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
-<U0331> <h>	: "ẖ" U1E96 # LATIN SMALL LETTER H WITH LINE BELOW
+<dead_belowmacron> <Z>	: "Ẕ" U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
+<dead_belowmacron> <z>	: "ẕ" U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
+<dead_belowmacron> <h>	: "ẖ" U1E96 # LATIN SMALL LETTER H WITH LINE BELOW
 <dead_diaeresis> <t>	: "ẗ" U1E97 # LATIN SMALL LETTER T WITH DIAERESIS
 <Multi_key> <quotedbl> <t>	: "ẗ" U1E97 # LATIN SMALL LETTER T WITH DIAERESIS
 <dead_abovering> <w>	: "ẘ" U1E98 # LATIN SMALL LETTER W WITH RING ABOVE

commit e2b0bad3d3b9e9ca781fc264eb7584afbe2a1a4f
Author: James Cloos <cloos@jhcloos.com>
Date:   Wed May 13 09:58:59 2009 -0400

    [nls] Remove extraneous instances of UCS Combining Characters in Compose sequences.
    
    This removes those instances of keysyms which match <U03[0-6][0-9A-Fa-f]>,
    where the matching keysym is used as a dead_key, and for which alternative
    compose sequences exist.

diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre
index 8d29684..7769194 100644
--- a/nls/el_GR.UTF-8/Compose.pre
+++ b/nls/el_GR.UTF-8/Compose.pre
@@ -416,695 +416,522 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 
 <Multi_key> <greater> <Greek_alpha>                     : "ἀ"  U1f00
 <dead_horn> <Greek_alpha>                               : "ἀ"  U1f00
-<U0313> <Greek_alpha>                               : "ἀ"  U1f00
 <dead_psili> <Greek_alpha>                               : "ἀ"  U1f00
 <Multi_key> <less> <Greek_alpha>                        : "ἁ"  U1f01
 <dead_ogonek> <Greek_alpha>                             : "ἁ"  U1f01
-<U0314> <Greek_alpha>                             : "ἁ"  U1f01
 <dead_dasia> <Greek_alpha>                             : "ἁ"  U1f01
 <Multi_key> <greater> <grave> <Greek_alpha>             : "ἂ"  U1f02
 <Multi_key> <grave> <greater> <Greek_alpha>             : "ἂ"  U1f02
 <dead_horn> <dead_grave> <Greek_alpha>                  : "ἂ"  U1f02
-<U0313> <dead_grave> <Greek_alpha>                  : "ἂ"  U1f02
 <dead_psili> <dead_grave> <Greek_alpha>                  : "ἂ"  U1f02
 <dead_grave> <dead_horn> <Greek_alpha>                  : "ἂ"  U1f02
-<dead_grave> <U0313> <Greek_alpha>                  : "ἂ"  U1f02
 <dead_grave> <dead_psili> <Greek_alpha>                  : "ἂ"  U1f02
 <Multi_key> <less> <grave> <Greek_alpha>                : "ἃ"  U1f03
 <Multi_key> <grave> <less> <Greek_alpha>                : "ἃ"  U1f03
 <dead_ogonek> <dead_grave> <Greek_alpha>                : "ἃ"  U1f03
-<U0314> <dead_grave> <Greek_alpha>                : "ἃ"  U1f03
 <dead_dasia> <dead_grave> <Greek_alpha>                : "ἃ"  U1f03
 <dead_grave> <dead_ogonek> <Greek_alpha>                : "ἃ"  U1f03
-<dead_grave> <U0314> <Greek_alpha>                : "ἃ"  U1f03
 <dead_grave> <dead_dasia> <Greek_alpha>                : "ἃ"  U1f03
 <Multi_key> <greater> <apostrophe> <Greek_alpha>        : "ἄ"  U1f04
 <Multi_key> <apostrophe> <greater> <Greek_alpha>        : "ἄ"  U1f04
 <dead_horn> <dead_acute> <Greek_alpha>                  : "ἄ"  U1f04
-<U0313> <dead_acute> <Greek_alpha>                  : "ἄ"  U1f04
 <dead_psili> <dead_acute> <Greek_alpha>                  : "ἄ"  U1f04
 <dead_acute> <dead_horn> <Greek_alpha>                  : "ἄ"  U1f04
-<dead_acute> <U0313> <Greek_alpha>                  : "ἄ"  U1f04
 <dead_acute> <dead_psili> <Greek_alpha>                  : "ἄ"  U1f04
 <Multi_key> <less> <apostrophe> <Greek_alpha>           : "ἅ"  U1f05
 <Multi_key> <apostrophe> <less> <Greek_alpha>           : "ἅ"  U1f05
 <dead_ogonek> <dead_acute> <Greek_alpha>                : "ἅ"  U1f05
-<U0314> <dead_acute> <Greek_alpha>                : "ἅ"  U1f05
 <dead_dasia> <dead_acute> <Greek_alpha>                : "ἅ"  U1f05
 <dead_acute> <dead_ogonek> <Greek_alpha>                : "ἅ"  U1f05
-<dead_acute> <U0314> <Greek_alpha>                : "ἅ"  U1f05
 <dead_acute> <dead_dasia> <Greek_alpha>                : "ἅ"  U1f05
 <Multi_key> <greater> <asciitilde> <Greek_alpha>        : "ἆ"  U1f06
 <Multi_key> <asciitilde> <greater> <Greek_alpha>        : "ἆ"  U1f06
 <dead_horn> <dead_tilde> <Greek_alpha>                  : "ἆ"  U1f06
-<U0313> <dead_tilde> <Greek_alpha>                  : "ἆ"  U1f06
 <dead_psili> <dead_tilde> <Greek_alpha>                  : "ἆ"  U1f06
 <dead_tilde> <dead_horn> <Greek_alpha>                  : "ἆ"  U1f06
-<dead_tilde> <U0313> <Greek_alpha>                  : "ἆ"  U1f06
 <dead_tilde> <dead_psili> <Greek_alpha>                  : "ἆ"  U1f06
 <Multi_key> <less> <asciitilde> <Greek_alpha>           : "ἇ"  U1f07
 <Multi_key> <asciitilde> <less> <Greek_alpha>           : "ἇ"  U1f07
 <dead_ogonek> <dead_tilde> <Greek_alpha>                : "ἇ"  U1f07
-<U0314> <dead_tilde> <Greek_alpha>                : "ἇ"  U1f07
 <dead_dasia> <dead_tilde> <Greek_alpha>                : "ἇ"  U1f07
 <dead_tilde> <dead_ogonek> <Greek_alpha>                : "ἇ"  U1f07
-<dead_tilde> <U0314> <Greek_alpha>                : "ἇ"  U1f07
 <dead_tilde> <dead_dasia> <Greek_alpha>                : "ἇ"  U1f07
 <Multi_key> <greater> <Greek_ALPHA>                     : "Ἀ"  U1f08
 <dead_horn> <Greek_ALPHA>                               : "Ἀ"  U1f08
-<U0313> <Greek_ALPHA>                               : "Ἀ"  U1f08
 <dead_psili> <Greek_ALPHA>                               : "Ἀ"  U1f08
 <Multi_key> <less> <Greek_ALPHA>                        : "Ἁ"  U1f09
 <dead_ogonek> <Greek_ALPHA>                             : "Ἁ"  U1f09
-<U0314> <Greek_ALPHA>                             : "Ἁ"  U1f09
 <dead_dasia> <Greek_ALPHA>                             : "Ἁ"  U1f09
 <Multi_key> <greater> <grave> <Greek_ALPHA>             : "Ἂ"  U1f0a
 <Multi_key> <grave> <greater> <Greek_ALPHA>             : "Ἂ"  U1f0a
 <dead_horn> <dead_grave> <Greek_ALPHA>                  : "Ἂ"  U1f0a
-<U0313> <dead_grave> <Greek_ALPHA>                  : "Ἂ"  U1f0a
 <dead_psili> <dead_grave> <Greek_ALPHA>                  : "Ἂ"  U1f0a
 <dead_grave> <dead_horn> <Greek_ALPHA>                  : "Ἂ"  U1f0a
-<dead_grave> <U0313> <Greek_ALPHA>                  : "Ἂ"  U1f0a
 <dead_grave> <dead_psili> <Greek_ALPHA>                  : "Ἂ"  U1f0a
 <Multi_key> <less> <grave> <Greek_ALPHA>                : "Ἃ"  U1f0b
 <Multi_key> <grave> <less> <Greek_ALPHA>                : "Ἃ"  U1f0b
 <dead_ogonek> <dead_grave> <Greek_ALPHA>                : "Ἃ"  U1f0b
-<U0314> <dead_grave> <Greek_ALPHA>                : "Ἃ"  U1f0b
 <dead_dasia> <dead_grave> <Greek_ALPHA>                : "Ἃ"  U1f0b
 <dead_grave> <dead_ogonek> <Greek_ALPHA>                : "Ἃ"  U1f0b
-<dead_grave> <U0314> <Greek_ALPHA>                : "Ἃ"  U1f0b
 <dead_grave> <dead_dasia> <Greek_ALPHA>                : "Ἃ"  U1f0b
 <Multi_key> <greater> <apostrophe> <Greek_ALPHA>        : "Ἄ"  U1f0c
 <Multi_key> <apostrophe> <greater> <Greek_ALPHA>        : "Ἄ"  U1f0c
 <dead_horn> <dead_acute> <Greek_ALPHA>                  : "Ἄ"  U1f0c
-<U0313> <dead_acute> <Greek_ALPHA>                  : "Ἄ"  U1f0c
 <dead_psili> <dead_acute> <Greek_ALPHA>                  : "Ἄ"  U1f0c
 <dead_acute> <dead_horn> <Greek_ALPHA>                  : "Ἄ"  U1f0c
-<dead_acute> <U0313> <Greek_ALPHA>                  : "Ἄ"  U1f0c
 <dead_acute> <dead_psili> <Greek_ALPHA>                  : "Ἄ"  U1f0c
 <Multi_key> <less> <apostrophe> <Greek_ALPHA>           : "Ἅ"  U1f0d
 <Multi_key> <apostrophe> <less> <Greek_ALPHA>           : "Ἅ"  U1f0d
 <dead_ogonek> <dead_acute> <Greek_ALPHA>                : "Ἅ"  U1f0d
-<U0314> <dead_acute> <Greek_ALPHA>                : "Ἅ"  U1f0d
 <dead_dasia> <dead_acute> <Greek_ALPHA>                : "Ἅ"  U1f0d
 <dead_acute> <dead_ogonek> <Greek_ALPHA>                : "Ἅ"  U1f0d
-<dead_acute> <U0314> <Greek_ALPHA>                : "Ἅ"  U1f0d
 <dead_acute> <dead_dasia> <Greek_ALPHA>                : "Ἅ"  U1f0d
 <Multi_key> <greater> <asciitilde> <Greek_ALPHA>        : "Ἆ"  U1f0e
 <Multi_key> <asciitilde> <greater> <Greek_ALPHA>        : "Ἆ"  U1f0e
 <dead_horn> <dead_tilde> <Greek_ALPHA>                  : "Ἆ"  U1f0e
-<U0313> <dead_tilde> <Greek_ALPHA>                  : "Ἆ"  U1f0e
 <dead_psili> <dead_tilde> <Greek_ALPHA>                  : "Ἆ"  U1f0e
 <dead_tilde> <dead_horn> <Greek_ALPHA>                  : "Ἆ"  U1f0e
-<dead_tilde> <U0313> <Greek_ALPHA>                  : "Ἆ"  U1f0e
 <dead_tilde> <dead_psili> <Greek_ALPHA>                  : "Ἆ"  U1f0e
 <Multi_key> <less> <asciitilde> <Greek_ALPHA>           : "Ἇ"  U1f0f
 <Multi_key> <asciitilde> <less> <Greek_ALPHA>           : "Ἇ"  U1f0f
 <dead_ogonek> <dead_tilde> <Greek_ALPHA>                : "Ἇ"  U1f0f
-<U0314> <dead_tilde> <Greek_ALPHA>                : "Ἇ"  U1f0f
 <dead_dasia> <dead_tilde> <Greek_ALPHA>                : "Ἇ"  U1f0f
 <dead_tilde> <dead_ogonek> <Greek_ALPHA>                : "Ἇ"  U1f0f
-<dead_tilde> <U0314> <Greek_ALPHA>                : "Ἇ"  U1f0f
 <dead_tilde> <dead_dasia> <Greek_ALPHA>                : "Ἇ"  U1f0f
 <Multi_key> <greater> <Greek_epsilon>                   : "ἐ"  U1f10
 <dead_horn> <Greek_epsilon>                             : "ἐ"  U1f10
-<U0313> <Greek_epsilon>                             : "ἐ"  U1f10
 <dead_psili> <Greek_epsilon>                             : "ἐ"  U1f10
 <Multi_key> <less> <Greek_epsilon>                      : "ἑ"  U1f11
 <dead_ogonek> <Greek_epsilon>                           : "ἑ"  U1f11
-<U0314> <Greek_epsilon>                           : "ἑ"  U1f11
 <dead_dasia> <Greek_epsilon>                           : "ἑ"  U1f11
 <Multi_key> <greater> <grave> <Greek_epsilon>           : "ἒ"  U1f12
 <Multi_key> <grave> <greater> <Greek_epsilon>           : "ἒ"  U1f12
 <dead_horn> <dead_grave> <Greek_epsilon>                : "ἒ"  U1f12
-<U0313> <dead_grave> <Greek_epsilon>                : "ἒ"  U1f12
 <dead_psili> <dead_grave> <Greek_epsilon>                : "ἒ"  U1f12
 <dead_grave> <dead_horn> <Greek_epsilon>                : "ἒ"  U1f12
-<dead_grave> <U0313> <Greek_epsilon>                : "ἒ"  U1f12
 <dead_grave> <dead_psili> <Greek_epsilon>                : "ἒ"  U1f12
 <Multi_key> <less> <grave> <Greek_epsilon>              : "ἓ"  U1f13
 <Multi_key> <grave> <less> <Greek_epsilon>              : "ἓ"  U1f13
 <dead_ogonek> <dead_grave> <Greek_epsilon>              : "ἓ"  U1f13
-<U0314> <dead_grave> <Greek_epsilon>              : "ἓ"  U1f13
 <dead_dasia> <dead_grave> <Greek_epsilon>              : "ἓ"  U1f13
 <dead_grave> <dead_ogonek> <Greek_epsilon>              : "ἓ"  U1f13
-<dead_grave> <U0314> <Greek_epsilon>              : "ἓ"  U1f13
 <dead_grave> <dead_dasia> <Greek_epsilon>              : "ἓ"  U1f13
 <Multi_key> <greater> <apostrophe> <Greek_epsilon>      : "ἔ"  U1f14
 <Multi_key> <apostrophe> <greater> <Greek_epsilon>      : "ἔ"  U1f14
 <dead_horn> <dead_acute> <Greek_epsilon>                : "ἔ"  U1f14
-<U0313> <dead_acute> <Greek_epsilon>                : "ἔ"  U1f14
 <dead_psili> <dead_acute> <Greek_epsilon>                : "ἔ"  U1f14
 <dead_acute> <dead_horn> <Greek_epsilon>                : "ἔ"  U1f14
-<dead_acute> <U0313> <Greek_epsilon>                : "ἔ"  U1f14
 <dead_acute> <dead_psili> <Greek_epsilon>                : "ἔ"  U1f14
 <Multi_key> <less> <apostrophe> <Greek_epsilon>         : "ἕ"  U1f15
 <Multi_key> <apostrophe> <less> <Greek_epsilon>         : "ἕ"  U1f15
 <dead_ogonek> <dead_acute> <Greek_epsilon>              : "ἕ"  U1f15
-<U0314> <dead_acute> <Greek_epsilon>              : "ἕ"  U1f15
 <dead_dasia> <dead_acute> <Greek_epsilon>              : "ἕ"  U1f15
 <dead_acute> <dead_ogonek> <Greek_epsilon>              : "ἕ"  U1f15
-<dead_acute> <U0314> <Greek_epsilon>              : "ἕ"  U1f15
 <dead_acute> <dead_dasia> <Greek_epsilon>              : "ἕ"  U1f15
 <Multi_key> <greater> <Greek_EPSILON>                   : "Ἐ"  U1f18
 <dead_horn> <Greek_EPSILON>                             : "Ἐ"  U1f18
-<U0313> <Greek_EPSILON>                             : "Ἐ"  U1f18
 <dead_psili> <Greek_EPSILON>                             : "Ἐ"  U1f18
 <Multi_key> <less> <Greek_EPSILON>                      : "Ἑ"  U1f19
 <dead_ogonek> <Greek_EPSILON>                           : "Ἑ"  U1f19
-<U0314> <Greek_EPSILON>                           : "Ἑ"  U1f19
 <dead_dasia> <Greek_EPSILON>                           : "Ἑ"  U1f19
 <Multi_key> <greater> <grave> <Greek_EPSILON>           : "Ἒ"  U1f1a
 <Multi_key> <grave> <greater> <Greek_EPSILON>           : "Ἒ"  U1f1a
 <dead_horn> <dead_grave> <Greek_EPSILON>                : "Ἒ"  U1f1a
-<U0313> <dead_grave> <Greek_EPSILON>                : "Ἒ"  U1f1a
 <dead_psili> <dead_grave> <Greek_EPSILON>                : "Ἒ"  U1f1a
 <dead_grave> <dead_horn> <Greek_EPSILON>                : "Ἒ"  U1f1a
-<dead_grave> <U0313> <Greek_EPSILON>                : "Ἒ"  U1f1a
 <dead_grave> <dead_psili> <Greek_EPSILON>                : "Ἒ"  U1f1a
 <Multi_key> <less> <grave> <Greek_EPSILON>              : "Ἓ"  U1f1b
 <Multi_key> <grave> <less> <Greek_EPSILON>              : "Ἓ"  U1f1b
 <dead_ogonek> <dead_grave> <Greek_EPSILON>              : "Ἓ"  U1f1b
-<U0314> <dead_grave> <Greek_EPSILON>              : "Ἓ"  U1f1b
 <dead_dasia> <dead_grave> <Greek_EPSILON>              : "Ἓ"  U1f1b
 <dead_grave> <dead_ogonek> <Greek_EPSILON>              : "Ἓ"  U1f1b
-<dead_grave> <U0314> <Greek_EPSILON>              : "Ἓ"  U1f1b
 <dead_grave> <dead_dasia> <Greek_EPSILON>              : "Ἓ"  U1f1b
 <Multi_key> <greater> <apostrophe> <Greek_EPSILON>      : "Ἔ"  U1f1c
 <Multi_key> <apostrophe> <greater> <Greek_EPSILON>      : "Ἔ"  U1f1c
 <dead_horn> <dead_acute> <Greek_EPSILON>                : "Ἔ"  U1f1c
-<U0313> <dead_acute> <Greek_EPSILON>                : "Ἔ"  U1f1c
 <dead_psili> <dead_acute> <Greek_EPSILON>                : "Ἔ"  U1f1c
 <dead_acute> <dead_horn> <Greek_EPSILON>                : "Ἔ"  U1f1c
-<dead_acute> <U0313> <Greek_EPSILON>                : "Ἔ"  U1f1c
 <dead_acute> <dead_psili> <Greek_EPSILON>                : "Ἔ"  U1f1c
 <Multi_key> <less> <apostrophe> <Greek_EPSILON>         : "Ἕ"  U1f1d
 <Multi_key> <apostrophe> <less> <Greek_EPSILON>         : "Ἕ"  U1f1d
 <dead_ogonek> <dead_acute> <Greek_EPSILON>              : "Ἕ"  U1f1d
-<U0314> <dead_acute> <Greek_EPSILON>              : "Ἕ"  U1f1d
 <dead_dasia> <dead_acute> <Greek_EPSILON>              : "Ἕ"  U1f1d
 <dead_acute> <dead_ogonek> <Greek_EPSILON>              : "Ἕ"  U1f1d
-<dead_acute> <U0314> <Greek_EPSILON>              : "Ἕ"  U1f1d
 <dead_acute> <dead_dasia> <Greek_EPSILON>              : "Ἕ"  U1f1d
 <Multi_key> <greater> <Greek_eta>                       : "ἠ"  U1f20
 <dead_horn> <Greek_eta>                                 : "ἠ"  U1f20
-<U0313> <Greek_eta>                                 : "ἠ"  U1f20
 <dead_psili> <Greek_eta>                                 : "ἠ"  U1f20
 <Multi_key> <less> <Greek_eta>                          : "ἡ"  U1f21
 <dead_ogonek> <Greek_eta>                               : "ἡ"  U1f21
-<U0314> <Greek_eta>                               : "ἡ"  U1f21
 <dead_dasia> <Greek_eta>                               : "ἡ"  U1f21
 <Multi_key> <greater> <grave> <Greek_eta>               : "ἢ"  U1f22
 <Multi_key> <grave> <greater> <Greek_eta>               : "ἢ"  U1f22
 <dead_horn> <dead_grave> <Greek_eta>                    : "ἢ"  U1f22
-<U0313> <dead_grave> <Greek_eta>                    : "ἢ"  U1f22
 <dead_psili> <dead_grave> <Greek_eta>                    : "ἢ"  U1f22
 <dead_grave> <dead_horn> <Greek_eta>                    : "ἢ"  U1f22
-<dead_grave> <U0313> <Greek_eta>                    : "ἢ"  U1f22
 <dead_grave> <dead_psili> <Greek_eta>                    : "ἢ"  U1f22
 <Multi_key> <less> <grave> <Greek_eta>                  : "ἣ"  U1f23
 <Multi_key> <grave> <less> <Greek_eta>                  : "ἣ"  U1f23
 <dead_ogonek> <dead_grave> <Greek_eta>                  : "ἣ"  U1f23
-<U0314> <dead_grave> <Greek_eta>                  : "ἣ"  U1f23
 <dead_dasia> <dead_grave> <Greek_eta>                  : "ἣ"  U1f23
 <dead_grave> <dead_ogonek> <Greek_eta>                  : "ἣ"  U1f23
-<dead_grave> <U0314> <Greek_eta>                  : "ἣ"  U1f23
 <dead_grave> <dead_dasia> <Greek_eta>                  : "ἣ"  U1f23
 <Multi_key> <greater> <apostrophe> <Greek_eta>          : "ἤ"  U1f24
 <Multi_key> <apostrophe> <greater> <Greek_eta>          : "ἤ"  U1f24
 <dead_horn> <dead_acute> <Greek_eta>                    : "ἤ"  U1f24
-<U0313> <dead_acute> <Greek_eta>                    : "ἤ"  U1f24
 <dead_psili> <dead_acute> <Greek_eta>                    : "ἤ"  U1f24
 <dead_acute> <dead_horn> <Greek_eta>                    : "ἤ"  U1f24
-<dead_acute> <U0313> <Greek_eta>                    : "ἤ"  U1f24
 <dead_acute> <dead_psili> <Greek_eta>                    : "ἤ"  U1f24
 <Multi_key> <less> <apostrophe> <Greek_eta>             : "ἥ"  U1f25
 <Multi_key> <apostrophe> <less> <Greek_eta>             : "ἥ"  U1f25
 <dead_ogonek> <dead_acute> <Greek_eta>                  : "ἥ"  U1f25
-<U0314> <dead_acute> <Greek_eta>                  : "ἥ"  U1f25
 <dead_dasia> <dead_acute> <Greek_eta>                  : "ἥ"  U1f25
 <dead_acute> <dead_ogonek> <Greek_eta>                  : "ἥ"  U1f25
-<dead_acute> <U0314> <Greek_eta>                  : "ἥ"  U1f25


Reply to: