Added libX11-1.2.2.tar.gz.

70 files changed, 6786 insertions, 6551 deletions

diff --git a/libX11/nls/C/Makefile.in b/libX11/nls/C/Makefile.in
index 45d138693..cec6e07b6 100644
--- a/libX11/nls/C/Makefile.in
+++ b/libX11/nls/C/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/C
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/C/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/C/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/C/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/C/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index dcd7b9802..d6ec4e142 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -16,6 +16,7 @@ SUBDIRS= \
 	C			\
 	el_GR.UTF-8		\
 	en_US.UTF-8		\
+	fi_FI.UTF-8		\
 	georgian-academy	\
 	georgian-ps		\
 	ibm-cp1133		\
@@ -53,6 +54,7 @@ SUBDIRS= \
 	mulelao-1		\
 	nokhchi-1		\
 	pt_BR.UTF-8		\
+	ru_RU.UTF-8		\
 	tatar-cyr		\
 	th_TH			\
 	th_TH.UTF-8		\
diff --git a/libX11/nls/Makefile.in b/libX11/nls/Makefile.in
index b13e282fc..395bcb21c 100644
--- a/libX11/nls/Makefile.in
+++ b/libX11/nls/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,6 +50,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -62,16 +65,58 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11localedir)"
-x11localeDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(x11locale_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@@ -87,27 +132,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -119,6 +163,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -128,7 +173,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -136,8 +184,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -177,17 +229,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -202,6 +251,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -218,6 +268,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -230,6 +281,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11localedir = $(X11_LOCALEDATADIR)
@@ -247,6 +299,7 @@ SUBDIRS = \
 	C			\
 	el_GR.UTF-8		\
 	en_US.UTF-8		\
+	fi_FI.UTF-8		\
 	georgian-academy	\
 	georgian-ps		\
 	ibm-cp1133		\
@@ -284,6 +337,7 @@ SUBDIRS = \
 	mulelao-1		\
 	nokhchi-1		\
 	pt_BR.UTF-8		\
+	ru_RU.UTF-8		\
 	tatar-cyr		\
 	th_TH			\
 	th_TH.UTF-8		\
@@ -316,6 +370,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 all: all-recursive
@@ -326,14 +381,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -351,6 +406,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -360,20 +416,23 @@ clean-libtool:
 install-x11localeDATA: $(x11locale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11localedir)" || $(MKDIR_P) "$(DESTDIR)$(x11localedir)"
-	@list='$(x11locale_DATA)'; for p in $$list; do \
+	@list='$(x11locale_DATA)'; test -n "$(x11localedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11localeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11localedir)/$$f'"; \
-	  $(x11localeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11localedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11localedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11localedir)" || exit $$?; \
 	done
 
 uninstall-x11localeDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11locale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11localedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11localedir)/$$f"; \
-	done
+	@list='$(x11locale_DATA)'; test -n "$(x11localedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11localedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11localedir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -399,7 +458,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -433,16 +492,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -450,14 +509,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -469,7 +528,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -478,29 +537,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -521,29 +585,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -577,6 +656,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -595,6 +675,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -603,18 +685,28 @@ install-data-am: install-x11localeDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -635,8 +727,8 @@ ps-am:
 
 uninstall-am: uninstall-x11localeDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -654,9 +746,8 @@ uninstall-am: uninstall-x11localeDATA
 	uninstall-x11localeDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 locale.alias: locale.alias.pre
 	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
@@ -675,6 +766,7 @@ locale.dir: locale.dir.pre
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
         < locale.dir.l1 > locale.dir.l2
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/am_ET.UTF-8/Compose.pre b/libX11/nls/am_ET.UTF-8/Compose.pre
index e797db17f..760d94629 100644
--- a/libX11/nls/am_ET.UTF-8/Compose.pre
+++ b/libX11/nls/am_ET.UTF-8/Compose.pre
@@ -12,333 +12,333 @@ XCOMM Group I
 XCOMM
 
 XCOMM Modifier: /u/
-<u> <U1200> : "ሁ" <U1201> # key h (base character ሀ)
-<u> <U1208> : "ሉ" <U1209> # key l (base character ለ)
-<u> <U1218> : "ሙ" <U1219> # key m (base character መ)
-<u> <U1228> : "ሩ" <U1229> # key r (base character ረ)
-<u> <U1230> : "ሱ" <U1231> # key s (base character ሰ)
-<u> <U1240> : "ቁ" <U1241> # key q (base character ቀ)
-<u> <U1260> : "ቡ" <U1261> # key b (base character በ)
-<u> <U1270> : "ቱ" <U1271> # key t (base character ተ)
-<u> <U1290> : "ኑ" <U1291> # key n (base character ነ)
-<u> <U12A0> : "ኡ" <U12A1> # key x (base character አ)
-<u> <U12A8> : "ኩ" <U12A9> # key k (base character ከ)
-<u> <U12C8> : "ዉ" <U12C9> # key w (base character ወ)
-<u> <U12D8> : "ዙ" <U12D9> # key z (base character ዘ)
-<u> <U12E8> : "ዩ" <U12E9> # key y (base character የ)
-<u> <U12F0> : "ዱ" <U12F1> # key d (base character ደ)
-<u> <U1300> : "ጁ" <U1301> # key j (base character ጀ)
-<u> <U1308> : "ጉ" <U1309> # key g (base character ገ)
-<u> <U1340> : "ፁ" <U1341> # key [ (base character ፀ)
-<u> <U1348> : "ፉ" <U1349> # key f (base character ፈ)
-<u> <U1350> : "ፑ" <U1351> # key p (base character ፐ)
-<u> <U1238> : "ሹ" <U1239> # key v (base character ሸ)
-<u> <U1328> : "ጩ" <U1329> # key ] (base character ጨ)
+<u> <U1200> : "ሁ" U1201 # key h (base character ሀ)
+<u> <U1208> : "ሉ" U1209 # key l (base character ለ)
+<u> <U1218> : "ሙ" U1219 # key m (base character መ)
+<u> <U1228> : "ሩ" U1229 # key r (base character ረ)
+<u> <U1230> : "ሱ" U1231 # key s (base character ሰ)
+<u> <U1240> : "ቁ" U1241 # key q (base character ቀ)
+<u> <U1260> : "ቡ" U1261 # key b (base character በ)
+<u> <U1270> : "ቱ" U1271 # key t (base character ተ)
+<u> <U1290> : "ኑ" U1291 # key n (base character ነ)
+<u> <U12A0> : "ኡ" U12A1 # key x (base character አ)
+<u> <U12A8> : "ኩ" U12A9 # key k (base character ከ)
+<u> <U12C8> : "ዉ" U12C9 # key w (base character ወ)
+<u> <U12D8> : "ዙ" U12D9 # key z (base character ዘ)
+<u> <U12E8> : "ዩ" U12E9 # key y (base character የ)
+<u> <U12F0> : "ዱ" U12F1 # key d (base character ደ)
+<u> <U1300> : "ጁ" U1301 # key j (base character ጀ)
+<u> <U1308> : "ጉ" U1309 # key g (base character ገ)
+<u> <U1340> : "ፁ" U1341 # key [ (base character ፀ)
+<u> <U1348> : "ፉ" U1349 # key f (base character ፈ)
+<u> <U1350> : "ፑ" U1351 # key p (base character ፐ)
+<u> <U1238> : "ሹ" U1239 # key v (base character ሸ)
+<u> <U1328> : "ጩ" U1329 # key ] (base character ጨ)
 
 XCOMM Modifier: /i/
-<i> <U1200> : "ሂ" <U1202> # key h (base character ሀ)
-<i> <U1208> : "ሊ" <U120A> # key l (base character ለ)
-<i> <U1218> : "ሚ" <U121A> # key m (base character መ)
-<i> <U1228> : "ሪ" <U122A> # key r (base character ረ)
-<i> <U1230> : "ሲ" <U1232> # key s (base character ሰ)
-<i> <U1240> : "ቂ" <U1242> # key q (base character ቀ)
-<i> <U1260> : "ቢ" <U1262> # key b (base character በ)
-<i> <U1270> : "ቲ" <U1272> # key t (base character ተ)
-<i> <U1290> : "ኒ" <U1292> # key n (base character ነ)
-<i> <U12A0> : "ኢ" <U12A2> # key x (base character አ)
-<i> <U12A8> : "ኪ" <U12AA> # key k (base character ከ)
-<i> <U12C8> : "ዊ" <U12CA> # key w (base character ወ)
-<i> <U12D8> : "ዚ" <U12DA> # key z (base character ዘ)
-<i> <U12E8> : "ዪ" <U12EA> # key y (base character የ)
-<i> <U12F0> : "ዲ" <U12F2> # key d (base character ደ)
-<i> <U1300> : "ጂ" <U1302> # key j (base character ጀ)
-<i> <U1308> : "ጊ" <U130A> # key g (base character ገ)
-<i> <U1340> : "ፂ" <U1342> # key [ (base character ፀ)
-<i> <U1348> : "ፊ" <U134A> # key f (base character ፈ)
-<i> <U1350> : "ፒ" <U1352> # key p (base character ፐ)
-<i> <U1238> : "ሺ" <U123A> # key v (base character ሸ)
-<i> <U1328> : "ጪ" <U132A> # key ] (base character ጨ)
+<i> <U1200> : "ሂ" U1202 # key h (base character ሀ)
+<i> <U1208> : "ሊ" U120A # key l (base character ለ)
+<i> <U1218> : "ሚ" U121A # key m (base character መ)
+<i> <U1228> : "ሪ" U122A # key r (base character ረ)
+<i> <U1230> : "ሲ" U1232 # key s (base character ሰ)
+<i> <U1240> : "ቂ" U1242 # key q (base character ቀ)
+<i> <U1260> : "ቢ" U1262 # key b (base character በ)
+<i> <U1270> : "ቲ" U1272 # key t (base character ተ)
+<i> <U1290> : "ኒ" U1292 # key n (base character ነ)
+<i> <U12A0> : "ኢ" U12A2 # key x (base character አ)
+<i> <U12A8> : "ኪ" U12AA # key k (base character ከ)
+<i> <U12C8> : "ዊ" U12CA # key w (base character ወ)
+<i> <U12D8> : "ዚ" U12DA # key z (base character ዘ)
+<i> <U12E8> : "ዪ" U12EA # key y (base character የ)
+<i> <U12F0> : "ዲ" U12F2 # key d (base character ደ)
+<i> <U1300> : "ጂ" U1302 # key j (base character ጀ)
+<i> <U1308> : "ጊ" U130A # key g (base character ገ)
+<i> <U1340> : "ፂ" U1342 # key [ (base character ፀ)
+<i> <U1348> : "ፊ" U134A # key f (base character ፈ)
+<i> <U1350> : "ፒ" U1352 # key p (base character ፐ)
+<i> <U1238> : "ሺ" U123A # key v (base character ሸ)
+<i> <U1328> : "ጪ" U132A # key ] (base character ጨ)
 
 XCOMM Modifier: /a/
-<a> <U1200> : "ሃ" <U1203> # key h (base character ሀ)
-<a> <U1208> : "ላ" <U120B> # key l (base character ለ)
-<a> <U1218> : "ማ" <U121B> # key m (base character መ)
-<a> <U1228> : "ራ" <U122B> # key r (base character ረ)
-<a> <U1230> : "ሳ" <U1233> # key s (base character ሰ)
-<a> <U1240> : "ቃ" <U1243> # key q (base character ቀ)
-<a> <U1260> : "ባ" <U1263> # key b (base character በ)
-<a> <U1270> : "ታ" <U1273> # key t (base character ተ)
-<a> <U1290> : "ና" <U1293> # key n (base character ነ)
-<a> <U12A0> : "ኣ" <U12A3> # key x (base character አ)
-<a> <U12A8> : "ካ" <U12AB> # key k (base character ከ)
-<a> <U12C8> : "ዋ" <U12CB> # key w (base character ወ)
-<a> <U12D8> : "ዛ" <U12DB> # key z (base character ዘ)
-<a> <U12E8> : "ያ" <U12EB> # key y (base character የ)
-<a> <U12F0> : "ዳ" <U12F3> # key d (base character ደ)
-<a> <U1300> : "ጃ" <U1303> # key j (base character ጀ)
-<a> <U1308> : "ጋ" <U130B> # key g (base character ገ)
-<a> <U1340> : "ፃ" <U1343> # key [ (base character ፀ)
-<a> <U1348> : "ፋ" <U134B> # key f (base character ፈ)
-<a> <U1350> : "ፓ" <U1353> # key p (base character ፐ)
-<a> <U1238> : "ሻ" <U123B> # key v (base character ሸ)
-<a> <U1328> : "ጫ" <U132B> # key ] (base character ጨ)
+<a> <U1200> : "ሃ" U1203 # key h (base character ሀ)
+<a> <U1208> : "ላ" U120B # key l (base character ለ)
+<a> <U1218> : "ማ" U121B # key m (base character መ)
+<a> <U1228> : "ራ" U122B # key r (base character ረ)
+<a> <U1230> : "ሳ" U1233 # key s (base character ሰ)
+<a> <U1240> : "ቃ" U1243 # key q (base character ቀ)
+<a> <U1260> : "ባ" U1263 # key b (base character በ)
+<a> <U1270> : "ታ" U1273 # key t (base character ተ)
+<a> <U1290> : "ና" U1293 # key n (base character ነ)
+<a> <U12A0> : "ኣ" U12A3 # key x (base character አ)
+<a> <U12A8> : "ካ" U12AB # key k (base character ከ)
+<a> <U12C8> : "ዋ" U12CB # key w (base character ወ)
+<a> <U12D8> : "ዛ" U12DB # key z (base character ዘ)
+<a> <U12E8> : "ያ" U12EB # key y (base character የ)
+<a> <U12F0> : "ዳ" U12F3 # key d (base character ደ)
+<a> <U1300> : "ጃ" U1303 # key j (base character ጀ)
+<a> <U1308> : "ጋ" U130B # key g (base character ገ)
+<a> <U1340> : "ፃ" U1343 # key [ (base character ፀ)
+<a> <U1348> : "ፋ" U134B # key f (base character ፈ)
+<a> <U1350> : "ፓ" U1353 # key p (base character ፐ)
+<a> <U1238> : "ሻ" U123B # key v (base character ሸ)
+<a> <U1328> : "ጫ" U132B # key ] (base character ጨ)
 
 XCOMM Modifier: /e/
-<e> <U1200> : "ሄ" <U1204> # key h (base character ሀ)
-<e> <U1208> : "ሌ" <U120C> # key l (base character ለ)
-<e> <U1218> : "ሜ" <U121C> # key m (base character መ)
-<e> <U1228> : "ሬ" <U122C> # key r (base character ረ)
-<e> <U1230> : "ሴ" <U1234> # key s (base character ሰ)
-<e> <U1240> : "ቄ" <U1244> # key q (base character ቀ)
-<e> <U1260> : "ቤ" <U1264> # key b (base character በ)
-<e> <U1270> : "ቴ" <U1274> # key t (base character ተ)
-<e> <U1290> : "ኔ" <U1294> # key n (base character ነ)
-<e> <U12A0> : "ኤ" <U12A4> # key x (base character አ)
-<e> <U12A8> : "ኬ" <U12AC> # key k (base character ከ)
-<e> <U12C8> : "ዌ" <U12CC> # key w (base character ወ)
-<e> <U12D8> : "ዜ" <U12DC> # key z (base character ዘ)
-<e> <U12E8> : "ዬ" <U12EC> # key y (base character የ)
-<e> <U12F0> : "ዴ" <U12F4> # key d (base character ደ)
-<e> <U1300> : "ጄ" <U1304> # key j (base character ጀ)
-<e> <U1308> : "ጌ" <U130C> # key g (base character ገ)
-<e> <U1340> : "ፄ" <U1344> # key [ (base character ፀ)
-<e> <U1348> : "ፌ" <U134C> # key f (base character ፈ)
-<e> <U1350> : "ፔ" <U1354> # key p (base character ፐ)
-<e> <U1238> : "ሼ" <U123C> # key v (base character ሸ)
-<e> <U1328> : "ጬ" <U132C> # key ] (base character ጨ)
+<e> <U1200> : "ሄ" U1204 # key h (base character ሀ)
+<e> <U1208> : "ሌ" U120C # key l (base character ለ)
+<e> <U1218> : "ሜ" U121C # key m (base character መ)
+<e> <U1228> : "ሬ" U122C # key r (base character ረ)
+<e> <U1230> : "ሴ" U1234 # key s (base character ሰ)
+<e> <U1240> : "ቄ" U1244 # key q (base character ቀ)
+<e> <U1260> : "ቤ" U1264 # key b (base character በ)
+<e> <U1270> : "ቴ" U1274 # key t (base character ተ)
+<e> <U1290> : "ኔ" U1294 # key n (base character ነ)
+<e> <U12A0> : "ኤ" U12A4 # key x (base character አ)
+<e> <U12A8> : "ኬ" U12AC # key k (base character ከ)
+<e> <U12C8> : "ዌ" U12CC # key w (base character ወ)
+<e> <U12D8> : "ዜ" U12DC # key z (base character ዘ)
+<e> <U12E8> : "ዬ" U12EC # key y (base character የ)
+<e> <U12F0> : "ዴ" U12F4 # key d (base character ደ)
+<e> <U1300> : "ጄ" U1304 # key j (base character ጀ)
+<e> <U1308> : "ጌ" U130C # key g (base character ገ)
+<e> <U1340> : "ፄ" U1344 # key [ (base character ፀ)
+<e> <U1348> : "ፌ" U134C # key f (base character ፈ)
+<e> <U1350> : "ፔ" U1354 # key p (base character ፐ)
+<e> <U1238> : "ሼ" U123C # key v (base character ሸ)
+<e> <U1328> : "ጬ" U132C # key ] (base character ጨ)
 
 XCOMM Modifier: /c/
-<c> <U1200> : "ህ" <U1205> # key h (base character ሀ)
-<c> <U1208> : "ል" <U120D> # key l (base character ለ)
-<c> <U1218> : "ም" <U121D> # key m (base character መ)
-<c> <U1228> : "ር" <U122D> # key r (base character ረ)
-<c> <U1230> : "ስ" <U1235> # key s (base character ሰ)
-<c> <U1240> : "ቅ" <U1245> # key q (base character ቀ)
-<c> <U1260> : "ብ" <U1265> # key b (base character በ)
-<c> <U1270> : "ት" <U1275> # key t (base character ተ)
-<c> <U1290> : "ን" <U1295> # key n (base character ነ)
-<c> <U12A0> : "እ" <U12A5> # key x (base character አ)
-<c> <U12A8> : "ክ" <U12AD> # key k (base character ከ)
-<c> <U12C8> : "ው" <U12CD> # key w (base character ወ)
-<c> <U12D8> : "ዝ" <U12DD> # key z (base character ዘ)
-<c> <U12E8> : "ይ" <U12ED> # key y (base character የ)
-<c> <U12F0> : "ድ" <U12F5> # key d (base character ደ)
-<c> <U1300> : "ጅ" <U1305> # key j (base character ጀ)
-<c> <U1308> : "ግ" <U130D> # key g (base character ገ)
-<c> <U1340> : "ፅ" <U1345> # key [ (base character ፀ)
-<c> <U1348> : "ፍ" <U134D> # key f (base character ፈ)
-<c> <U1350> : "ፕ" <U1355> # key p (base character ፐ)
-<c> <U1238> : "ሽ" <U123D> # key v (base character ሸ)
-<c> <U1328> : "ጭ" <U132D> # key ] (base character ጨ)
+<c> <U1200> : "ህ" U1205 # key h (base character ሀ)
+<c> <U1208> : "ል" U120D # key l (base character ለ)
+<c> <U1218> : "ም" U121D # key m (base character መ)
+<c> <U1228> : "ር" U122D # key r (base character ረ)
+<c> <U1230> : "ስ" U1235 # key s (base character ሰ)
+<c> <U1240> : "ቅ" U1245 # key q (base character ቀ)
+<c> <U1260> : "ብ" U1265 # key b (base character በ)
+<c> <U1270> : "ት" U1275 # key t (base character ተ)
+<c> <U1290> : "ን" U1295 # key n (base character ነ)
+<c> <U12A0> : "እ" U12A5 # key x (base character አ)
+<c> <U12A8> : "ክ" U12AD # key k (base character ከ)
+<c> <U12C8> : "ው" U12CD # key w (base character ወ)
+<c> <U12D8> : "ዝ" U12DD # key z (base character ዘ)
+<c> <U12E8> : "ይ" U12ED # key y (base character የ)
+<c> <U12F0> : "ድ" U12F5 # key d (base character ደ)
+<c> <U1300> : "ጅ" U1305 # key j (base character ጀ)
+<c> <U1308> : "ግ" U130D # key g (base character ገ)
+<c> <U1340> : "ፅ" U1345 # key [ (base character ፀ)
+<c> <U1348> : "ፍ" U134D # key f (base character ፈ)
+<c> <U1350> : "ፕ" U1355 # key p (base character ፐ)
+<c> <U1238> : "ሽ" U123D # key v (base character ሸ)
+<c> <U1328> : "ጭ" U132D # key ] (base character ጨ)
 
 XCOMM Modifier: /o/
-<o> <U1200> : "ሆ" <U1206> # key h (base character ሀ)
-<o> <U1208> : "ሎ" <U120E> # key l (base character ለ)
-<o> <U1218> : "ሞ" <U121E> # key m (base character መ)
-<o> <U1228> : "ሮ" <U122E> # key r (base character ረ)
-<o> <U1230> : "ሶ" <U1236> # key s (base character ሰ)
-<o> <U1240> : "ቆ" <U1246> # key q (base character ቀ)
-<o> <U1260> : "ቦ" <U1266> # key b (base character በ)
-<o> <U1270> : "ቶ" <U1276> # key t (base character ተ)
-<o> <U1290> : "ኖ" <U1296> # key n (base character ነ)
-<o> <U12A0> : "ኦ" <U12A6> # key x (base character አ)
-<o> <U12A8> : "ኮ" <U12AE> # key k (base character ከ)
-<o> <U12C8> : "ዎ" <U12CE> # key w (base character ወ)
-<o> <U12D8> : "ዞ" <U12DE> # key z (base character ዘ)
-<o> <U12E8> : "ዮ" <U12EE> # key y (base character የ)
-<o> <U12F0> : "ዶ" <U12F6> # key d (base character ደ)
-<o> <U1300> : "ጆ" <U1306> # key j (base character ጀ)
-<o> <U1308> : "ጎ" <U130E> # key g (base character ገ)
-<o> <U1340> : "ፆ" <U1346> # key [ (base character ፀ)
-<o> <U1348> : "ፎ" <U134E> # key f (base character ፈ)
-<o> <U1350> : "ፖ" <U1356> # key p (base character ፐ)
-<o> <U1238> : "ሾ" <U123E> # key v (base character ሸ)
-<o> <U1328> : "ጮ" <U132E> # key ] (base character ጨ)
+<o> <U1200> : "ሆ" U1206 # key h (base character ሀ)
+<o> <U1208> : "ሎ" U120E # key l (base character ለ)
+<o> <U1218> : "ሞ" U121E # key m (base character መ)
+<o> <U1228> : "ሮ" U122E # key r (base character ረ)
+<o> <U1230> : "ሶ" U1236 # key s (base character ሰ)
+<o> <U1240> : "ቆ" U1246 # key q (base character ቀ)
+<o> <U1260> : "ቦ" U1266 # key b (base character በ)
+<o> <U1270> : "ቶ" U1276 # key t (base character ተ)
+<o> <U1290> : "ኖ" U1296 # key n (base character ነ)
+<o> <U12A0> : "ኦ" U12A6 # key x (base character አ)
+<o> <U12A8> : "ኮ" U12AE # key k (base character ከ)
+<o> <U12C8> : "ዎ" U12CE # key w (base character ወ)
+<o> <U12D8> : "ዞ" U12DE # key z (base character ዘ)
+<o> <U12E8> : "ዮ" U12EE # key y (base character የ)
+<o> <U12F0> : "ዶ" U12F6 # key d (base character ደ)
+<o> <U1300> : "ጆ" U1306 # key j (base character ጀ)
+<o> <U1308> : "ጎ" U130E # key g (base character ገ)
+<o> <U1340> : "ፆ" U1346 # key [ (base character ፀ)
+<o> <U1348> : "ፎ" U134E # key f (base character ፈ)
+<o> <U1350> : "ፖ" U1356 # key p (base character ፐ)
+<o> <U1238> : "ሾ" U123E # key v (base character ሸ)
+<o> <U1328> : "ጮ" U132E # key ] (base character ጨ)
 
 XCOMM Modifier: /A/
-<A> <U1208> : "ሏ" <U120F> # key l (base character ለ)
-<A> <U1218> : "ሟ" <U121F> # key m (base character መ)
-<A> <U1228> : "ሯ" <U122F> # key r (base character ረ)
-<A> <U1230> : "ሷ" <U1237> # key s (base character ሰ)
-<A> <U1240> : "ቋ" <U124B> # key q (base character ቀ)
-<A> <U1260> : "ቧ" <U1267> # key b (base character በ)
-<A> <U1270> : "ቷ" <U1277> # key t (base character ተ)
-<A> <U1290> : "ኗ" <U1297> # key n (base character ነ)
-<A> <U12A0> : "ኧ" <U12A7> # key x (base character አ)
-<A> <U12A8> : "ኳ" <U12B3> # key k (base character ከ)
-<A> <U12D8> : "ዟ" <U12DF> # key z (base character ዘ)
-<A> <U12F0> : "ዷ" <U12F7> # key d (base character ደ)
-<A> <U1300> : "ጇ" <U1307> # key j (base character ጀ)
-<A> <U1308> : "ጓ" <U1313> # key g (base character ገ)
-<A> <U1348> : "ፏ" <U134F> # key f (base character ፈ)
-<A> <U1350> : "ፗ" <U1357> # key p (base character ፐ)
-<A> <U1238> : "ሿ" <U123F> # key v (base character ሸ)
-<A> <U1328> : "ጯ" <U132F> # key ] (base character ጨ)
+<A> <U1208> : "ሏ" U120F # key l (base character ለ)
+<A> <U1218> : "ሟ" U121F # key m (base character መ)
+<A> <U1228> : "ሯ" U122F # key r (base character ረ)
+<A> <U1230> : "ሷ" U1237 # key s (base character ሰ)
+<A> <U1240> : "ቋ" U124B # key q (base character ቀ)
+<A> <U1260> : "ቧ" U1267 # key b (base character በ)
+<A> <U1270> : "ቷ" U1277 # key t (base character ተ)
+<A> <U1290> : "ኗ" U1297 # key n (base character ነ)
+<A> <U12A0> : "ኧ" U12A7 # key x (base character አ)
+<A> <U12A8> : "ኳ" U12B3 # key k (base character ከ)
+<A> <U12D8> : "ዟ" U12DF # key z (base character ዘ)
+<A> <U12F0> : "ዷ" U12F7 # key d (base character ደ)
+<A> <U1300> : "ጇ" U1307 # key j (base character ጀ)
+<A> <U1308> : "ጓ" U1313 # key g (base character ገ)
+<A> <U1348> : "ፏ" U134F # key f (base character ፈ)
+<A> <U1350> : "ፗ" U1357 # key p (base character ፐ)
+<A> <U1238> : "ሿ" U123F # key v (base character ሸ)
+<A> <U1328> : "ጯ" U132F # key ] (base character ጨ)
 
 XCOMM Modifier: /U/
-<U> <U1240> : "ቍ" <U124D> # key q (base character ቀ)
-<U> <U12A8> : "ኵ" <U12B5> # key k (base character ከ)
-<U> <U1308> : "ጕ" <U1315> # key g (base character ገ)
+<U> <U1240> : "ቍ" U124D # key q (base character ቀ)
+<U> <U12A8> : "ኵ" U12B5 # key k (base character ከ)
+<U> <U1308> : "ጕ" U1315 # key g (base character ገ)
 
 XCOMM Modifier: /I/
-<I> <U1240> : "ቊ" <U124A> # key q (base character ቀ)
-<I> <U12A8> : "ኲ" <U12B2> # key k (base character ከ)
-<I> <U1308> : "ጒ" <U1312> # key g (base character ገ)
+<I> <U1240> : "ቊ" U124A # key q (base character ቀ)
+<I> <U12A8> : "ኲ" U12B2 # key k (base character ከ)
+<I> <U1308> : "ጒ" U1312 # key g (base character ገ)
 
 XCOMM Modifier: /E/
-<E> <U1240> : "ቌ" <U124C> # key q (base character ቀ)
-<E> <U12A8> : "ኴ" <U12B4> # key k (base character ከ)
-<E> <U1308> : "ጔ" <U1314> # key g (base character ገ)
+<E> <U1240> : "ቌ" U124C # key q (base character ቀ)
+<E> <U12A8> : "ኴ" U12B4 # key k (base character ከ)
+<E> <U1308> : "ጔ" U1314 # key g (base character ገ)
 
 XCOMM Modifier: /O/
-<O> <U1240> : "ቈ" <U1248> # key q (base character ቀ)
-<O> <U12A8> : "ኰ" <U12B0> # key k (base character ከ)
-<O> <U1308> : "ጐ" <U1310> # key g (base character ገ)
+<O> <U1240> : "ቈ" U1248 # key q (base character ቀ)
+<O> <U12A8> : "ኰ" U12B0 # key k (base character ከ)
+<O> <U1308> : "ጐ" U1310 # key g (base character ገ)
 
 XCOMM
 XCOMM Group II
 XCOMM
 XCOMM Modifier: /u/
-<u> <U1210> : "ሑ" <U1211> # key h (base character ሐ)
-<u> <U1220> : "ሡ" <U1221> # key s (base character ሠ)
-<u> <U1250> : "ቑ" <U1251> # key q (base character ቐ)
-<u> <U1278> : "ቹ" <U1279> # key c (base character ቸ)
-<u> <U1320> : "ጡ" <U1321> # key t (base character ጠ)
-<u> <U1298> : "ኙ" <U1299> # key n (base character ኘ)
-<u> <U12D0> : "ዑ" <U12D1> # key x (base character ዐ)
-<u> <U12B8> : "ኹ" <U12B9> # key k (base character ኸ)
-<u> <U12E0> : "ዡ" <U12E1> # key z (base character ዠ)
-<u> <U12F8> : "ዹ" <U12F9> # key d (base character ዸ)
-<u> <U1318> : "ጙ" <U1319> # key g (base character ጘ)
-<u> <U1338> : "ጹ" <U1339> # key [ (base character ጸ)
-<u> <U1330> : "ጱ" <U1331> # key p (base character ጰ)
-<u> <U1280> : "ኁ" <U1281> # key ] (base character ኀ)
-<u> <U1268> : "ቩ" <U1269> # key v (base character ቨ)
+<u> <U1210> : "ሑ" U1211 # key h (base character ሐ)
+<u> <U1220> : "ሡ" U1221 # key s (base character ሠ)
+<u> <U1250> : "ቑ" U1251 # key q (base character ቐ)
+<u> <U1278> : "ቹ" U1279 # key c (base character ቸ)
+<u> <U1320> : "ጡ" U1321 # key t (base character ጠ)
+<u> <U1298> : "ኙ" U1299 # key n (base character ኘ)
+<u> <U12D0> : "ዑ" U12D1 # key x (base character ዐ)
+<u> <U12B8> : "ኹ" U12B9 # key k (base character ኸ)
+<u> <U12E0> : "ዡ" U12E1 # key z (base character ዠ)
+<u> <U12F8> : "ዹ" U12F9 # key d (base character ዸ)
+<u> <U1318> : "ጙ" U1319 # key g (base character ጘ)
+<u> <U1338> : "ጹ" U1339 # key [ (base character ጸ)
+<u> <U1330> : "ጱ" U1331 # key p (base character ጰ)
+<u> <U1280> : "ኁ" U1281 # key ] (base character ኀ)
+<u> <U1268> : "ቩ" U1269 # key v (base character ቨ)
 
 XCOMM Modifier: /i/
-<i> <U1210> : "ሒ" <U1212> # key h (base character ሐ)
-<i> <U1220> : "ሢ" <U1222> # key s (base character ሠ)
-<i> <U1250> : "ቒ" <U1252> # key q (base character ቐ)
-<i> <U1278> : "ቺ" <U127A> # key c (base character ቸ)
-<i> <U1320> : "ጢ" <U1322> # key t (base character ጠ)
-<i> <U1298> : "ኚ" <U129A> # key n (base character ኘ)
-<i> <U12D0> : "ዒ" <U12D2> # key x (base character ዐ)
-<i> <U12B8> : "ኺ" <U12BA> # key k (base character ኸ)
-<i> <U12E0> : "ዢ" <U12E2> # key z (base character ዠ)
-<i> <U12F8> : "ዺ" <U12FA> # key d (base character ዸ)
-<i> <U1318> : "ጚ" <U131A> # key g (base character ጘ)
-<i> <U1338> : "ጺ" <U133A> # key [ (base character ጸ)
-<i> <U1330> : "ጲ" <U1332> # key p (base character ጰ)
-<i> <U1280> : "ኂ" <U1282> # key ] (base character ኀ)
-<i> <U1268> : "ቪ" <U126A> # key v (base character ቨ)
+<i> <U1210> : "ሒ" U1212 # key h (base character ሐ)
+<i> <U1220> : "ሢ" U1222 # key s (base character ሠ)
+<i> <U1250> : "ቒ" U1252 # key q (base character ቐ)
+<i> <U1278> : "ቺ" U127A # key c (base character ቸ)
+<i> <U1320> : "ጢ" U1322 # key t (base character ጠ)
+<i> <U1298> : "ኚ" U129A # key n (base character ኘ)
+<i> <U12D0> : "ዒ" U12D2 # key x (base character ዐ)
+<i> <U12B8> : "ኺ" U12BA # key k (base character ኸ)
+<i> <U12E0> : "ዢ" U12E2 # key z (base character ዠ)
+<i> <U12F8> : "ዺ" U12FA # key d (base character ዸ)
+<i> <U1318> : "ጚ" U131A # key g (base character ጘ)
+<i> <U1338> : "ጺ" U133A # key [ (base character ጸ)
+<i> <U1330> : "ጲ" U1332 # key p (base character ጰ)
+<i> <U1280> : "ኂ" U1282 # key ] (base character ኀ)
+<i> <U1268> : "ቪ" U126A # key v (base character ቨ)
 
 XCOMM Modifier: /a/
-<a> <U1210> : "ሓ" <U1213> # key h (base character ሐ)
-<a> <U1220> : "ሣ" <U1223> # key s (base character ሠ)
-<a> <U1250> : "ቓ" <U1253> # key q (base character ቐ)
-<a> <U1278> : "ቻ" <U127B> # key c (base character ቸ)
-<a> <U1320> : "ጣ" <U1323> # key t (base character ጠ)
-<a> <U1298> : "ኛ" <U129B> # key n (base character ኘ)
-<a> <U12D0> : "ዓ" <U12D3> # key x (base character ዐ)
-<a> <U12B8> : "ኻ" <U12BB> # key k (base character ኸ)
-<a> <U12E0> : "ዣ" <U12E3> # key z (base character ዠ)
-<a> <U12F8> : "ዻ" <U12FB> # key d (base character ዸ)
-<a> <U1318> : "ጛ" <U131B> # key g (base character ጘ)
-<a> <U1338> : "ጻ" <U133B> # key [ (base character ጸ)
-<a> <U1330> : "ጳ" <U1333> # key p (base character ጰ)
-<a> <U1280> : "ኃ" <U1283> # key ] (base character ኀ)
-<a> <U1268> : "ቫ" <U126B> # key v (base character ቨ)
+<a> <U1210> : "ሓ" U1213 # key h (base character ሐ)
+<a> <U1220> : "ሣ" U1223 # key s (base character ሠ)
+<a> <U1250> : "ቓ" U1253 # key q (base character ቐ)
+<a> <U1278> : "ቻ" U127B # key c (base character ቸ)
+<a> <U1320> : "ጣ" U1323 # key t (base character ጠ)
+<a> <U1298> : "ኛ" U129B # key n (base character ኘ)
+<a> <U12D0> : "ዓ" U12D3 # key x (base character ዐ)
+<a> <U12B8> : "ኻ" U12BB # key k (base character ኸ)
+<a> <U12E0> : "ዣ" U12E3 # key z (base character ዠ)
+<a> <U12F8> : "ዻ" U12FB # key d (base character ዸ)
+<a> <U1318> : "ጛ" U131B # key g (base character ጘ)
+<a> <U1338> : "ጻ" U133B # key [ (base character ጸ)
+<a> <U1330> : "ጳ" U1333 # key p (base character ጰ)
+<a> <U1280> : "ኃ" U1283 # key ] (base character ኀ)
+<a> <U1268> : "ቫ" U126B # key v (base character ቨ)
 
 XCOMM Modifier: /e/
-<e> <U1210> : "ሔ" <U1214> # key h (base character ሐ)
-<e> <U1220> : "ሤ" <U1224> # key s (base character ሠ)
-<e> <U1250> : "ቔ" <U1254> # key q (base character ቐ)
-<e> <U1278> : "ቼ" <U127C> # key c (base character ቸ)
-<e> <U1320> : "ጤ" <U1324> # key t (base character ጠ)
-<e> <U1298> : "ኜ" <U129C> # key n (base character ኘ)
-<e> <U12D0> : "ዔ" <U12D4> # key x (base character ዐ)
-<e> <U12B8> : "ኼ" <U12BC> # key k (base character ኸ)
-<e> <U12E0> : "ዤ" <U12E4> # key z (base character ዠ)
-<e> <U12F8> : "ዼ" <U12FC> # key d (base character ዸ)
-<e> <U1318> : "ጜ" <U131C> # key g (base character ጘ)
-<e> <U1338> : "ጼ" <U133C> # key [ (base character ጸ)
-<e> <U1330> : "ጴ" <U1334> # key p (base character ጰ)
-<e> <U1280> : "ኄ" <U1284> # key ] (base character ኀ)
-<e> <U1268> : "ቬ" <U126C> # key v (base character ቨ)
+<e> <U1210> : "ሔ" U1214 # key h (base character ሐ)
+<e> <U1220> : "ሤ" U1224 # key s (base character ሠ)
+<e> <U1250> : "ቔ" U1254 # key q (base character ቐ)
+<e> <U1278> : "ቼ" U127C # key c (base character ቸ)
+<e> <U1320> : "ጤ" U1324 # key t (base character ጠ)
+<e> <U1298> : "ኜ" U129C # key n (base character ኘ)
+<e> <U12D0> : "ዔ" U12D4 # key x (base character ዐ)
+<e> <U12B8> : "ኼ" U12BC # key k (base character ኸ)
+<e> <U12E0> : "ዤ" U12E4 # key z (base character ዠ)
+<e> <U12F8> : "ዼ" U12FC # key d (base character ዸ)
+<e> <U1318> : "ጜ" U131C # key g (base character ጘ)
+<e> <U1338> : "ጼ" U133C # key [ (base character ጸ)
+<e> <U1330> : "ጴ" U1334 # key p (base character ጰ)
+<e> <U1280> : "ኄ" U1284 # key ] (base character ኀ)
+<e> <U1268> : "ቬ" U126C # key v (base character ቨ)
 
 XCOMM Modifier: /c/
-<c> <U1210> : "ሕ" <U1215> # key h (base character ሐ)
-<c> <U1220> : "ሥ" <U1225> # key s (base character ሠ)
-<c> <U1250> : "ቕ" <U1255> # key q (base character ቐ)
-<c> <U1278> : "ች" <U127D> # key c (base character ቸ)
-<c> <U1320> : "ጥ" <U1325> # key t (base character ጠ)
-<c> <U1298> : "ኝ" <U129D> # key n (base character ኘ)
-<c> <U12D0> : "ዕ" <U12D5> # key x (base character ዐ)
-<c> <U12B8> : "ኽ" <U12BD> # key k (base character ኸ)
-<c> <U12E0> : "ዥ" <U12E5> # key z (base character ዠ)
-<c> <U12F8> : "ዽ" <U12FD> # key d (base character ዸ)
-<c> <U1318> : "ጝ" <U131D> # key g (base character ጘ)
-<c> <U1338> : "ጽ" <U133D> # key [ (base character ጸ)
-<c> <U1330> : "ጵ" <U1335> # key p (base character ጰ)
-<c> <U1280> : "ኅ" <U1285> # key ] (base character ኀ)
-<c> <U1268> : "ቭ" <U126D> # key v (base character ቨ)
+<c> <U1210> : "ሕ" U1215 # key h (base character ሐ)
+<c> <U1220> : "ሥ" U1225 # key s (base character ሠ)
+<c> <U1250> : "ቕ" U1255 # key q (base character ቐ)
+<c> <U1278> : "ች" U127D # key c (base character ቸ)
+<c> <U1320> : "ጥ" U1325 # key t (base character ጠ)
+<c> <U1298> : "ኝ" U129D # key n (base character ኘ)
+<c> <U12D0> : "ዕ" U12D5 # key x (base character ዐ)
+<c> <U12B8> : "ኽ" U12BD # key k (base character ኸ)
+<c> <U12E0> : "ዥ" U12E5 # key z (base character ዠ)
+<c> <U12F8> : "ዽ" U12FD # key d (base character ዸ)
+<c> <U1318> : "ጝ" U131D # key g (base character ጘ)
+<c> <U1338> : "ጽ" U133D # key [ (base character ጸ)
+<c> <U1330> : "ጵ" U1335 # key p (base character ጰ)
+<c> <U1280> : "ኅ" U1285 # key ] (base character ኀ)
+<c> <U1268> : "ቭ" U126D # key v (base character ቨ)
 
 XCOMM Modifier: /o/
-<o> <U1210> : "ሖ" <U1216> # key h (base character ሐ)
-<o> <U1220> : "ሦ" <U1226> # key s (base character ሠ)
-<o> <U1250> : "ቖ" <U1256> # key q (base character ቐ)
-<o> <U1278> : "ቾ" <U127E> # key c (base character ቸ)
-<o> <U1320> : "ጦ" <U1326> # key t (base character ጠ)
-<o> <U1298> : "ኞ" <U129E> # key n (base character ኘ)
-<o> <U12D0> : "ዖ" <U12D6> # key x (base character ዐ)
-<o> <U12B8> : "ኾ" <U12BE> # key k (base character ኸ)
-<o> <U12E0> : "ዦ" <U12E6> # key z (base character ዠ)
-<o> <U12F8> : "ዾ" <U12FE> # key d (base character ዸ)
-<o> <U1318> : "ጞ" <U131E> # key g (base character ጘ)
-<o> <U1338> : "ጾ" <U133E> # key [ (base character ጸ)
-<o> <U1330> : "ጶ" <U1336> # key p (base character ጰ)
-<o> <U1280> : "ኆ" <U1286> # key ] (base character ኀ)
-<o> <U1268> : "ቮ" <U126E> # key v (base character ቨ)
+<o> <U1210> : "ሖ" U1216 # key h (base character ሐ)
+<o> <U1220> : "ሦ" U1226 # key s (base character ሠ)
+<o> <U1250> : "ቖ" U1256 # key q (base character ቐ)
+<o> <U1278> : "ቾ" U127E # key c (base character ቸ)
+<o> <U1320> : "ጦ" U1326 # key t (base character ጠ)
+<o> <U1298> : "ኞ" U129E # key n (base character ኘ)
+<o> <U12D0> : "ዖ" U12D6 # key x (base character ዐ)
+<o> <U12B8> : "ኾ" U12BE # key k (base character ኸ)
+<o> <U12E0> : "ዦ" U12E6 # key z (base character ዠ)
+<o> <U12F8> : "ዾ" U12FE # key d (base character ዸ)
+<o> <U1318> : "ጞ" U131E # key g (base character ጘ)
+<o> <U1338> : "ጾ" U133E # key [ (base character ጸ)
+<o> <U1330> : "ጶ" U1336 # key p (base character ጰ)
+<o> <U1280> : "ኆ" U1286 # key ] (base character ኀ)
+<o> <U1268> : "ቮ" U126E # key v (base character ቨ)
 
 XCOMM Modifier: /A/
-<A> <U1210> : "ሗ" <U1217> # key h (base character ሐ)
-<A> <U1220> : "ሧ" <U1227> # key s (base character ሠ)
-<A> <U1250> : "ቛ" <U125B> # key q (base character ቐ)
-<A> <U1278> : "ቿ" <U127F> # key c (base character ቸ)
-<A> <U1320> : "ጧ" <U1327> # key t (base character ጠ)
-<A> <U1298> : "ኟ" <U129F> # key n (base character ኘ)
-<A> <U12B8> : "ዃ" <U12C3> # key k (base character ኸ)
-<A> <U12E0> : "ዧ" <U12E7> # key z (base character ዠ)
-<A> <U12F8> : "ዿ" <U12FF> # key d (base character ዸ)
-<A> <U1338> : "ጿ" <U133F> # key [ (base character ጸ)
-<A> <U1330> : "ጷ" <U1337> # key p (base character ጰ)
-<A> <U1280> : "ኋ" <U128B> # key ] (base character ኀ)
-<A> <U1268> : "ቯ" <U126F> # key v (base character ቨ)
+<A> <U1210> : "ሗ" U1217 # key h (base character ሐ)
+<A> <U1220> : "ሧ" U1227 # key s (base character ሠ)
+<A> <U1250> : "ቛ" U125B # key q (base character ቐ)
+<A> <U1278> : "ቿ" U127F # key c (base character ቸ)
+<A> <U1320> : "ጧ" U1327 # key t (base character ጠ)
+<A> <U1298> : "ኟ" U129F # key n (base character ኘ)
+<A> <U12B8> : "ዃ" U12C3 # key k (base character ኸ)
+<A> <U12E0> : "ዧ" U12E7 # key z (base character ዠ)
+<A> <U12F8> : "ዿ" U12FF # key d (base character ዸ)
+<A> <U1338> : "ጿ" U133F # key [ (base character ጸ)
+<A> <U1330> : "ጷ" U1337 # key p (base character ጰ)
+<A> <U1280> : "ኋ" U128B # key ] (base character ኀ)
+<A> <U1268> : "ቯ" U126F # key v (base character ቨ)
 
 XCOMM Modifier: /U/
-<U> <U1250> : "ቝ" <U125D> # key q (base character ቐ)
-<U> <U12B8> : "ዅ" <U12C5> # key k (base character ኸ)
+<U> <U1250> : "ቝ" U125D # key q (base character ቐ)
+<U> <U12B8> : "ዅ" U12C5 # key k (base character ኸ)
 
 XCOMM Modifier: /I/
-<I> <U1250> : "ቚ" <U125A> # key q (base character ቐ)
-<I> <U12B8> : "ዂ" <U12C2> # key k (base character ኸ)
+<I> <U1250> : "ቚ" U125A # key q (base character ቐ)
+<I> <U12B8> : "ዂ" U12C2 # key k (base character ኸ)
 
 XCOMM Modifier: /E/
-<E> <U1250> : "ቜ" <U125C> # key q (base character ቐ)
-<E> <U12B8> : "ዄ" <U12C4> # key k (base character ኸ)
+<E> <U1250> : "ቜ" U125C # key q (base character ቐ)
+<E> <U12B8> : "ዄ" U12C4 # key k (base character ኸ)
 
 XCOMM Modifier: /O/
-<O> <U1250> : "ቘ" <U1258> # key q (base character ቐ)
-<O> <U12B8> : "ዀ" <U12C0> # key k (base character ኸ)
+<O> <U1250> : "ቘ" U1258 # key q (base character ቐ)
+<O> <U12B8> : "ዀ" U12C0 # key k (base character ኸ)
 
 XCOMM
 XCOMM Group III
 XCOMM 
-<backslash> <quotedbl> : "፥" <U1365> # key "
-<backslash> <apostrophe> : "፦" <U1366> # key "
-<backslash> <minus> : "|" <U007C> # key -
-<backslash> <underscore> : "¥" <U00A5> # key _
-<backslash> <question> : "፧" <U1367> # key ?
+<backslash> <quotedbl> : "፥" U1365 # key "
+<backslash> <apostrophe> : "፦" U1366 # key "
+<backslash> <minus> : "|" U007C # key -
+<backslash> <underscore> : "¥" U00A5 # key _
+<backslash> <question> : "፧" U1367 # key ?
 
 XCOMM 
 XCOMM Khmer digraphs
diff --git a/libX11/nls/am_ET.UTF-8/Makefile.in b/libX11/nls/am_ET.UTF-8/Makefile.in
index 0e4138ff8..1614e9515 100644
--- a/libX11/nls/am_ET.UTF-8/Makefile.in
+++ b/libX11/nls/am_ET.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/am_ET.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/am_ET.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/am_ET.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/am_ET.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/armscii-8/Makefile.in b/libX11/nls/armscii-8/Makefile.in
index 9c5261c66..25fa11062 100644
--- a/libX11/nls/armscii-8/Makefile.in
+++ b/libX11/nls/armscii-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/armscii-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/armscii-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/armscii-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/armscii-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre
index c9a35dcf5..2ef0bbb48 100644
--- a/libX11/nls/compose.dir.pre
+++ b/libX11/nls/compose.dir.pre
@@ -199,11 +199,9 @@ iso8859-2/Compose:		sh_YU.ISO8859-2
 iso8859-2/Compose:		sk_SK.ISO8859-2
 iso8859-2/Compose:		sl_CS.ISO8859-2
 iso8859-2/Compose:		sl_SI.ISO8859-2
-iso8859-5/Compose:		sp_YU.ISO8859-5
 iso8859-2/Compose:		sq_AL.ISO8859-2
 iso8859-2/Compose:		sr_CS.ISO8859-2
 iso8859-5/Compose:		sr_CS.ISO8859-5
-iso8859-2/Compose:		sr_SP.ISO8859-2
 iso8859-2/Compose:		sr_YU.ISO8859-2
 iso8859-5/Compose:		sr_YU.ISO8859-5
 iso8859-1/Compose:		ss_ZA.ISO8859-1
@@ -246,6 +244,7 @@ en_US.UTF-8/Compose:		ar_AA.UTF-8
 en_US.UTF-8/Compose:		ar_BH.UTF-8
 en_US.UTF-8/Compose:		ar_DZ.UTF-8
 en_US.UTF-8/Compose:		ar_EG.UTF-8
+en_US.UTF-8/Compose:		ar_IN.UTF-8
 en_US.UTF-8/Compose:		ar_IQ.UTF-8
 en_US.UTF-8/Compose:		ar_JO.UTF-8
 en_US.UTF-8/Compose:		ar_KW.UTF-8
@@ -257,6 +256,7 @@ en_US.UTF-8/Compose:		ar_QA.UTF-8
 en_US.UTF-8/Compose:		ar_SA.UTF-8
 en_US.UTF-8/Compose:		ar_TN.UTF-8
 en_US.UTF-8/Compose:		ar_YE.UTF-8
+en_US.UTF-8/Compose:		bo_IN.UTF-8
 en_US.UTF-8/Compose:		bs_BA.UTF-8
 en_US.UTF-8/Compose:		az_AZ.UTF-8
 en_US.UTF-8/Compose:		a3_AZ.UTF-8
@@ -278,6 +278,7 @@ en_US.UTF-8/Compose:		de_CH.UTF-8
 en_US.UTF-8/Compose:		de_DE.UTF-8
 en_US.UTF-8/Compose:		de_LI.UTF-8
 en_US.UTF-8/Compose:		de_LU.UTF-8
+el_GR.UTF-8/Compose:		el_CY.UTF-8
 el_GR.UTF-8/Compose:		el_GR.UTF-8
 en_US.UTF-8/Compose:		en_AU.UTF-8
 en_US.UTF-8/Compose:		en_BZ.UTF-8
@@ -285,6 +286,7 @@ en_US.UTF-8/Compose:		en_CA.UTF-8
 en_US.UTF-8/Compose:		en_GB.UTF-8
 en_US.UTF-8/Compose:		en_IE.UTF-8
 en_US.UTF-8/Compose:		en_JM.UTF-8
+en_US.UTF-8/Compose:		en_MT.UTF-8
 en_US.UTF-8/Compose:		en_NZ.UTF-8
 en_US.UTF-8/Compose:		en_TT.UTF-8
 en_US.UTF-8/Compose:		en_UK.UTF-8
@@ -308,12 +310,13 @@ en_US.UTF-8/Compose:		es_PE.UTF-8
 en_US.UTF-8/Compose:		es_PR.UTF-8
 en_US.UTF-8/Compose:		es_PY.UTF-8
 en_US.UTF-8/Compose:		es_SV.UTF-8
+en_US.UTF-8/Compose:		es_US.UTF-8
 en_US.UTF-8/Compose:		es_UY.UTF-8
 en_US.UTF-8/Compose:		es_VE.UTF-8
 en_US.UTF-8/Compose:		et_EE.UTF-8
 en_US.UTF-8/Compose:		eu_ES.UTF-8
 en_US.UTF-8/Compose:		fa_IR.UTF-8
-en_US.UTF-8/Compose:		fi_FI.UTF-8
+fi_FI.UTF-8/Compose:		fi_FI.UTF-8
 en_US.UTF-8/Compose:		fo_FO.UTF-8
 en_US.UTF-8/Compose:		fr_BE.UTF-8
 en_US.UTF-8/Compose:		fr_CA.UTF-8
@@ -327,6 +330,7 @@ en_US.UTF-8/Compose:		gu_IN.UTF-8
 en_US.UTF-8/Compose:		gv_GB.UTF-8
 en_US.UTF-8/Compose:		he_IL.UTF-8
 en_US.UTF-8/Compose:		hi_IN.UTF-8
+en_US.UTF-8/Compose:		hne_IN.UTF-8
 en_US.UTF-8/Compose:		hr_HR.UTF-8
 en_US.UTF-8/Compose:		hu_HU.UTF-8
 en_US.UTF-8/Compose:		hy_AM.UTF-8
@@ -338,24 +342,35 @@ en_US.UTF-8/Compose:		iu_CA.UTF-8
 en_US.UTF-8/Compose:		ja_JP.UTF-8
 en_US.UTF-8/Compose:		ka_GE.UTF-8
 en_US.UTF-8/Compose:		kl_GL.UTF-8
+en_US.UTF-8/Compose:		kk_KZ.UTF-8
+en_US.UTF-8/Compose:		kn_IN.UTF-8
 en_US.UTF-8/Compose:		ko_KR.UTF-8
+en_US.UTF-8/Compose:		ks_IN.UTF-8
+en_US.UTF-8/Compose:		ks_IN@devanagari.UTF-8
 en_US.UTF-8/Compose:		kw_GB.UTF-8
 en_US.UTF-8/Compose:		ky_KG.UTF-8
 en_US.UTF-8/Compose:		lo_LA.UTF-8
 en_US.UTF-8/Compose:		lt_LT.UTF-8
 en_US.UTF-8/Compose:		lv_LV.UTF-8
+en_US.UTF-8/Compose:		mai_IN.UTF-8
 en_US.UTF-8/Compose:		mi_NZ.UTF-8
 en_US.UTF-8/Compose:		mk_MK.UTF-8
+en_US.UTF-8/Compose:		ml_IN.UTF-8
+en_US.UTF-8/Compose:		mr_IN.UTF-8
 en_US.UTF-8/Compose:		ms_MY.UTF-8
+en_US.UTF-8/Compose:		mt_MT.UTF-8
 en_US.UTF-8/Compose:		nl_BE.UTF-8
 en_US.UTF-8/Compose:		nl_NL.UTF-8
+en_US.UTF-8/Compose:		nn_NO.UTF-8
 en_US.UTF-8/Compose:		no_NO.UTF-8
 en_US.UTF-8/Compose:		nb_NO.UTF-8
 en_US.UTF-8/Compose:		nr_ZA.UTF-8
 en_US.UTF-8/Compose:		nso_ZA.UTF-8
 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
@@ -367,17 +382,24 @@ en_US.UTF-8/Compose:		ro_RO.UTF-8
 en_US.UTF-8/Compose:		ru_RU.UTF-8
 en_US.UTF-8/Compose:		ru_UA.UTF-8
 en_US.UTF-8/Compose:		rw_RW.UTF-8
+en_US.UTF-8/Compose:		sa_IN.UTF-8
+en_US.UTF-8/Compose:		sd_IN.UTF-8
+en_US.UTF-8/Compose:		sd_IN@devanagari.UTF-8
+en_US.UTF-8/Compose:		sh_BA.UTF-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_CS.UTF-8
+en_US.UTF-8/Compose:		sr_ME.UTF-8
+en_US.UTF-8/Compose:		sr_RS.UTF-8
 en_US.UTF-8/Compose:		sr_YU.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
 en_US.UTF-8/Compose:		sv_SE.UTF-8
 en_US.UTF-8/Compose:		ta_IN.UTF-8
+en_US.UTF-8/Compose:		te_IN.UTF-8
 en_US.UTF-8/Compose:		tg_TJ.UTF-8
 en_US.UTF-8/Compose:		th_TH.UTF-8
 en_US.UTF-8/Compose:		tl_PH.UTF-8
@@ -396,3 +418,5 @@ en_US.UTF-8/Compose:		xh_ZA.UTF-8
 en_US.UTF-8/Compose:		zh_TW.UTF-8
 en_US.UTF-8/Compose:		zu_ZA.UTF-8
 en_US.UTF-8/Compose:		bs_BA.UTF-8
+en_US.UTF-8/Compose:		ne_NP.UTF-8
+
diff --git a/libX11/nls/el_GR.UTF-8/Compose.pre b/libX11/nls/el_GR.UTF-8/Compose.pre
index 870f1d56b..776919428 100644
--- a/libX11/nls/el_GR.UTF-8/Compose.pre
+++ b/libX11/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
 <dead_acute> <dead_dasia> <Greek_eta>                  : "ἥ"  U1f25
 <Multi_key> <greater> <asciitilde> <Greek_eta>          : "ἦ"  U1f26
 <Multi_key> <asciitilde> <greater> <Greek_eta>          : "ἦ"  U1f26
 <dead_horn> <dead_tilde> <Greek_eta>                    : "ἦ"  U1f26
-<U0313> <dead_tilde> <Greek_eta>                    : "ἦ"  U1f26
 <dead_psili> <dead_tilde> <Greek_eta>                    : "ἦ"  U1f26
 <dead_tilde> <dead_horn> <Greek_eta>                    : "ἦ"  U1f26
-<dead_tilde> <U0313> <Greek_eta>                    : "ἦ"  U1f26
 <dead_tilde> <dead_psili> <Greek_eta>                    : "ἦ"  U1f26
 <Multi_key> <less> <asciitilde> <Greek_eta>             : "ἧ"  U1f27
 <Multi_key> <asciitilde> <less> <Greek_eta>             : "ἧ"  U1f27
 <dead_ogonek> <dead_tilde> <Greek_eta>                  : "ἧ"  U1f27
-<U0314> <dead_tilde> <Greek_eta>                  : "ἧ"  U1f27
 <dead_dasia> <dead_tilde> <Greek_eta>                  : "ἧ"  U1f27
 <dead_tilde> <dead_ogonek> <Greek_eta>                  : "ἧ"  U1f27
-<dead_tilde> <U0314> <Greek_eta>                  : "ἧ"  U1f27
 <dead_tilde> <dead_dasia> <Greek_eta>                  : "ἧ"  U1f27
 <Multi_key> <greater> <Greek_ETA>                       : "Ἠ"  U1f28
 <dead_horn> <Greek_ETA>                                 : "Ἠ"  U1f28
-<U0313> <Greek_ETA>                                 : "Ἠ"  U1f28
 <dead_psili> <Greek_ETA>                                 : "Ἠ"  U1f28
 <Multi_key> <less> <Greek_ETA>                          : "Ἡ"  U1f29
 <dead_ogonek> <Greek_ETA>                               : "Ἡ"  U1f29
-<U0314> <Greek_ETA>                               : "Ἡ"  U1f29
 <dead_dasia> <Greek_ETA>                               : "Ἡ"  U1f29
 <Multi_key> <greater> <grave> <Greek_ETA>               : "Ἢ"  U1f2a
 <Multi_key> <grave> <greater> <Greek_ETA>               : "Ἢ"  U1f2a
 <dead_horn> <dead_grave> <Greek_ETA>                    : "Ἢ"  U1f2a
-<U0313> <dead_grave> <Greek_ETA>                    : "Ἢ"  U1f2a
 <dead_psili> <dead_grave> <Greek_ETA>                    : "Ἢ"  U1f2a
 <dead_grave> <dead_horn> <Greek_ETA>                    : "Ἢ"  U1f2a
-<dead_grave> <U0313> <Greek_ETA>                    : "Ἢ"  U1f2a
 <dead_grave> <dead_psili> <Greek_ETA>                    : "Ἢ"  U1f2a
 <Multi_key> <less> <grave> <Greek_ETA>                  : "Ἣ"  U1f2b
 <Multi_key> <grave> <less> <Greek_ETA>                  : "Ἣ"  U1f2b
 <dead_ogonek> <dead_grave> <Greek_ETA>                  : "Ἣ"  U1f2b
-<U0314> <dead_grave> <Greek_ETA>                  : "Ἣ"  U1f2b
 <dead_dasia> <dead_grave> <Greek_ETA>                  : "Ἣ"  U1f2b
 <dead_grave> <dead_ogonek> <Greek_ETA>                  : "Ἣ"  U1f2b
-<dead_grave> <U0314> <Greek_ETA>                  : "Ἣ"  U1f2b
 <dead_grave> <dead_dasia> <Greek_ETA>                  : "Ἣ"  U1f2b
 <Multi_key> <greater> <apostrophe> <Greek_ETA>          : "Ἤ"  U1f2c
 <Multi_key> <apostrophe> <greater> <Greek_ETA>          : "Ἤ"  U1f2c
 <dead_horn> <dead_acute> <Greek_ETA>                    : "Ἤ"  U1f2c
-<U0313> <dead_acute> <Greek_ETA>                    : "Ἤ"  U1f2c
 <dead_psili> <dead_acute> <Greek_ETA>                    : "Ἤ"  U1f2c
 <dead_acute> <dead_horn> <Greek_ETA>                    : "Ἤ"  U1f2c
-<dead_acute> <U0313> <Greek_ETA>                    : "Ἤ"  U1f2c
 <dead_acute> <dead_psili> <Greek_ETA>                    : "Ἤ"  U1f2c
 <Multi_key> <less> <apostrophe> <Greek_ETA>             : "Ἥ"  U1f2d
 <Multi_key> <apostrophe> <less> <Greek_ETA>             : "Ἥ"  U1f2d
 <dead_ogonek> <dead_acute> <Greek_ETA>                  : "Ἥ"  U1f2d
-<U0314> <dead_acute> <Greek_ETA>                  : "Ἥ"  U1f2d
 <dead_dasia> <dead_acute> <Greek_ETA>                  : "Ἥ"  U1f2d
 <dead_acute> <dead_ogonek> <Greek_ETA>                  : "Ἥ"  U1f2d
-<dead_acute> <U0314> <Greek_ETA>                  : "Ἥ"  U1f2d
 <dead_acute> <dead_dasia> <Greek_ETA>                  : "Ἥ"  U1f2d
 <Multi_key> <greater> <asciitilde> <Greek_ETA>          : "Ἦ"  U1f2e
 <Multi_key> <asciitilde> <greater> <Greek_ETA>          : "Ἦ"  U1f2e
 <dead_horn> <dead_tilde> <Greek_ETA>                    : "Ἦ"  U1f2e
-<U0313> <dead_tilde> <Greek_ETA>                    : "Ἦ"  U1f2e
 <dead_psili> <dead_tilde> <Greek_ETA>                    : "Ἦ"  U1f2e
 <dead_tilde> <dead_horn> <Greek_ETA>                    : "Ἦ"  U1f2e
-<dead_tilde> <U0313> <Greek_ETA>                    : "Ἦ"  U1f2e
 <dead_tilde> <dead_psili> <Greek_ETA>                    : "Ἦ"  U1f2e
 <Multi_key> <less> <asciitilde> <Greek_ETA>             : "Ἧ"  U1f2f
 <Multi_key> <asciitilde> <less> <Greek_ETA>             : "Ἧ"  U1f2f
 <dead_ogonek> <dead_tilde> <Greek_ETA>                  : "Ἧ"  U1f2f
-<U0314> <dead_tilde> <Greek_ETA>                  : "Ἧ"  U1f2f
 <dead_dasia> <dead_tilde> <Greek_ETA>                  : "Ἧ"  U1f2f
 <dead_tilde> <dead_ogonek> <Greek_ETA>                  : "Ἧ"  U1f2f
-<dead_tilde> <U0314> <Greek_ETA>                  : "Ἧ"  U1f2f
 <dead_tilde> <dead_dasia> <Greek_ETA>                  : "Ἧ"  U1f2f
 <Multi_key> <greater> <Greek_iota>                      : "ἰ"  U1f30
 <dead_horn> <Greek_iota>                                : "ἰ"  U1f30
-<U0313> <Greek_iota>                                : "ἰ"  U1f30
 <dead_psili> <Greek_iota>                                : "ἰ"  U1f30
 <Multi_key> <less> <Greek_iota>                         : "ἱ"  U1f31
 <dead_ogonek> <Greek_iota>                              : "ἱ"  U1f31
-<U0314> <Greek_iota>                              : "ἱ"  U1f31
 <dead_dasia> <Greek_iota>                              : "ἱ"  U1f31
 <Multi_key> <greater> <grave> <Greek_iota>              : "ἲ"  U1f32
 <Multi_key> <grave> <greater> <Greek_iota>              : "ἲ"  U1f32
 <dead_horn> <dead_grave> <Greek_iota>                   : "ἲ"  U1f32
-<U0313> <dead_grave> <Greek_iota>                   : "ἲ"  U1f32
 <dead_psili> <dead_grave> <Greek_iota>                   : "ἲ"  U1f32
 <dead_grave> <dead_horn> <Greek_iota>                   : "ἲ"  U1f32
-<dead_grave> <U0313> <Greek_iota>                   : "ἲ"  U1f32
 <dead_grave> <dead_psili> <Greek_iota>                   : "ἲ"  U1f32
 <Multi_key> <less> <grave> <Greek_iota>                 : "ἳ"  U1f33
 <Multi_key> <grave> <less> <Greek_iota>                 : "ἳ"  U1f33
 <dead_ogonek> <dead_grave> <Greek_iota>                 : "ἳ"  U1f33
-<U0314> <dead_grave> <Greek_iota>                 : "ἳ"  U1f33
 <dead_dasia> <dead_grave> <Greek_iota>                 : "ἳ"  U1f33
 <dead_grave> <dead_ogonek> <Greek_iota>                 : "ἳ"  U1f33
-<dead_grave> <U0314> <Greek_iota>                 : "ἳ"  U1f33
 <dead_grave> <dead_dasia> <Greek_iota>                 : "ἳ"  U1f33
 <Multi_key> <greater> <apostrophe> <Greek_iota>         : "ἴ"  U1f34
 <Multi_key> <apostrophe> <greater> <Greek_iota>         : "ἴ"  U1f34
 <dead_horn> <dead_acute> <Greek_iota>                   : "ἴ"  U1f34
-<U0313> <dead_acute> <Greek_iota>                   : "ἴ"  U1f34
 <dead_psili> <dead_acute> <Greek_iota>                   : "ἴ"  U1f34
 <dead_acute> <dead_horn> <Greek_iota>                   : "ἴ"  U1f34
-<dead_acute> <U0313> <Greek_iota>                   : "ἴ"  U1f34
 <dead_acute> <dead_psili> <Greek_iota>                   : "ἴ"  U1f34
 <Multi_key> <less> <apostrophe> <Greek_iota>            : "ἵ"  U1f35
 <Multi_key> <apostrophe> <less> <Greek_iota>            : "ἵ"  U1f35
 <dead_ogonek> <dead_acute> <Greek_iota>                 : "ἵ"  U1f35
-<U0314> <dead_acute> <Greek_iota>                 : "ἵ"  U1f35
 <dead_dasia> <dead_acute> <Greek_iota>                 : "ἵ"  U1f35
 <dead_acute> <dead_ogonek> <Greek_iota>                 : "ἵ"  U1f35
-<dead_acute> <U0314> <Greek_iota>                 : "ἵ"  U1f35
 <dead_acute> <dead_dasia> <Greek_iota>                 : "ἵ"  U1f35
 <Multi_key> <greater> <asciitilde> <Greek_iota>         : "ἶ"  U1f36
 <Multi_key> <asciitilde> <greater> <Greek_iota>         : "ἶ"  U1f36
 <dead_horn> <dead_tilde> <Greek_iota>                   : "ἶ"  U1f36
-<U0313> <dead_tilde> <Greek_iota>                   : "ἶ"  U1f36
 <dead_psili> <dead_tilde> <Greek_iota>                   : "ἶ"  U1f36
 <dead_tilde> <dead_horn> <Greek_iota>                   : "ἶ"  U1f36
-<dead_tilde> <U0313> <Greek_iota>                   : "ἶ"  U1f36
 <dead_tilde> <dead_psili> <Greek_iota>                   : "ἶ"  U1f36
 <Multi_key> <less> <asciitilde> <Greek_iota>            : "ἷ"  U1f37
 <Multi_key> <asciitilde> <less> <Greek_iota>            : "ἷ"  U1f37
 <dead_ogonek> <dead_tilde> <Greek_iota>                 : "ἷ"  U1f37
-<U0314> <dead_tilde> <Greek_iota>                 : "ἷ"  U1f37
 <dead_dasia> <dead_tilde> <Greek_iota>                 : "ἷ"  U1f37
 <dead_tilde> <dead_ogonek> <Greek_iota>                 : "ἷ"  U1f37
-<dead_tilde> <U0314> <Greek_iota>                 : "ἷ"  U1f37
 <dead_tilde> <dead_dasia> <Greek_iota>                 : "ἷ"  U1f37
 <Multi_key> <greater> <Greek_IOTA>                      : "Ἰ"  U1f38
 <dead_horn> <Greek_IOTA>                                : "Ἰ"  U1f38
-<U0313> <Greek_IOTA>                                : "Ἰ"  U1f38
 <dead_psili> <Greek_IOTA>                                : "Ἰ"  U1f38
 <Multi_key> <less> <Greek_IOTA>                         : "Ἱ"  U1f39
 <dead_ogonek> <Greek_IOTA>                              : "Ἱ"  U1f39
-<U0314> <Greek_IOTA>                              : "Ἱ"  U1f39
 <dead_dasia> <Greek_IOTA>                              : "Ἱ"  U1f39
 <Multi_key> <greater> <grave> <Greek_IOTA>              : "Ἲ"  U1f3a
 <Multi_key> <grave> <greater> <Greek_IOTA>              : "Ἲ"  U1f3a
 <dead_horn> <dead_grave> <Greek_IOTA>                   : "Ἲ"  U1f3a
-<U0313> <dead_grave> <Greek_IOTA>                   : "Ἲ"  U1f3a
 <dead_psili> <dead_grave> <Greek_IOTA>                   : "Ἲ"  U1f3a
 <dead_grave> <dead_horn> <Greek_IOTA>                   : "Ἲ"  U1f3a
-<dead_grave> <U0313> <Greek_IOTA>                   : "Ἲ"  U1f3a
 <dead_grave> <dead_psili> <Greek_IOTA>                   : "Ἲ"  U1f3a
 <Multi_key> <less> <grave> <Greek_IOTA>                 : "Ἳ"  U1f3b
 <Multi_key> <grave> <less> <Greek_IOTA>                 : "Ἳ"  U1f3b
 <dead_ogonek> <dead_grave> <Greek_IOTA>                 : "Ἳ"  U1f3b
-<U0314> <dead_grave> <Greek_IOTA>                 : "Ἳ"  U1f3b
 <dead_dasia> <dead_grave> <Greek_IOTA>                 : "Ἳ"  U1f3b
 <dead_grave> <dead_ogonek> <Greek_IOTA>                 : "Ἳ"  U1f3b
-<dead_grave> <U0314> <Greek_IOTA>                 : "Ἳ"  U1f3b
 <dead_grave> <dead_dasia> <Greek_IOTA>                 : "Ἳ"  U1f3b
 <Multi_key> <greater> <apostrophe> <Greek_IOTA>         : "Ἴ"  U1f3c
 <Multi_key> <apostrophe> <greater> <Greek_IOTA>         : "Ἴ"  U1f3c
 <dead_horn> <dead_acute> <Greek_IOTA>                   : "Ἴ"  U1f3c
-<U0313> <dead_acute> <Greek_IOTA>                   : "Ἴ"  U1f3c
 <dead_psili> <dead_acute> <Greek_IOTA>                   : "Ἴ"  U1f3c
 <dead_acute> <dead_horn> <Greek_IOTA>                   : "Ἴ"  U1f3c
-<dead_acute> <U0313> <Greek_IOTA>                   : "Ἴ"  U1f3c
 <dead_acute> <dead_psili> <Greek_IOTA>                   : "Ἴ"  U1f3c
 <Multi_key> <less> <apostrophe> <Greek_IOTA>            : "Ἵ"  U1f3d
 <Multi_key> <apostrophe> <less> <Greek_IOTA>            : "Ἵ"  U1f3d
 <dead_ogonek> <dead_acute> <Greek_IOTA>                 : "Ἵ"  U1f3d
-<U0314> <dead_acute> <Greek_IOTA>                 : "Ἵ"  U1f3d
 <dead_dasia> <dead_acute> <Greek_IOTA>                 : "Ἵ"  U1f3d
 <dead_acute> <dead_ogonek> <Greek_IOTA>                 : "Ἵ"  U1f3d
-<dead_acute> <U0314> <Greek_IOTA>                 : "Ἵ"  U1f3d
 <dead_acute> <dead_dasia> <Greek_IOTA>                 : "Ἵ"  U1f3d
 <Multi_key> <greater> <asciitilde> <Greek_IOTA>         : "Ἶ"  U1f3e
 <Multi_key> <asciitilde> <greater> <Greek_IOTA>         : "Ἶ"  U1f3e
 <dead_horn> <dead_tilde> <Greek_IOTA>                   : "Ἶ"  U1f3e
-<U0313> <dead_tilde> <Greek_IOTA>                   : "Ἶ"  U1f3e
 <dead_psili> <dead_tilde> <Greek_IOTA>                   : "Ἶ"  U1f3e
 <dead_tilde> <dead_horn> <Greek_IOTA>                   : "Ἶ"  U1f3e
-<dead_tilde> <U0313> <Greek_IOTA>                   : "Ἶ"  U1f3e
 <dead_tilde> <dead_psili> <Greek_IOTA>                   : "Ἶ"  U1f3e
 <Multi_key> <less> <asciitilde> <Greek_IOTA>            : "Ἷ"  U1f3f
 <Multi_key> <asciitilde> <less> <Greek_IOTA>            : "Ἷ"  U1f3f
 <dead_ogonek> <dead_tilde> <Greek_IOTA>                 : "Ἷ"  U1f3f
-<U0314> <dead_tilde> <Greek_IOTA>                 : "Ἷ"  U1f3f
 <dead_dasia> <dead_tilde> <Greek_IOTA>                 : "Ἷ"  U1f3f
 <dead_tilde> <dead_ogonek> <Greek_IOTA>                 : "Ἷ"  U1f3f
-<dead_tilde> <U0314> <Greek_IOTA>                 : "Ἷ"  U1f3f
 <dead_tilde> <dead_dasia> <Greek_IOTA>                 : "Ἷ"  U1f3f
 <Multi_key> <greater> <Greek_omicron>                   : "ὀ"  U1f40
 <dead_horn> <Greek_omicron>                             : "ὀ"  U1f40
-<U0313> <Greek_omicron>                             : "ὀ"  U1f40
 <dead_psili> <Greek_omicron>                             : "ὀ"  U1f40
 <Multi_key> <less> <Greek_omicron>                      : "ὁ"  U1f41
 <dead_ogonek> <Greek_omicron>                           : "ὁ"  U1f41
-<U0314> <Greek_omicron>                           : "ὁ"  U1f41
 <dead_dasia> <Greek_omicron>                           : "ὁ"  U1f41
 <Multi_key> <greater> <grave> <Greek_omicron>           : "ὂ"  U1f42
 <Multi_key> <grave> <greater> <Greek_omicron>           : "ὂ"  U1f42
 <dead_horn> <dead_grave> <Greek_omicron>                : "ὂ"  U1f42
-<U0313> <dead_grave> <Greek_omicron>                : "ὂ"  U1f42
 <dead_psili> <dead_grave> <Greek_omicron>                : "ὂ"  U1f42
 <dead_grave> <dead_horn> <Greek_omicron>                : "ὂ"  U1f42
-<dead_grave> <U0313> <Greek_omicron>                : "ὂ"  U1f42
 <dead_grave> <dead_psili> <Greek_omicron>                : "ὂ"  U1f42
 <Multi_key> <less> <grave> <Greek_omicron>              : "ὃ"  U1f43
 <Multi_key> <grave> <less> <Greek_omicron>              : "ὃ"  U1f43
 <dead_ogonek> <dead_grave> <Greek_omicron>              : "ὃ"  U1f43
-<U0314> <dead_grave> <Greek_omicron>              : "ὃ"  U1f43
 <dead_dasia> <dead_grave> <Greek_omicron>              : "ὃ"  U1f43
 <dead_grave> <dead_ogonek> <Greek_omicron>              : "ὃ"  U1f43
-<dead_grave> <U0314> <Greek_omicron>              : "ὃ"  U1f43
 <dead_grave> <dead_dasia> <Greek_omicron>              : "ὃ"  U1f43
 <Multi_key> <greater> <apostrophe> <Greek_omicron>      : "ὄ"  U1f44
 <Multi_key> <apostrophe> <greater> <Greek_omicron>      : "ὄ"  U1f44
 <dead_horn> <dead_acute> <Greek_omicron>                : "ὄ"  U1f44
-<U0313> <dead_acute> <Greek_omicron>                : "ὄ"  U1f44
 <dead_psili> <dead_acute> <Greek_omicron>                : "ὄ"  U1f44
 <dead_acute> <dead_horn> <Greek_omicron>                : "ὄ"  U1f44
-<dead_acute> <U0313> <Greek_omicron>                : "ὄ"  U1f44
 <dead_acute> <dead_psili> <Greek_omicron>                : "ὄ"  U1f44
 <Multi_key> <less> <apostrophe> <Greek_omicron>         : "ὅ"  U1f45
 <Multi_key> <apostrophe> <less> <Greek_omicron>         : "ὅ"  U1f45
 <dead_ogonek> <dead_acute> <Greek_omicron>              : "ὅ"  U1f45
-<U0314> <dead_acute> <Greek_omicron>              : "ὅ"  U1f45
 <dead_dasia> <dead_acute> <Greek_omicron>              : "ὅ"  U1f45
 <dead_acute> <dead_ogonek> <Greek_omicron>              : "ὅ"  U1f45
-<dead_acute> <U0314> <Greek_omicron>              : "ὅ"  U1f45
 <dead_acute> <dead_dasia> <Greek_omicron>              : "ὅ"  U1f45
 <Multi_key> <greater> <Greek_OMICRON>                   : "Ὀ"  U1f48
 <dead_horn> <Greek_OMICRON>                             : "Ὀ"  U1f48
-<U0313> <Greek_OMICRON>                             : "Ὀ"  U1f48
 <dead_psili> <Greek_OMICRON>                             : "Ὀ"  U1f48
 <Multi_key> <less> <Greek_OMICRON>                      : "Ὁ"  U1f49
 <dead_ogonek> <Greek_OMICRON>                           : "Ὁ"  U1f49
-<U0314> <Greek_OMICRON>                           : "Ὁ"  U1f49
 <dead_dasia> <Greek_OMICRON>                           : "Ὁ"  U1f49
 <Multi_key> <greater> <grave> <Greek_OMICRON>           : "Ὂ"  U1f4a
 <Multi_key> <grave> <greater> <Greek_OMICRON>           : "Ὂ"  U1f4a
 <dead_horn> <dead_grave> <Greek_OMICRON>                : "Ὂ"  U1f4a
-<U0313> <dead_grave> <Greek_OMICRON>                : "Ὂ"  U1f4a
 <dead_psili> <dead_grave> <Greek_OMICRON>                : "Ὂ"  U1f4a
 <dead_grave> <dead_horn> <Greek_OMICRON>                : "Ὂ"  U1f4a
-<dead_grave> <U0313> <Greek_OMICRON>                : "Ὂ"  U1f4a
 <dead_grave> <dead_psili> <Greek_OMICRON>                : "Ὂ"  U1f4a
 <Multi_key> <less> <grave> <Greek_OMICRON>              : "Ὃ"  U1f4b
 <Multi_key> <grave> <less> <Greek_OMICRON>              : "Ὃ"  U1f4b
 <dead_ogonek> <dead_grave> <Greek_OMICRON>              : "Ὃ"  U1f4b
-<U0314> <dead_grave> <Greek_OMICRON>              : "Ὃ"  U1f4b
 <dead_dasia> <dead_grave> <Greek_OMICRON>              : "Ὃ"  U1f4b
 <dead_grave> <dead_ogonek> <Greek_OMICRON>              : "Ὃ"  U1f4b
-<dead_grave> <U0314> <Greek_OMICRON>              : "Ὃ"  U1f4b
 <dead_grave> <dead_dasia> <Greek_OMICRON>              : "Ὃ"  U1f4b
 <Multi_key> <greater> <apostrophe> <Greek_OMICRON>      : "Ὄ"  U1f4c
 <Multi_key> <apostrophe> <greater> <Greek_OMICRON>      : "Ὄ"  U1f4c
 <dead_horn> <dead_acute> <Greek_OMICRON>                : "Ὄ"  U1f4c
-<U0313> <dead_acute> <Greek_OMICRON>                : "Ὄ"  U1f4c
 <dead_psili> <dead_acute> <Greek_OMICRON>                : "Ὄ"  U1f4c
 <dead_acute> <dead_horn> <Greek_OMICRON>                : "Ὄ"  U1f4c
-<dead_acute> <U0313> <Greek_OMICRON>                : "Ὄ"  U1f4c
 <dead_acute> <dead_psili> <Greek_OMICRON>                : "Ὄ"  U1f4c
 <Multi_key> <less> <apostrophe> <Greek_OMICRON>         : "Ὅ"  U1f4d
 <Multi_key> <apostrophe> <less> <Greek_OMICRON>         : "Ὅ"  U1f4d
 <dead_ogonek> <dead_acute> <Greek_OMICRON>              : "Ὅ"  U1f4d
-<U0314> <dead_acute> <Greek_OMICRON>              : "Ὅ"  U1f4d
 <dead_dasia> <dead_acute> <Greek_OMICRON>              : "Ὅ"  U1f4d
 <dead_acute> <dead_ogonek> <Greek_OMICRON>              : "Ὅ"  U1f4d
-<dead_acute> <U0314> <Greek_OMICRON>              : "Ὅ"  U1f4d
 <dead_acute> <dead_dasia> <Greek_OMICRON>              : "Ὅ"  U1f4d
 <Multi_key> <greater> <Greek_upsilon>                   : "ὐ"  U1f50
 <dead_horn> <Greek_upsilon>                             : "ὐ"  U1f50
-<U0313> <Greek_upsilon>                             : "ὐ"  U1f50
 <dead_psili> <Greek_upsilon>                             : "ὐ"  U1f50
 <Multi_key> <less> <Greek_upsilon>                      : "ὑ"  U1f51
 <dead_ogonek> <Greek_upsilon>                           : "ὑ"  U1f51
-<U0314> <Greek_upsilon>                           : "ὑ"  U1f51
 <dead_dasia> <Greek_upsilon>                           : "ὑ"  U1f51
 <Multi_key> <greater> <grave> <Greek_upsilon>           : "ὒ"  U1f52
 <Multi_key> <grave> <greater> <Greek_upsilon>           : "ὒ"  U1f52
 <dead_horn> <dead_grave> <Greek_upsilon>                : "ὒ"  U1f52
-<U0313> <dead_grave> <Greek_upsilon>                : "ὒ"  U1f52
 <dead_psili> <dead_grave> <Greek_upsilon>                : "ὒ"  U1f52
 <dead_grave> <dead_horn> <Greek_upsilon>                : "ὒ"  U1f52
-<dead_grave> <U0313> <Greek_upsilon>                : "ὒ"  U1f52
 <dead_grave> <dead_psili> <Greek_upsilon>                : "ὒ"  U1f52
 <Multi_key> <less> <grave> <Greek_upsilon>              : "ὓ"  U1f53
 <Multi_key> <grave> <less> <Greek_upsilon>              : "ὓ"  U1f53
 <dead_ogonek> <dead_grave> <Greek_upsilon>              : "ὓ"  U1f53
-<U0314> <dead_grave> <Greek_upsilon>              : "ὓ"  U1f53
 <dead_dasia> <dead_grave> <Greek_upsilon>              : "ὓ"  U1f53
 <dead_grave> <dead_ogonek> <Greek_upsilon>              : "ὓ"  U1f53
-<dead_grave> <U0314> <Greek_upsilon>              : "ὓ"  U1f53
 <dead_grave> <dead_dasia> <Greek_upsilon>              : "ὓ"  U1f53
 <Multi_key> <greater> <apostrophe> <Greek_upsilon>      : "ὔ"  U1f54
 <Multi_key> <apostrophe> <greater> <Greek_upsilon>      : "ὔ"  U1f54
 <dead_horn> <dead_acute> <Greek_upsilon>                : "ὔ"  U1f54
-<U0313> <dead_acute> <Greek_upsilon>                : "ὔ"  U1f54
 <dead_psili> <dead_acute> <Greek_upsilon>                : "ὔ"  U1f54
 <dead_acute> <dead_horn> <Greek_upsilon>                : "ὔ"  U1f54
-<dead_acute> <U0313> <Greek_upsilon>                : "ὔ"  U1f54
 <dead_acute> <dead_psili> <Greek_upsilon>                : "ὔ"  U1f54
 <Multi_key> <less> <apostrophe> <Greek_upsilon>         : "ὕ"  U1f55
 <Multi_key> <apostrophe> <less> <Greek_upsilon>         : "ὕ"  U1f55
 <dead_ogonek> <dead_acute> <Greek_upsilon>              : "ὕ"  U1f55
-<U0314> <dead_acute> <Greek_upsilon>              : "ὕ"  U1f55
 <dead_dasia> <dead_acute> <Greek_upsilon>              : "ὕ"  U1f55
 <dead_acute> <dead_ogonek> <Greek_upsilon>              : "ὕ"  U1f55
-<dead_acute> <U0314> <Greek_upsilon>              : "ὕ"  U1f55
 <dead_acute> <dead_dasia> <Greek_upsilon>              : "ὕ"  U1f55
 <Multi_key> <greater> <asciitilde> <Greek_upsilon>      : "ὖ"  U1f56
 <Multi_key> <asciitilde> <greater> <Greek_upsilon>      : "ὖ"  U1f56
 <dead_horn> <dead_tilde> <Greek_upsilon>                : "ὖ"  U1f56
-<U0313> <dead_tilde> <Greek_upsilon>                : "ὖ"  U1f56
 <dead_psili> <dead_tilde> <Greek_upsilon>                : "ὖ"  U1f56
 <dead_tilde> <dead_horn> <Greek_upsilon>                : "ὖ"  U1f56
-<dead_tilde> <U0313> <Greek_upsilon>                : "ὖ"  U1f56
 <dead_tilde> <dead_psili> <Greek_upsilon>                : "ὖ"  U1f56
 <Multi_key> <less> <asciitilde> <Greek_upsilon>         : "ὗ"  U1f57
 <Multi_key> <asciitilde> <less> <Greek_upsilon>         : "ὗ"  U1f57
 <dead_ogonek> <dead_tilde> <Greek_upsilon>              : "ὗ"  U1f57
-<U0314> <dead_tilde> <Greek_upsilon>              : "ὗ"  U1f57
 <dead_dasia> <dead_tilde> <Greek_upsilon>              : "ὗ"  U1f57
 <dead_tilde> <dead_ogonek> <Greek_upsilon>              : "ὗ"  U1f57
-<dead_tilde> <U0314> <Greek_upsilon>              : "ὗ"  U1f57
 <dead_tilde> <dead_dasia> <Greek_upsilon>              : "ὗ"  U1f57
 <Multi_key> <less> <Greek_UPSILON>                      : "Ὑ"  U1f59
 <dead_ogonek> <Greek_UPSILON>                           : "Ὑ"  U1f59
-<U0314> <Greek_UPSILON>                           : "Ὑ"  U1f59
 <dead_dasia> <Greek_UPSILON>                           : "Ὑ"  U1f59
 <Multi_key> <less> <grave> <Greek_UPSILON>              : "Ὓ"  U1f5b
 <Multi_key> <grave> <less> <Greek_UPSILON>              : "Ὓ"  U1f5b
 <dead_ogonek> <dead_grave> <Greek_UPSILON>              : "Ὓ"  U1f5b
-<U0314> <dead_grave> <Greek_UPSILON>              : "Ὓ"  U1f5b
 <dead_dasia> <dead_grave> <Greek_UPSILON>              : "Ὓ"  U1f5b
 <dead_grave> <dead_ogonek> <Greek_UPSILON>              : "Ὓ"  U1f5b
-<dead_grave> <U0314> <Greek_UPSILON>              : "Ὓ"  U1f5b
 <dead_grave> <dead_dasia> <Greek_UPSILON>              : "Ὓ"  U1f5b
 <Multi_key> <less> <apostrophe> <Greek_UPSILON>         : "Ὕ"  U1f5d
 <Multi_key> <apostrophe> <less> <Greek_UPSILON>         : "Ὕ"  U1f5d
 <dead_ogonek> <dead_acute> <Greek_UPSILON>              : "Ὕ"  U1f5d
-<U0314> <dead_acute> <Greek_UPSILON>              : "Ὕ"  U1f5d
 <dead_dasia> <dead_acute> <Greek_UPSILON>              : "Ὕ"  U1f5d
 <dead_acute> <dead_ogonek> <Greek_UPSILON>              : "Ὕ"  U1f5d
-<dead_acute> <U0314> <Greek_UPSILON>              : "Ὕ"  U1f5d
 <dead_acute> <dead_dasia> <Greek_UPSILON>              : "Ὕ"  U1f5d
 <Multi_key> <less> <asciitilde> <Greek_UPSILON>         : "Ὗ"  U1f5f
 <Multi_key> <asciitilde> <less> <Greek_UPSILON>         : "Ὗ"  U1f5f
 <dead_ogonek> <dead_tilde> <Greek_UPSILON>              : "Ὗ"  U1f5f
-<U0314> <dead_tilde> <Greek_UPSILON>              : "Ὗ"  U1f5f
 <dead_dasia> <dead_tilde> <Greek_UPSILON>              : "Ὗ"  U1f5f
 <dead_tilde> <dead_ogonek> <Greek_UPSILON>              : "Ὗ"  U1f5f
-<dead_tilde> <U0314> <Greek_UPSILON>              : "Ὗ"  U1f5f
 <dead_tilde> <dead_dasia> <Greek_UPSILON>              : "Ὗ"  U1f5f
 <Multi_key> <greater> <Greek_omega>                     : "ὠ"  U1f60
 <dead_horn> <Greek_omega>                               : "ὠ"  U1f60
-<U0313> <Greek_omega>                               : "ὠ"  U1f60
 <dead_psili> <Greek_omega>                               : "ὠ"  U1f60
 <Multi_key> <less> <Greek_omega>                        : "ὡ"  U1f61
 <dead_ogonek> <Greek_omega>                             : "ὡ"  U1f61
-<U0314> <Greek_omega>                             : "ὡ"  U1f61
 <dead_dasia> <Greek_omega>                             : "ὡ"  U1f61
 <Multi_key> <greater> <grave> <Greek_omega>             : "ὢ"  U1f62
 <Multi_key> <grave> <greater> <Greek_omega>             : "ὢ"  U1f62
 <dead_horn> <dead_grave> <Greek_omega>                  : "ὢ"  U1f62
-<U0313> <dead_grave> <Greek_omega>                  : "ὢ"  U1f62
 <dead_psili> <dead_grave> <Greek_omega>                  : "ὢ"  U1f62
 <dead_grave> <dead_horn> <Greek_omega>                  : "ὢ"  U1f62
-<dead_grave> <U0313> <Greek_omega>                  : "ὢ"  U1f62
 <dead_grave> <dead_psili> <Greek_omega>                  : "ὢ"  U1f62
 <Multi_key> <less> <grave> <Greek_omega>                : "ὣ"  U1f63
 <Multi_key> <grave> <less> <Greek_omega>                : "ὣ"  U1f63
 <dead_ogonek> <dead_grave> <Greek_omega>                : "ὣ"  U1f63
-<U0314> <dead_grave> <Greek_omega>                : "ὣ"  U1f63
 <dead_dasia> <dead_grave> <Greek_omega>                : "ὣ"  U1f63
 <dead_grave> <dead_ogonek> <Greek_omega>                : "ὣ"  U1f63
-<dead_grave> <U0314> <Greek_omega>                : "ὣ"  U1f63
 <dead_grave> <dead_dasia> <Greek_omega>                : "ὣ"  U1f63
 <Multi_key> <greater> <apostrophe> <Greek_omega>        : "ὤ"  U1f64
 <Multi_key> <apostrophe> <greater> <Greek_omega>        : "ὤ"  U1f64
 <dead_horn> <dead_acute> <Greek_omega>                  : "ὤ"  U1f64
-<U0313> <dead_acute> <Greek_omega>                  : "ὤ"  U1f64
 <dead_psili> <dead_acute> <Greek_omega>                  : "ὤ"  U1f64
 <dead_acute> <dead_horn> <Greek_omega>                  : "ὤ"  U1f64
-<dead_acute> <U0313> <Greek_omega>                  : "ὤ"  U1f64
 <dead_acute> <dead_psili> <Greek_omega>                  : "ὤ"  U1f64
 <Multi_key> <less> <apostrophe> <Greek_omega>           : "ὥ"  U1f65
 <Multi_key> <apostrophe> <less> <Greek_omega>           : "ὥ"  U1f65
 <dead_ogonek> <dead_acute> <Greek_omega>                : "ὥ"  U1f65
-<U0314> <dead_acute> <Greek_omega>                : "ὥ"  U1f65
 <dead_dasia> <dead_acute> <Greek_omega>                : "ὥ"  U1f65
 <dead_acute> <dead_ogonek> <Greek_omega>                : "ὥ"  U1f65
-<dead_acute> <U0314> <Greek_omega>                : "ὥ"  U1f65
 <dead_acute> <dead_dasia> <Greek_omega>                : "ὥ"  U1f65
 <Multi_key> <greater> <asciitilde> <Greek_omega>        : "ὦ"  U1f66
 <Multi_key> <asciitilde> <greater> <Greek_omega>        : "ὦ"  U1f66
 <dead_horn> <dead_tilde> <Greek_omega>                  : "ὦ"  U1f66
-<U0313> <dead_tilde> <Greek_omega>                  : "ὦ"  U1f66
 <dead_psili> <dead_tilde> <Greek_omega>                  : "ὦ"  U1f66
 <dead_tilde> <dead_horn> <Greek_omega>                  : "ὦ"  U1f66
-<dead_tilde> <U0313> <Greek_omega>                  : "ὦ"  U1f66
 <dead_tilde> <dead_psili> <Greek_omega>                  : "ὦ"  U1f66
 <Multi_key> <less> <asciitilde> <Greek_omega>           : "ὧ"  U1f67
 <Multi_key> <asciitilde> <less> <Greek_omega>           : "ὧ"  U1f67
 <dead_ogonek> <dead_tilde> <Greek_omega>                : "ὧ"  U1f67
-<U0314> <dead_tilde> <Greek_omega>                : "ὧ"  U1f67
 <dead_dasia> <dead_tilde> <Greek_omega>                : "ὧ"  U1f67
 <dead_tilde> <dead_ogonek> <Greek_omega>                : "ὧ"  U1f67
-<dead_tilde> <U0314> <Greek_omega>                : "ὧ"  U1f67
 <dead_tilde> <dead_dasia> <Greek_omega>                : "ὧ"  U1f67
 <Multi_key> <greater> <Greek_OMEGA>                     : "Ὠ"  U1f68
 <dead_horn> <Greek_OMEGA>                               : "Ὠ"  U1f68
-<U0313> <Greek_OMEGA>                               : "Ὠ"  U1f68
 <dead_psili> <Greek_OMEGA>                               : "Ὠ"  U1f68
 <Multi_key> <less> <Greek_OMEGA>                        : "Ὡ"  U1f69
 <dead_ogonek> <Greek_OMEGA>                             : "Ὡ"  U1f69
-<U0314> <Greek_OMEGA>                             : "Ὡ"  U1f69
 <dead_dasia> <Greek_OMEGA>                             : "Ὡ"  U1f69
 <Multi_key> <greater> <grave> <Greek_OMEGA>             : "Ὢ"  U1f6a
 <Multi_key> <grave> <greater> <Greek_OMEGA>             : "Ὢ"  U1f6a
 <dead_horn> <dead_grave> <Greek_OMEGA>                  : "Ὢ"  U1f6a
-<U0313> <dead_grave> <Greek_OMEGA>                  : "Ὢ"  U1f6a
 <dead_psili> <dead_grave> <Greek_OMEGA>                  : "Ὢ"  U1f6a
 <dead_grave> <dead_horn> <Greek_OMEGA>                  : "Ὢ"  U1f6a
-<dead_grave> <U0313> <Greek_OMEGA>                  : "Ὢ"  U1f6a
 <dead_grave> <dead_psili> <Greek_OMEGA>                  : "Ὢ"  U1f6a
 <Multi_key> <less> <grave> <Greek_OMEGA>                : "Ὣ"  U1f6b
 <Multi_key> <grave> <less> <Greek_OMEGA>                : "Ὣ"  U1f6b
 <dead_ogonek> <dead_grave> <Greek_OMEGA>                : "Ὣ"  U1f6b
-<U0314> <dead_grave> <Greek_OMEGA>                : "Ὣ"  U1f6b
 <dead_dasia> <dead_grave> <Greek_OMEGA>                : "Ὣ"  U1f6b
 <dead_grave> <dead_ogonek> <Greek_OMEGA>                : "Ὣ"  U1f6b
-<dead_grave> <U0314> <Greek_OMEGA>                : "Ὣ"  U1f6b
 <dead_grave> <dead_dasia> <Greek_OMEGA>                : "Ὣ"  U1f6b
 <Multi_key> <greater> <apostrophe> <Greek_OMEGA>        : "Ὤ"  U1f6c
 <Multi_key> <apostrophe> <greater> <Greek_OMEGA>        : "Ὤ"  U1f6c
 <dead_horn> <dead_acute> <Greek_OMEGA>                  : "Ὤ"  U1f6c
-<U0313> <dead_acute> <Greek_OMEGA>                  : "Ὤ"  U1f6c
 <dead_psili> <dead_acute> <Greek_OMEGA>                  : "Ὤ"  U1f6c
 <dead_acute> <dead_horn> <Greek_OMEGA>                  : "Ὤ"  U1f6c
-<dead_acute> <U0313> <Greek_OMEGA>                  : "Ὤ"  U1f6c
 <dead_acute> <dead_psili> <Greek_OMEGA>                  : "Ὤ"  U1f6c
 <Multi_key> <less> <apostrophe> <Greek_OMEGA>           : "Ὥ"  U1f6d
 <Multi_key> <apostrophe> <less> <Greek_OMEGA>           : "Ὥ"  U1f6d
 <dead_ogonek> <dead_acute> <Greek_OMEGA>                : "Ὥ"  U1f6d
-<U0314> <dead_acute> <Greek_OMEGA>                : "Ὥ"  U1f6d
 <dead_dasia> <dead_acute> <Greek_OMEGA>                : "Ὥ"  U1f6d
 <dead_acute> <dead_ogonek> <Greek_OMEGA>                : "Ὥ"  U1f6d
-<dead_acute> <U0314> <Greek_OMEGA>                : "Ὥ"  U1f6d
 <dead_acute> <dead_dasia> <Greek_OMEGA>                : "Ὥ"  U1f6d
 <Multi_key> <greater> <asciitilde> <Greek_OMEGA>        : "Ὦ"  U1f6e
 <Multi_key> <asciitilde> <greater> <Greek_OMEGA>        : "Ὦ"  U1f6e
 <dead_horn> <dead_tilde> <Greek_OMEGA>                  : "Ὦ"  U1f6e
-<U0313> <dead_tilde> <Greek_OMEGA>                  : "Ὦ"  U1f6e
 <dead_psili> <dead_tilde> <Greek_OMEGA>                  : "Ὦ"  U1f6e
 <dead_tilde> <dead_horn> <Greek_OMEGA>                  : "Ὦ"  U1f6e
-<dead_tilde> <U0313> <Greek_OMEGA>                  : "Ὦ"  U1f6e
 <dead_tilde> <dead_psili> <Greek_OMEGA>                  : "Ὦ"  U1f6e
 <Multi_key> <less> <asciitilde> <Greek_OMEGA>           : "Ὧ"  U1f6f
 <Multi_key> <asciitilde> <less> <Greek_OMEGA>           : "Ὧ"  U1f6f
 <dead_ogonek> <dead_tilde> <Greek_OMEGA>                : "Ὧ"  U1f6f
-<U0314> <dead_tilde> <Greek_OMEGA>                : "Ὧ"  U1f6f
 <dead_dasia> <dead_tilde> <Greek_OMEGA>                : "Ὧ"  U1f6f
 <dead_tilde> <dead_ogonek> <Greek_OMEGA>                : "Ὧ"  U1f6f
-<dead_tilde> <U0314> <Greek_OMEGA>                : "Ὧ"  U1f6f
 <dead_tilde> <dead_dasia> <Greek_OMEGA>                : "Ὧ"  U1f6f
 <Multi_key> <grave> <Greek_alpha>                       : "ὰ"  U1f70
 <dead_grave> <Greek_alpha>                              : "ὰ"  U1f70
@@ -1123,18 +950,14 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <bar> <greater> <Greek_alpha>               : "ᾀ"  U1f80
 <Multi_key> <greater> <bar> <Greek_alpha>               : "ᾀ"  U1f80
 <dead_iota> <dead_horn> <Greek_alpha>                   : "ᾀ"  U1f80
-<dead_iota> <U0313> <Greek_alpha>                   : "ᾀ"  U1f80
 <dead_iota> <dead_psili> <Greek_alpha>                   : "ᾀ"  U1f80
 <dead_horn> <dead_iota> <Greek_alpha>                   : "ᾀ"  U1f80
-<U0313> <dead_iota> <Greek_alpha>                   : "ᾀ"  U1f80
 <dead_psili> <dead_iota> <Greek_alpha>                   : "ᾀ"  U1f80
 <Multi_key> <bar> <less> <Greek_alpha>                  : "ᾁ"  U1f81
 <Multi_key> <less> <bar> <Greek_alpha>                  : "ᾁ"  U1f81
 <dead_iota> <dead_ogonek> <Greek_alpha>                 : "ᾁ"  U1f81
-<dead_iota> <U0314> <Greek_alpha>                 : "ᾁ"  U1f81
 <dead_iota> <dead_dasia> <Greek_alpha>                 : "ᾁ"  U1f81
 <dead_ogonek> <dead_iota> <Greek_alpha>                 : "ᾁ"  U1f81
-<U0314> <dead_iota> <Greek_alpha>                 : "ᾁ"  U1f81
 <dead_dasia> <dead_iota> <Greek_alpha>                 : "ᾁ"  U1f81
 <Multi_key> <bar> <greater> <grave> <Greek_alpha>       : "ᾂ"  U1f82
 <Multi_key> <bar> <grave> <greater> <Greek_alpha>       : "ᾂ"  U1f82
@@ -1143,22 +966,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <greater> <Greek_alpha>       : "ᾂ"  U1f82
 <Multi_key> <grave> <greater> <bar> <Greek_alpha>       : "ᾂ"  U1f82
 <dead_iota> <dead_horn> <dead_grave> <Greek_alpha>      : "ᾂ"  U1f82
-<dead_iota> <U0313> <dead_grave> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_iota> <dead_psili> <dead_grave> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_iota> <dead_grave> <dead_horn> <Greek_alpha>      : "ᾂ"  U1f82
-<dead_iota> <dead_grave> <U0313> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_iota> <dead_grave> <dead_psili> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_horn> <dead_iota> <dead_grave> <Greek_alpha>      : "ᾂ"  U1f82
-<U0313> <dead_iota> <dead_grave> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_psili> <dead_iota> <dead_grave> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_horn> <dead_grave> <dead_iota> <Greek_alpha>      : "ᾂ"  U1f82
-<U0313> <dead_grave> <dead_iota> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_psili> <dead_grave> <dead_iota> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_grave> <dead_iota> <dead_horn> <Greek_alpha>      : "ᾂ"  U1f82
-<dead_grave> <dead_iota> <U0313> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_grave> <dead_iota> <dead_psili> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_grave> <dead_horn> <dead_iota> <Greek_alpha>      : "ᾂ"  U1f82
-<dead_grave> <U0313> <dead_iota> <Greek_alpha>      : "ᾂ"  U1f82
 <dead_grave> <dead_psili> <dead_iota> <Greek_alpha>      : "ᾂ"  U1f82
 <Multi_key> <bar> <less> <grave> <Greek_alpha>          : "ᾃ"  U1f83
 <Multi_key> <bar> <grave> <less> <Greek_alpha>          : "ᾃ"  U1f83
@@ -1167,22 +984,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <less> <Greek_alpha>          : "ᾃ"  U1f83
 <Multi_key> <grave> <less> <bar> <Greek_alpha>          : "ᾃ"  U1f83
 <dead_iota> <dead_ogonek> <dead_grave> <Greek_alpha>    : "ᾃ"  U1f83
-<dead_iota> <U0314> <dead_grave> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_iota> <dead_dasia> <dead_grave> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_iota> <dead_grave> <dead_ogonek> <Greek_alpha>    : "ᾃ"  U1f83
-<dead_iota> <dead_grave> <U0314> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_iota> <dead_grave> <dead_dasia> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_ogonek> <dead_iota> <dead_grave> <Greek_alpha>    : "ᾃ"  U1f83
-<U0314> <dead_iota> <dead_grave> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_dasia> <dead_iota> <dead_grave> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_ogonek> <dead_grave> <dead_iota> <Greek_alpha>    : "ᾃ"  U1f83
-<U0314> <dead_grave> <dead_iota> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_dasia> <dead_grave> <dead_iota> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_grave> <dead_iota> <dead_ogonek> <Greek_alpha>    : "ᾃ"  U1f83
-<dead_grave> <dead_iota> <U0314> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_grave> <dead_iota> <dead_dasia> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_grave> <dead_ogonek> <dead_iota> <Greek_alpha>    : "ᾃ"  U1f83
-<dead_grave> <U0314> <dead_iota> <Greek_alpha>    : "ᾃ"  U1f83
 <dead_grave> <dead_dasia> <dead_iota> <Greek_alpha>    : "ᾃ"  U1f83
 <Multi_key> <bar> <greater> <apostrophe> <Greek_alpha>  : "ᾄ"  U1f84
 <Multi_key> <bar> <apostrophe> <greater> <Greek_alpha>  : "ᾄ"  U1f84
@@ -1191,22 +1002,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <greater> <Greek_alpha>  : "ᾄ"  U1f84
 <Multi_key> <apostrophe> <greater> <bar> <Greek_alpha>  : "ᾄ"  U1f84
 <dead_iota> <dead_horn> <dead_acute> <Greek_alpha>      : "ᾄ"  U1f84
-<dead_iota> <U0313> <dead_acute> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_iota> <dead_psili> <dead_acute> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_iota> <dead_acute> <dead_horn> <Greek_alpha>      : "ᾄ"  U1f84
-<dead_iota> <dead_acute> <U0313> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_iota> <dead_acute> <dead_psili> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_horn> <dead_iota> <dead_acute> <Greek_alpha>      : "ᾄ"  U1f84
-<U0313> <dead_iota> <dead_acute> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_psili> <dead_iota> <dead_acute> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_horn> <dead_acute> <dead_iota> <Greek_alpha>      : "ᾄ"  U1f84
-<U0313> <dead_acute> <dead_iota> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_psili> <dead_acute> <dead_iota> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_acute> <dead_iota> <dead_horn> <Greek_alpha>      : "ᾄ"  U1f84
-<dead_acute> <dead_iota> <U0313> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_acute> <dead_iota> <dead_psili> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_acute> <dead_horn> <dead_iota> <Greek_alpha>      : "ᾄ"  U1f84
-<dead_acute> <U0313> <dead_iota> <Greek_alpha>      : "ᾄ"  U1f84
 <dead_acute> <dead_psili> <dead_iota> <Greek_alpha>      : "ᾄ"  U1f84
 <Multi_key> <bar> <less> <apostrophe> <Greek_alpha>     : "ᾅ"  U1f85
 <Multi_key> <bar> <apostrophe> <less> <Greek_alpha>     : "ᾅ"  U1f85
@@ -1215,22 +1020,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <less> <Greek_alpha>     : "ᾅ"  U1f85
 <Multi_key> <apostrophe> <less> <bar> <Greek_alpha>     : "ᾅ"  U1f85
 <dead_iota> <dead_ogonek> <dead_acute> <Greek_alpha>    : "ᾅ"  U1f85
-<dead_iota> <U0314> <dead_acute> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_iota> <dead_dasia> <dead_acute> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_iota> <dead_acute> <dead_ogonek> <Greek_alpha>    : "ᾅ"  U1f85
-<dead_iota> <dead_acute> <U0314> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_iota> <dead_acute> <dead_dasia> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_ogonek> <dead_iota> <dead_acute> <Greek_alpha>    : "ᾅ"  U1f85
-<U0314> <dead_iota> <dead_acute> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_dasia> <dead_iota> <dead_acute> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_ogonek> <dead_acute> <dead_iota> <Greek_alpha>    : "ᾅ"  U1f85
-<U0314> <dead_acute> <dead_iota> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_dasia> <dead_acute> <dead_iota> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_acute> <dead_iota> <dead_ogonek> <Greek_alpha>    : "ᾅ"  U1f85
-<dead_acute> <dead_iota> <U0314> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_acute> <dead_iota> <dead_dasia> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_acute> <dead_ogonek> <dead_iota> <Greek_alpha>    : "ᾅ"  U1f85
-<dead_acute> <U0314> <dead_iota> <Greek_alpha>    : "ᾅ"  U1f85
 <dead_acute> <dead_dasia> <dead_iota> <Greek_alpha>    : "ᾅ"  U1f85
 <Multi_key> <bar> <greater> <asciitilde> <Greek_alpha>  : "ᾆ"  U1f86
 <Multi_key> <bar> <asciitilde> <greater> <Greek_alpha>  : "ᾆ"  U1f86
@@ -1239,22 +1038,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <greater> <Greek_alpha>  : "ᾆ"  U1f86
 <Multi_key> <asciitilde> <greater> <bar> <Greek_alpha>  : "ᾆ"  U1f86
 <dead_iota> <dead_horn> <dead_tilde> <Greek_alpha>      : "ᾆ"  U1f86
-<dead_iota> <U0313> <dead_tilde> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_iota> <dead_psili> <dead_tilde> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_iota> <dead_tilde> <dead_horn> <Greek_alpha>      : "ᾆ"  U1f86
-<dead_iota> <dead_tilde> <U0313> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_iota> <dead_tilde> <dead_psili> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_horn> <dead_iota> <dead_tilde> <Greek_alpha>      : "ᾆ"  U1f86
-<U0313> <dead_iota> <dead_tilde> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_psili> <dead_iota> <dead_tilde> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_horn> <dead_tilde> <dead_iota> <Greek_alpha>      : "ᾆ"  U1f86
-<U0313> <dead_tilde> <dead_iota> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_psili> <dead_tilde> <dead_iota> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_tilde> <dead_iota> <dead_horn> <Greek_alpha>      : "ᾆ"  U1f86
-<dead_tilde> <dead_iota> <U0313> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_tilde> <dead_iota> <dead_psili> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_tilde> <dead_horn> <dead_iota> <Greek_alpha>      : "ᾆ"  U1f86
-<dead_tilde> <U0313> <dead_iota> <Greek_alpha>      : "ᾆ"  U1f86
 <dead_tilde> <dead_psili> <dead_iota> <Greek_alpha>      : "ᾆ"  U1f86
 <Multi_key> <bar> <less> <asciitilde> <Greek_alpha>     : "ᾇ"  U1f87
 <Multi_key> <bar> <asciitilde> <less> <Greek_alpha>     : "ᾇ"  U1f87
@@ -1263,38 +1056,28 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <less> <Greek_alpha>     : "ᾇ"  U1f87
 <Multi_key> <asciitilde> <less> <bar> <Greek_alpha>     : "ᾇ"  U1f87
 <dead_iota> <dead_ogonek> <dead_tilde> <Greek_alpha>    : "ᾇ"  U1f87
-<dead_iota> <U0314> <dead_tilde> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_iota> <dead_dasia> <dead_tilde> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_iota> <dead_tilde> <dead_ogonek> <Greek_alpha>    : "ᾇ"  U1f87
-<dead_iota> <dead_tilde> <U0314> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_ogonek> <dead_iota> <dead_tilde> <Greek_alpha>    : "ᾇ"  U1f87
-<U0314> <dead_iota> <dead_tilde> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_dasia> <dead_iota> <dead_tilde> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_ogonek> <dead_tilde> <dead_iota> <Greek_alpha>    : "ᾇ"  U1f87
-<U0314> <dead_tilde> <dead_iota> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_dasia> <dead_tilde> <dead_iota> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_tilde> <dead_iota> <dead_ogonek> <Greek_alpha>    : "ᾇ"  U1f87
-<dead_tilde> <dead_iota> <U0314> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_tilde> <dead_iota> <dead_dasia> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_tilde> <dead_ogonek> <dead_iota> <Greek_alpha>    : "ᾇ"  U1f87
-<dead_tilde> <U0314> <dead_iota> <Greek_alpha>    : "ᾇ"  U1f87
 <dead_tilde> <dead_dasia> <dead_iota> <Greek_alpha>    : "ᾇ"  U1f87
 <Multi_key> <bar> <greater> <Greek_ALPHA>               : "ᾈ"  U1f88
 <Multi_key> <greater> <bar> <Greek_ALPHA>               : "ᾈ"  U1f88
 <dead_iota> <dead_horn> <Greek_ALPHA>                   : "ᾈ"  U1f88
-<dead_iota> <U0313> <Greek_ALPHA>                   : "ᾈ"  U1f88
 <dead_iota> <dead_psili> <Greek_ALPHA>                   : "ᾈ"  U1f88
 <dead_horn> <dead_iota> <Greek_ALPHA>                   : "ᾈ"  U1f88
-<U0313> <dead_iota> <Greek_ALPHA>                   : "ᾈ"  U1f88
 <dead_psili> <dead_iota> <Greek_ALPHA>                   : "ᾈ"  U1f88
 <Multi_key> <bar> <less> <Greek_ALPHA>                  : "ᾉ"  U1f89
 <Multi_key> <less> <bar> <Greek_ALPHA>                  : "ᾉ"  U1f89
 <dead_iota> <dead_ogonek> <Greek_ALPHA>                 : "ᾉ"  U1f89
-<dead_iota> <U0314> <Greek_ALPHA>                 : "ᾉ"  U1f89
 <dead_iota> <dead_dasia> <Greek_ALPHA>                 : "ᾉ"  U1f89
 <dead_ogonek> <dead_iota> <Greek_ALPHA>                 : "ᾉ"  U1f89
-<U0314> <dead_iota> <Greek_ALPHA>                 : "ᾉ"  U1f89
 <dead_dasia> <dead_iota> <Greek_ALPHA>                 : "ᾉ"  U1f89
 <Multi_key> <bar> <greater> <grave> <Greek_ALPHA>       : "ᾊ"  U1f8a
 <Multi_key> <bar> <grave> <greater> <Greek_ALPHA>       : "ᾊ"  U1f8a
@@ -1303,22 +1086,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <greater> <Greek_ALPHA>       : "ᾊ"  U1f8a
 <Multi_key> <grave> <greater> <bar> <Greek_ALPHA>       : "ᾊ"  U1f8a
 <dead_iota> <dead_horn> <dead_grave> <Greek_ALPHA>      : "ᾊ"  U1f8a
-<dead_iota> <U0313> <dead_grave> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_iota> <dead_psili> <dead_grave> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_iota> <dead_grave> <dead_horn> <Greek_ALPHA>      : "ᾊ"  U1f8a
-<dead_iota> <dead_grave> <U0313> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_iota> <dead_grave> <dead_psili> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_horn> <dead_iota> <dead_grave> <Greek_ALPHA>      : "ᾊ"  U1f8a
-<U0313> <dead_iota> <dead_grave> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_psili> <dead_iota> <dead_grave> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_horn> <dead_grave> <dead_iota> <Greek_ALPHA>      : "ᾊ"  U1f8a
-<U0313> <dead_grave> <dead_iota> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_psili> <dead_grave> <dead_iota> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_grave> <dead_iota> <dead_horn> <Greek_ALPHA>      : "ᾊ"  U1f8a
-<dead_grave> <dead_iota> <U0313> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_grave> <dead_iota> <dead_psili> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_grave> <dead_horn> <dead_iota> <Greek_ALPHA>      : "ᾊ"  U1f8a
-<dead_grave> <U0313> <dead_iota> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <dead_grave> <dead_psili> <dead_iota> <Greek_ALPHA>      : "ᾊ"  U1f8a
 <Multi_key> <bar> <less> <grave> <Greek_ALPHA>          : "ᾋ"  U1f8b
 <Multi_key> <bar> <grave> <less> <Greek_ALPHA>          : "ᾋ"  U1f8b
@@ -1327,22 +1104,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <less> <Greek_ALPHA>          : "ᾋ"  U1f8b
 <Multi_key> <grave> <less> <bar> <Greek_ALPHA>          : "ᾋ"  U1f8b
 <dead_iota> <dead_ogonek> <dead_grave> <Greek_ALPHA>    : "ᾋ"  U1f8b
-<dead_iota> <U0314> <dead_grave> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_iota> <dead_dasia> <dead_grave> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_iota> <dead_grave> <dead_ogonek> <Greek_ALPHA>    : "ᾋ"  U1f8b
-<dead_iota> <dead_grave> <U0314> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_iota> <dead_grave> <dead_dasia> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_ogonek> <dead_iota> <dead_grave> <Greek_ALPHA>    : "ᾋ"  U1f8b
-<U0314> <dead_iota> <dead_grave> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_dasia> <dead_iota> <dead_grave> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_ogonek> <dead_grave> <dead_iota> <Greek_ALPHA>    : "ᾋ"  U1f8b
-<U0314> <dead_grave> <dead_iota> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_dasia> <dead_grave> <dead_iota> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_grave> <dead_iota> <dead_ogonek> <Greek_ALPHA>    : "ᾋ"  U1f8b
-<dead_grave> <dead_iota> <U0314> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_grave> <dead_iota> <dead_dasia> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_grave> <dead_ogonek> <dead_iota> <Greek_ALPHA>    : "ᾋ"  U1f8b
-<dead_grave> <U0314> <dead_iota> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <dead_grave> <dead_dasia> <dead_iota> <Greek_ALPHA>    : "ᾋ"  U1f8b
 <Multi_key> <bar> <greater> <apostrophe> <Greek_ALPHA>  : "ᾌ"  U1f8c
 <Multi_key> <bar> <apostrophe> <greater> <Greek_ALPHA>  : "ᾌ"  U1f8c
@@ -1351,22 +1122,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <greater> <Greek_ALPHA>  : "ᾌ"  U1f8c
 <Multi_key> <apostrophe> <greater> <bar> <Greek_ALPHA>  : "ᾌ"  U1f8c
 <dead_iota> <dead_horn> <dead_acute> <Greek_ALPHA>      : "ᾌ"  U1f8c
-<dead_iota> <U0313> <dead_acute> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_iota> <dead_psili> <dead_acute> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_iota> <dead_acute> <dead_horn> <Greek_ALPHA>      : "ᾌ"  U1f8c
-<dead_iota> <dead_acute> <U0313> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_iota> <dead_acute> <dead_psili> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_horn> <dead_iota> <dead_acute> <Greek_ALPHA>      : "ᾌ"  U1f8c
-<U0313> <dead_iota> <dead_acute> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_psili> <dead_iota> <dead_acute> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_horn> <dead_acute> <dead_iota> <Greek_ALPHA>      : "ᾌ"  U1f8c
-<U0313> <dead_acute> <dead_iota> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_psili> <dead_acute> <dead_iota> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_acute> <dead_iota> <dead_horn> <Greek_ALPHA>      : "ᾌ"  U1f8c
-<dead_acute> <dead_iota> <U0313> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_acute> <dead_iota> <dead_psili> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_acute> <dead_horn> <dead_iota> <Greek_ALPHA>      : "ᾌ"  U1f8c
-<dead_acute> <U0313> <dead_iota> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <dead_acute> <dead_psili> <dead_iota> <Greek_ALPHA>      : "ᾌ"  U1f8c
 <Multi_key> <bar> <less> <apostrophe> <Greek_ALPHA>     : "ᾍ"  U1f8d
 <Multi_key> <bar> <apostrophe> <less> <Greek_ALPHA>     : "ᾍ"  U1f8d
@@ -1375,22 +1140,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <less> <Greek_ALPHA>     : "ᾍ"  U1f8d
 <Multi_key> <apostrophe> <less> <bar> <Greek_ALPHA>     : "ᾍ"  U1f8d
 <dead_iota> <dead_ogonek> <dead_acute> <Greek_ALPHA>    : "ᾍ"  U1f8d
-<dead_iota> <U0314> <dead_acute> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_iota> <dead_dasia> <dead_acute> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_iota> <dead_acute> <dead_ogonek> <Greek_ALPHA>    : "ᾍ"  U1f8d
-<dead_iota> <dead_acute> <U0314> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_iota> <dead_acute> <dead_dasia> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_ogonek> <dead_iota> <dead_acute> <Greek_ALPHA>    : "ᾍ"  U1f8d
-<U0314> <dead_iota> <dead_acute> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_dasia> <dead_iota> <dead_acute> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_ogonek> <dead_acute> <dead_iota> <Greek_ALPHA>    : "ᾍ"  U1f8d
-<U0314> <dead_acute> <dead_iota> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_dasia> <dead_acute> <dead_iota> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_acute> <dead_iota> <dead_ogonek> <Greek_ALPHA>    : "ᾍ"  U1f8d
-<dead_acute> <dead_iota> <U0314> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_acute> <dead_iota> <dead_dasia> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_acute> <dead_ogonek> <dead_iota> <Greek_ALPHA>    : "ᾍ"  U1f8d
-<dead_acute> <U0314> <dead_iota> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <dead_acute> <dead_dasia> <dead_iota> <Greek_ALPHA>    : "ᾍ"  U1f8d
 <Multi_key> <bar> <greater> <asciitilde> <Greek_ALPHA>  : "ᾎ"  U1f8e
 <Multi_key> <bar> <asciitilde> <greater> <Greek_ALPHA>  : "ᾎ"  U1f8e
@@ -1399,22 +1158,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <greater> <Greek_ALPHA>  : "ᾎ"  U1f8e
 <Multi_key> <asciitilde> <greater> <bar> <Greek_ALPHA>  : "ᾎ"  U1f8e
 <dead_iota> <dead_horn> <dead_tilde> <Greek_ALPHA>      : "ᾎ"  U1f8e
-<dead_iota> <U0313> <dead_tilde> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_iota> <dead_psili> <dead_tilde> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_iota> <dead_tilde> <dead_horn> <Greek_ALPHA>      : "ᾎ"  U1f8e
-<dead_iota> <dead_tilde> <U0313> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_iota> <dead_tilde> <dead_psili> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_horn> <dead_iota> <dead_tilde> <Greek_ALPHA>      : "ᾎ"  U1f8e
-<U0313> <dead_iota> <dead_tilde> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_psili> <dead_iota> <dead_tilde> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_horn> <dead_tilde> <dead_iota> <Greek_ALPHA>      : "ᾎ"  U1f8e
-<U0313> <dead_tilde> <dead_iota> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_psili> <dead_tilde> <dead_iota> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_tilde> <dead_iota> <dead_horn> <Greek_ALPHA>      : "ᾎ"  U1f8e
-<dead_tilde> <dead_iota> <U0313> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_tilde> <dead_iota> <dead_psili> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_tilde> <dead_horn> <dead_iota> <Greek_ALPHA>      : "ᾎ"  U1f8e
-<dead_tilde> <U0313> <dead_iota> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <dead_tilde> <dead_psili> <dead_iota> <Greek_ALPHA>      : "ᾎ"  U1f8e
 <Multi_key> <bar> <less> <asciitilde> <Greek_ALPHA>     : "ᾏ"  U1f8f
 <Multi_key> <bar> <asciitilde> <less> <Greek_ALPHA>     : "ᾏ"  U1f8f
@@ -1423,38 +1176,28 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <less> <Greek_ALPHA>     : "ᾏ"  U1f8f
 <Multi_key> <asciitilde> <less> <bar> <Greek_ALPHA>     : "ᾏ"  U1f8f
 <dead_iota> <dead_ogonek> <dead_tilde> <Greek_ALPHA>    : "ᾏ"  U1f8f
-<dead_iota> <U0314> <dead_tilde> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_iota> <dead_dasia> <dead_tilde> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_iota> <dead_tilde> <dead_ogonek> <Greek_ALPHA>    : "ᾏ"  U1f8f
-<dead_iota> <dead_tilde> <U0314> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_ogonek> <dead_iota> <dead_tilde> <Greek_ALPHA>    : "ᾏ"  U1f8f
-<U0314> <dead_iota> <dead_tilde> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_dasia> <dead_iota> <dead_tilde> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_ogonek> <dead_tilde> <dead_iota> <Greek_ALPHA>    : "ᾏ"  U1f8f
-<U0314> <dead_tilde> <dead_iota> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_dasia> <dead_tilde> <dead_iota> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_tilde> <dead_iota> <dead_ogonek> <Greek_ALPHA>    : "ᾏ"  U1f8f
-<dead_tilde> <dead_iota> <U0314> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_tilde> <dead_iota> <dead_dasia> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_tilde> <dead_ogonek> <dead_iota> <Greek_ALPHA>    : "ᾏ"  U1f8f
-<dead_tilde> <U0314> <dead_iota> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <dead_tilde> <dead_dasia> <dead_iota> <Greek_ALPHA>    : "ᾏ"  U1f8f
 <Multi_key> <bar> <greater> <Greek_eta>                 : "ᾐ"  U1f90
 <Multi_key> <greater> <bar> <Greek_eta>                 : "ᾐ"  U1f90
 <dead_iota> <dead_horn> <Greek_eta>                     : "ᾐ"  U1f90
-<dead_iota> <U0313> <Greek_eta>                     : "ᾐ"  U1f90
 <dead_iota> <dead_psili> <Greek_eta>                     : "ᾐ"  U1f90
 <dead_horn> <dead_iota> <Greek_eta>                     : "ᾐ"  U1f90
-<U0313> <dead_iota> <Greek_eta>                     : "ᾐ"  U1f90
 <dead_psili> <dead_iota> <Greek_eta>                     : "ᾐ"  U1f90
 <Multi_key> <bar> <less> <Greek_eta>                    : "ᾑ"  U1f91
 <Multi_key> <less> <bar> <Greek_eta>                    : "ᾑ"  U1f91
 <dead_iota> <dead_ogonek> <Greek_eta>                   : "ᾑ"  U1f91
-<dead_iota> <U0314> <Greek_eta>                   : "ᾑ"  U1f91
 <dead_iota> <dead_dasia> <Greek_eta>                   : "ᾑ"  U1f91
 <dead_ogonek> <dead_iota> <Greek_eta>                   : "ᾑ"  U1f91
-<U0314> <dead_iota> <Greek_eta>                   : "ᾑ"  U1f91
 <dead_dasia> <dead_iota> <Greek_eta>                   : "ᾑ"  U1f91
 <Multi_key> <bar> <greater> <grave> <Greek_eta>         : "ᾒ"  U1f92
 <Multi_key> <bar> <grave> <greater> <Greek_eta>         : "ᾒ"  U1f92
@@ -1463,22 +1206,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <greater> <Greek_eta>         : "ᾒ"  U1f92
 <Multi_key> <grave> <greater> <bar> <Greek_eta>         : "ᾒ"  U1f92
 <dead_iota> <dead_horn> <dead_grave> <Greek_eta>        : "ᾒ"  U1f92
-<dead_iota> <U0313> <dead_grave> <Greek_eta>        : "ᾒ"  U1f92
 <dead_iota> <dead_psili> <dead_grave> <Greek_eta>        : "ᾒ"  U1f92
 <dead_iota> <dead_grave> <dead_horn> <Greek_eta>        : "ᾒ"  U1f92
-<dead_iota> <dead_grave> <U0313> <Greek_eta>        : "ᾒ"  U1f92
 <dead_iota> <dead_grave> <dead_psili> <Greek_eta>        : "ᾒ"  U1f92
 <dead_horn> <dead_iota> <dead_grave> <Greek_eta>        : "ᾒ"  U1f92
-<U0313> <dead_iota> <dead_grave> <Greek_eta>        : "ᾒ"  U1f92
 <dead_psili> <dead_iota> <dead_grave> <Greek_eta>        : "ᾒ"  U1f92
 <dead_horn> <dead_grave> <dead_iota> <Greek_eta>        : "ᾒ"  U1f92
-<U0313> <dead_grave> <dead_iota> <Greek_eta>        : "ᾒ"  U1f92
 <dead_psili> <dead_grave> <dead_iota> <Greek_eta>        : "ᾒ"  U1f92
 <dead_grave> <dead_iota> <dead_horn> <Greek_eta>        : "ᾒ"  U1f92
-<dead_grave> <dead_iota> <U0313> <Greek_eta>        : "ᾒ"  U1f92
 <dead_grave> <dead_iota> <dead_psili> <Greek_eta>        : "ᾒ"  U1f92
 <dead_grave> <dead_horn> <dead_iota> <Greek_eta>        : "ᾒ"  U1f92
-<dead_grave> <U0313> <dead_iota> <Greek_eta>        : "ᾒ"  U1f92
 <dead_grave> <dead_psili> <dead_iota> <Greek_eta>        : "ᾒ"  U1f92
 <Multi_key> <bar> <less> <grave> <Greek_eta>            : "ᾓ"  U1f93
 <Multi_key> <bar> <grave> <less> <Greek_eta>            : "ᾓ"  U1f93
@@ -1487,22 +1224,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <less> <Greek_eta>            : "ᾓ"  U1f93
 <Multi_key> <grave> <less> <bar> <Greek_eta>            : "ᾓ"  U1f93
 <dead_iota> <dead_ogonek> <dead_grave> <Greek_eta>      : "ᾓ"  U1f93
-<dead_iota> <U0314> <dead_grave> <Greek_eta>      : "ᾓ"  U1f93
 <dead_iota> <dead_dasia> <dead_grave> <Greek_eta>      : "ᾓ"  U1f93
 <dead_iota> <dead_grave> <dead_ogonek> <Greek_eta>      : "ᾓ"  U1f93
-<dead_iota> <dead_grave> <U0314> <Greek_eta>      : "ᾓ"  U1f93
 <dead_iota> <dead_grave> <dead_dasia> <Greek_eta>      : "ᾓ"  U1f93
 <dead_ogonek> <dead_iota> <dead_grave> <Greek_eta>      : "ᾓ"  U1f93
-<U0314> <dead_iota> <dead_grave> <Greek_eta>      : "ᾓ"  U1f93
 <dead_dasia> <dead_iota> <dead_grave> <Greek_eta>      : "ᾓ"  U1f93
 <dead_ogonek> <dead_grave> <dead_iota> <Greek_eta>      : "ᾓ"  U1f93
-<U0314> <dead_grave> <dead_iota> <Greek_eta>      : "ᾓ"  U1f93
 <dead_dasia> <dead_grave> <dead_iota> <Greek_eta>      : "ᾓ"  U1f93
 <dead_grave> <dead_iota> <dead_ogonek> <Greek_eta>      : "ᾓ"  U1f93
-<dead_grave> <dead_iota> <U0314> <Greek_eta>      : "ᾓ"  U1f93
 <dead_grave> <dead_iota> <dead_dasia> <Greek_eta>      : "ᾓ"  U1f93
 <dead_grave> <dead_ogonek> <dead_iota> <Greek_eta>      : "ᾓ"  U1f93
-<dead_grave> <U0314> <dead_iota> <Greek_eta>      : "ᾓ"  U1f93
 <dead_grave> <dead_dasia> <dead_iota> <Greek_eta>      : "ᾓ"  U1f93
 <Multi_key> <bar> <greater> <apostrophe> <Greek_eta>    : "ᾔ"  U1f94
 <Multi_key> <bar> <apostrophe> <greater> <Greek_eta>    : "ᾔ"  U1f94
@@ -1511,22 +1242,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <greater> <Greek_eta>    : "ᾔ"  U1f94
 <Multi_key> <apostrophe> <greater> <bar> <Greek_eta>    : "ᾔ"  U1f94
 <dead_iota> <dead_horn> <dead_acute> <Greek_eta>        : "ᾔ"  U1f94
-<dead_iota> <U0313> <dead_acute> <Greek_eta>        : "ᾔ"  U1f94
 <dead_iota> <dead_psili> <dead_acute> <Greek_eta>        : "ᾔ"  U1f94
 <dead_iota> <dead_acute> <dead_horn> <Greek_eta>        : "ᾔ"  U1f94
-<dead_iota> <dead_acute> <U0313> <Greek_eta>        : "ᾔ"  U1f94
 <dead_iota> <dead_acute> <dead_psili> <Greek_eta>        : "ᾔ"  U1f94
 <dead_horn> <dead_iota> <dead_acute> <Greek_eta>        : "ᾔ"  U1f94
-<U0313> <dead_iota> <dead_acute> <Greek_eta>        : "ᾔ"  U1f94
 <dead_psili> <dead_iota> <dead_acute> <Greek_eta>        : "ᾔ"  U1f94
 <dead_horn> <dead_acute> <dead_iota> <Greek_eta>        : "ᾔ"  U1f94
-<U0313> <dead_acute> <dead_iota> <Greek_eta>        : "ᾔ"  U1f94
 <dead_psili> <dead_acute> <dead_iota> <Greek_eta>        : "ᾔ"  U1f94
 <dead_acute> <dead_iota> <dead_horn> <Greek_eta>        : "ᾔ"  U1f94
-<dead_acute> <dead_iota> <U0313> <Greek_eta>        : "ᾔ"  U1f94
 <dead_acute> <dead_iota> <dead_psili> <Greek_eta>        : "ᾔ"  U1f94
 <dead_acute> <dead_horn> <dead_iota> <Greek_eta>        : "ᾔ"  U1f94
-<dead_acute> <U0313> <dead_iota> <Greek_eta>        : "ᾔ"  U1f94
 <dead_acute> <dead_psili> <dead_iota> <Greek_eta>        : "ᾔ"  U1f94
 <Multi_key> <bar> <less> <apostrophe> <Greek_eta>       : "ᾕ"  U1f95
 <Multi_key> <bar> <apostrophe> <less> <Greek_eta>       : "ᾕ"  U1f95
@@ -1535,22 +1260,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <less> <Greek_eta>       : "ᾕ"  U1f95
 <Multi_key> <apostrophe> <less> <bar> <Greek_eta>       : "ᾕ"  U1f95
 <dead_iota> <dead_ogonek> <dead_acute> <Greek_eta>      : "ᾕ"  U1f95
-<dead_iota> <U0314> <dead_acute> <Greek_eta>      : "ᾕ"  U1f95
 <dead_iota> <dead_dasia> <dead_acute> <Greek_eta>      : "ᾕ"  U1f95
 <dead_iota> <dead_acute> <dead_ogonek> <Greek_eta>      : "ᾕ"  U1f95
-<dead_iota> <dead_acute> <U0314> <Greek_eta>      : "ᾕ"  U1f95
 <dead_iota> <dead_acute> <dead_dasia> <Greek_eta>      : "ᾕ"  U1f95
 <dead_ogonek> <dead_iota> <dead_acute> <Greek_eta>      : "ᾕ"  U1f95
-<U0314> <dead_iota> <dead_acute> <Greek_eta>      : "ᾕ"  U1f95
 <dead_dasia> <dead_iota> <dead_acute> <Greek_eta>      : "ᾕ"  U1f95
 <dead_ogonek> <dead_acute> <dead_iota> <Greek_eta>      : "ᾕ"  U1f95
-<U0314> <dead_acute> <dead_iota> <Greek_eta>      : "ᾕ"  U1f95
 <dead_dasia> <dead_acute> <dead_iota> <Greek_eta>      : "ᾕ"  U1f95
 <dead_acute> <dead_iota> <dead_ogonek> <Greek_eta>      : "ᾕ"  U1f95
-<dead_acute> <dead_iota> <U0314> <Greek_eta>      : "ᾕ"  U1f95
 <dead_acute> <dead_iota> <dead_dasia> <Greek_eta>      : "ᾕ"  U1f95
 <dead_acute> <dead_ogonek> <dead_iota> <Greek_eta>      : "ᾕ"  U1f95
-<dead_acute> <U0314> <dead_iota> <Greek_eta>      : "ᾕ"  U1f95
 <dead_acute> <dead_dasia> <dead_iota> <Greek_eta>      : "ᾕ"  U1f95
 <Multi_key> <bar> <greater> <asciitilde> <Greek_eta>    : "ᾖ"  U1f96
 <Multi_key> <bar> <asciitilde> <greater> <Greek_eta>    : "ᾖ"  U1f96
@@ -1559,22 +1278,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <greater> <Greek_eta>    : "ᾖ"  U1f96
 <Multi_key> <asciitilde> <greater> <bar> <Greek_eta>    : "ᾖ"  U1f96
 <dead_iota> <dead_horn> <dead_tilde> <Greek_eta>        : "ᾖ"  U1f96
-<dead_iota> <U0313> <dead_tilde> <Greek_eta>        : "ᾖ"  U1f96
 <dead_iota> <dead_psili> <dead_tilde> <Greek_eta>        : "ᾖ"  U1f96
 <dead_iota> <dead_tilde> <dead_horn> <Greek_eta>        : "ᾖ"  U1f96
-<dead_iota> <dead_tilde> <U0313> <Greek_eta>        : "ᾖ"  U1f96
 <dead_iota> <dead_tilde> <dead_psili> <Greek_eta>        : "ᾖ"  U1f96
 <dead_horn> <dead_iota> <dead_tilde> <Greek_eta>        : "ᾖ"  U1f96
-<U0313> <dead_iota> <dead_tilde> <Greek_eta>        : "ᾖ"  U1f96
 <dead_psili> <dead_iota> <dead_tilde> <Greek_eta>        : "ᾖ"  U1f96
 <dead_horn> <dead_tilde> <dead_iota> <Greek_eta>        : "ᾖ"  U1f96
-<U0313> <dead_tilde> <dead_iota> <Greek_eta>        : "ᾖ"  U1f96
 <dead_psili> <dead_tilde> <dead_iota> <Greek_eta>        : "ᾖ"  U1f96
 <dead_tilde> <dead_iota> <dead_horn> <Greek_eta>        : "ᾖ"  U1f96
-<dead_tilde> <dead_iota> <U0313> <Greek_eta>        : "ᾖ"  U1f96
 <dead_tilde> <dead_iota> <dead_psili> <Greek_eta>        : "ᾖ"  U1f96
 <dead_tilde> <dead_horn> <dead_iota> <Greek_eta>        : "ᾖ"  U1f96
-<dead_tilde> <U0313> <dead_iota> <Greek_eta>        : "ᾖ"  U1f96
 <dead_tilde> <dead_psili> <dead_iota> <Greek_eta>        : "ᾖ"  U1f96
 <Multi_key> <bar> <less> <asciitilde> <Greek_eta>       : "ᾗ"  U1f97
 <Multi_key> <bar> <asciitilde> <less> <Greek_eta>       : "ᾗ"  U1f97
@@ -1583,38 +1296,28 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <less> <Greek_eta>       : "ᾗ"  U1f97
 <Multi_key> <asciitilde> <less> <bar> <Greek_eta>       : "ᾗ"  U1f97
 <dead_iota> <dead_ogonek> <dead_tilde> <Greek_eta>      : "ᾗ"  U1f97
-<dead_iota> <U0314> <dead_tilde> <Greek_eta>      : "ᾗ"  U1f97
 <dead_iota> <dead_dasia> <dead_tilde> <Greek_eta>      : "ᾗ"  U1f97
 <dead_iota> <dead_tilde> <dead_ogonek> <Greek_eta>      : "ᾗ"  U1f97
-<dead_iota> <dead_tilde> <U0314> <Greek_eta>      : "ᾗ"  U1f97
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_eta>      : "ᾗ"  U1f97
 <dead_ogonek> <dead_iota> <dead_tilde> <Greek_eta>      : "ᾗ"  U1f97
-<U0314> <dead_iota> <dead_tilde> <Greek_eta>      : "ᾗ"  U1f97
 <dead_dasia> <dead_iota> <dead_tilde> <Greek_eta>      : "ᾗ"  U1f97
 <dead_ogonek> <dead_tilde> <dead_iota> <Greek_eta>      : "ᾗ"  U1f97
-<U0314> <dead_tilde> <dead_iota> <Greek_eta>      : "ᾗ"  U1f97
 <dead_dasia> <dead_tilde> <dead_iota> <Greek_eta>      : "ᾗ"  U1f97
 <dead_tilde> <dead_iota> <dead_ogonek> <Greek_eta>      : "ᾗ"  U1f97
-<dead_tilde> <dead_iota> <U0314> <Greek_eta>      : "ᾗ"  U1f97
 <dead_tilde> <dead_iota> <dead_dasia> <Greek_eta>      : "ᾗ"  U1f97
 <dead_tilde> <dead_ogonek> <dead_iota> <Greek_eta>      : "ᾗ"  U1f97
-<dead_tilde> <U0314> <dead_iota> <Greek_eta>      : "ᾗ"  U1f97
 <dead_tilde> <dead_dasia> <dead_iota> <Greek_eta>      : "ᾗ"  U1f97
 <Multi_key> <bar> <greater> <Greek_ETA>                 : "ᾘ"  U1f98
 <Multi_key> <greater> <bar> <Greek_ETA>                 : "ᾘ"  U1f98
 <dead_iota> <dead_horn> <Greek_ETA>                     : "ᾘ"  U1f98
-<dead_iota> <U0313> <Greek_ETA>                     : "ᾘ"  U1f98
 <dead_iota> <dead_psili> <Greek_ETA>                     : "ᾘ"  U1f98
 <dead_horn> <dead_iota> <Greek_ETA>                     : "ᾘ"  U1f98
-<U0313> <dead_iota> <Greek_ETA>                     : "ᾘ"  U1f98
 <dead_psili> <dead_iota> <Greek_ETA>                     : "ᾘ"  U1f98
 <Multi_key> <bar> <less> <Greek_ETA>                    : "ᾙ"  U1f99
 <Multi_key> <less> <bar> <Greek_ETA>                    : "ᾙ"  U1f99
 <dead_iota> <dead_ogonek> <Greek_ETA>                   : "ᾙ"  U1f99
-<dead_iota> <U0314> <Greek_ETA>                   : "ᾙ"  U1f99
 <dead_iota> <dead_dasia> <Greek_ETA>                   : "ᾙ"  U1f99
 <dead_ogonek> <dead_iota> <Greek_ETA>                   : "ᾙ"  U1f99
-<U0314> <dead_iota> <Greek_ETA>                   : "ᾙ"  U1f99
 <dead_dasia> <dead_iota> <Greek_ETA>                   : "ᾙ"  U1f99
 <Multi_key> <bar> <greater> <grave> <Greek_ETA>         : "ᾚ"  U1f9a
 <Multi_key> <bar> <grave> <greater> <Greek_ETA>         : "ᾚ"  U1f9a
@@ -1623,22 +1326,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <greater> <Greek_ETA>         : "ᾚ"  U1f9a
 <Multi_key> <grave> <greater> <bar> <Greek_ETA>         : "ᾚ"  U1f9a
 <dead_iota> <dead_horn> <dead_grave> <Greek_ETA>        : "ᾚ"  U1f9a
-<dead_iota> <U0313> <dead_grave> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_iota> <dead_psili> <dead_grave> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_iota> <dead_grave> <dead_horn> <Greek_ETA>        : "ᾚ"  U1f9a
-<dead_iota> <dead_grave> <U0313> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_iota> <dead_grave> <dead_psili> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_horn> <dead_iota> <dead_grave> <Greek_ETA>        : "ᾚ"  U1f9a
-<U0313> <dead_iota> <dead_grave> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_psili> <dead_iota> <dead_grave> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_horn> <dead_grave> <dead_iota> <Greek_ETA>        : "ᾚ"  U1f9a
-<U0313> <dead_grave> <dead_iota> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_psili> <dead_grave> <dead_iota> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_grave> <dead_iota> <dead_horn> <Greek_ETA>        : "ᾚ"  U1f9a
-<dead_grave> <dead_iota> <U0313> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_grave> <dead_iota> <dead_psili> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_grave> <dead_horn> <dead_iota> <Greek_ETA>        : "ᾚ"  U1f9a
-<dead_grave> <U0313> <dead_iota> <Greek_ETA>        : "ᾚ"  U1f9a
 <dead_grave> <dead_psili> <dead_iota> <Greek_ETA>        : "ᾚ"  U1f9a
 <Multi_key> <bar> <less> <grave> <Greek_ETA>            : "ᾛ"  U1f9b
 <Multi_key> <bar> <grave> <less> <Greek_ETA>            : "ᾛ"  U1f9b
@@ -1647,22 +1344,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <less> <Greek_ETA>            : "ᾛ"  U1f9b
 <Multi_key> <grave> <less> <bar> <Greek_ETA>            : "ᾛ"  U1f9b
 <dead_iota> <dead_ogonek> <dead_grave> <Greek_ETA>      : "ᾛ"  U1f9b
-<dead_iota> <U0314> <dead_grave> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_iota> <dead_dasia> <dead_grave> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_iota> <dead_grave> <dead_ogonek> <Greek_ETA>      : "ᾛ"  U1f9b
-<dead_iota> <dead_grave> <U0314> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_iota> <dead_grave> <dead_dasia> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_ogonek> <dead_iota> <dead_grave> <Greek_ETA>      : "ᾛ"  U1f9b
-<U0314> <dead_iota> <dead_grave> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_dasia> <dead_iota> <dead_grave> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_ogonek> <dead_grave> <dead_iota> <Greek_ETA>      : "ᾛ"  U1f9b
-<U0314> <dead_grave> <dead_iota> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_dasia> <dead_grave> <dead_iota> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_grave> <dead_iota> <dead_ogonek> <Greek_ETA>      : "ᾛ"  U1f9b
-<dead_grave> <dead_iota> <U0314> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_grave> <dead_iota> <dead_dasia> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_grave> <dead_ogonek> <dead_iota> <Greek_ETA>      : "ᾛ"  U1f9b
-<dead_grave> <U0314> <dead_iota> <Greek_ETA>      : "ᾛ"  U1f9b
 <dead_grave> <dead_dasia> <dead_iota> <Greek_ETA>      : "ᾛ"  U1f9b
 <Multi_key> <bar> <greater> <apostrophe> <Greek_ETA>    : "ᾜ"  U1f9c
 <Multi_key> <bar> <apostrophe> <greater> <Greek_ETA>    : "ᾜ"  U1f9c
@@ -1671,22 +1362,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <greater> <Greek_ETA>    : "ᾜ"  U1f9c
 <Multi_key> <apostrophe> <greater> <bar> <Greek_ETA>    : "ᾜ"  U1f9c
 <dead_iota> <dead_horn> <dead_acute> <Greek_ETA>        : "ᾜ"  U1f9c
-<dead_iota> <U0313> <dead_acute> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_iota> <dead_psili> <dead_acute> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_iota> <dead_acute> <dead_horn> <Greek_ETA>        : "ᾜ"  U1f9c
-<dead_iota> <dead_acute> <U0313> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_iota> <dead_acute> <dead_psili> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_horn> <dead_iota> <dead_acute> <Greek_ETA>        : "ᾜ"  U1f9c
-<U0313> <dead_iota> <dead_acute> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_psili> <dead_iota> <dead_acute> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_horn> <dead_acute> <dead_iota> <Greek_ETA>        : "ᾜ"  U1f9c
-<U0313> <dead_acute> <dead_iota> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_psili> <dead_acute> <dead_iota> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_acute> <dead_iota> <dead_horn> <Greek_ETA>        : "ᾜ"  U1f9c
-<dead_acute> <dead_iota> <U0313> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_acute> <dead_iota> <dead_psili> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_acute> <dead_horn> <dead_iota> <Greek_ETA>        : "ᾜ"  U1f9c
-<dead_acute> <U0313> <dead_iota> <Greek_ETA>        : "ᾜ"  U1f9c
 <dead_acute> <dead_psili> <dead_iota> <Greek_ETA>        : "ᾜ"  U1f9c
 <Multi_key> <bar> <less> <apostrophe> <Greek_ETA>       : "ᾝ"  U1f9d
 <Multi_key> <bar> <apostrophe> <less> <Greek_ETA>       : "ᾝ"  U1f9d
@@ -1695,22 +1380,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <less> <Greek_ETA>       : "ᾝ"  U1f9d
 <Multi_key> <apostrophe> <less> <bar> <Greek_ETA>       : "ᾝ"  U1f9d
 <dead_iota> <dead_ogonek> <dead_acute> <Greek_ETA>      : "ᾝ"  U1f9d
-<dead_iota> <U0314> <dead_acute> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_iota> <dead_dasia> <dead_acute> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_iota> <dead_acute> <dead_ogonek> <Greek_ETA>      : "ᾝ"  U1f9d
-<dead_iota> <dead_acute> <U0314> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_iota> <dead_acute> <dead_dasia> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_ogonek> <dead_iota> <dead_acute> <Greek_ETA>      : "ᾝ"  U1f9d
-<U0314> <dead_iota> <dead_acute> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_dasia> <dead_iota> <dead_acute> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_ogonek> <dead_acute> <dead_iota> <Greek_ETA>      : "ᾝ"  U1f9d
-<U0314> <dead_acute> <dead_iota> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_dasia> <dead_acute> <dead_iota> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_acute> <dead_iota> <dead_ogonek> <Greek_ETA>      : "ᾝ"  U1f9d
-<dead_acute> <dead_iota> <U0314> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_acute> <dead_iota> <dead_dasia> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_acute> <dead_ogonek> <dead_iota> <Greek_ETA>      : "ᾝ"  U1f9d
-<dead_acute> <U0314> <dead_iota> <Greek_ETA>      : "ᾝ"  U1f9d
 <dead_acute> <dead_dasia> <dead_iota> <Greek_ETA>      : "ᾝ"  U1f9d
 <Multi_key> <bar> <greater> <asciitilde> <Greek_ETA>    : "ᾞ"  U1f9e
 <Multi_key> <bar> <asciitilde> <greater> <Greek_ETA>    : "ᾞ"  U1f9e
@@ -1719,22 +1398,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <greater> <Greek_ETA>    : "ᾞ"  U1f9e
 <Multi_key> <asciitilde> <greater> <bar> <Greek_ETA>    : "ᾞ"  U1f9e
 <dead_iota> <dead_horn> <dead_tilde> <Greek_ETA>        : "ᾞ"  U1f9e
-<dead_iota> <U0313> <dead_tilde> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_iota> <dead_psili> <dead_tilde> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_iota> <dead_tilde> <dead_horn> <Greek_ETA>        : "ᾞ"  U1f9e
-<dead_iota> <dead_tilde> <U0313> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_iota> <dead_tilde> <dead_psili> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_horn> <dead_iota> <dead_tilde> <Greek_ETA>        : "ᾞ"  U1f9e
-<U0313> <dead_iota> <dead_tilde> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_psili> <dead_iota> <dead_tilde> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_horn> <dead_tilde> <dead_iota> <Greek_ETA>        : "ᾞ"  U1f9e
-<U0313> <dead_tilde> <dead_iota> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_psili> <dead_tilde> <dead_iota> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_tilde> <dead_iota> <dead_horn> <Greek_ETA>        : "ᾞ"  U1f9e
-<dead_tilde> <dead_iota> <U0313> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_tilde> <dead_iota> <dead_psili> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_tilde> <dead_horn> <dead_iota> <Greek_ETA>        : "ᾞ"  U1f9e
-<dead_tilde> <U0313> <dead_iota> <Greek_ETA>        : "ᾞ"  U1f9e
 <dead_tilde> <dead_psili> <dead_iota> <Greek_ETA>        : "ᾞ"  U1f9e
 <Multi_key> <bar> <less> <asciitilde> <Greek_ETA>       : "ᾟ"  U1f9f
 <Multi_key> <bar> <asciitilde> <less> <Greek_ETA>       : "ᾟ"  U1f9f
@@ -1743,38 +1416,28 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <less> <Greek_ETA>       : "ᾟ"  U1f9f
 <Multi_key> <asciitilde> <less> <bar> <Greek_ETA>       : "ᾟ"  U1f9f
 <dead_iota> <dead_ogonek> <dead_tilde> <Greek_ETA>      : "ᾟ"  U1f9f
-<dead_iota> <U0314> <dead_tilde> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_iota> <dead_dasia> <dead_tilde> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_iota> <dead_tilde> <dead_ogonek> <Greek_ETA>      : "ᾟ"  U1f9f
-<dead_iota> <dead_tilde> <U0314> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_ogonek> <dead_iota> <dead_tilde> <Greek_ETA>      : "ᾟ"  U1f9f
-<U0314> <dead_iota> <dead_tilde> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_dasia> <dead_iota> <dead_tilde> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_ogonek> <dead_tilde> <dead_iota> <Greek_ETA>      : "ᾟ"  U1f9f
-<U0314> <dead_tilde> <dead_iota> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_dasia> <dead_tilde> <dead_iota> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_tilde> <dead_iota> <dead_ogonek> <Greek_ETA>      : "ᾟ"  U1f9f
-<dead_tilde> <dead_iota> <U0314> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_tilde> <dead_iota> <dead_dasia> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_tilde> <dead_ogonek> <dead_iota> <Greek_ETA>      : "ᾟ"  U1f9f
-<dead_tilde> <U0314> <dead_iota> <Greek_ETA>      : "ᾟ"  U1f9f
 <dead_tilde> <dead_dasia> <dead_iota> <Greek_ETA>      : "ᾟ"  U1f9f
 <Multi_key> <bar> <greater> <Greek_omega>               : "ᾠ"  U1fa0
 <Multi_key> <greater> <bar> <Greek_omega>               : "ᾠ"  U1fa0
 <dead_iota> <dead_horn> <Greek_omega>                   : "ᾠ"  U1fa0
-<dead_iota> <U0313> <Greek_omega>                   : "ᾠ"  U1fa0
 <dead_iota> <dead_psili> <Greek_omega>                   : "ᾠ"  U1fa0
 <dead_horn> <dead_iota> <Greek_omega>                   : "ᾠ"  U1fa0
-<U0313> <dead_iota> <Greek_omega>                   : "ᾠ"  U1fa0
 <dead_psili> <dead_iota> <Greek_omega>                   : "ᾠ"  U1fa0
 <Multi_key> <bar> <less> <Greek_omega>                  : "ᾡ"  U1fa1
 <Multi_key> <less> <bar> <Greek_omega>                  : "ᾡ"  U1fa1
 <dead_iota> <dead_ogonek> <Greek_omega>                 : "ᾡ"  U1fa1
-<dead_iota> <U0314> <Greek_omega>                 : "ᾡ"  U1fa1
 <dead_iota> <dead_dasia> <Greek_omega>                 : "ᾡ"  U1fa1
 <dead_ogonek> <dead_iota> <Greek_omega>                 : "ᾡ"  U1fa1
-<U0314> <dead_iota> <Greek_omega>                 : "ᾡ"  U1fa1
 <dead_dasia> <dead_iota> <Greek_omega>                 : "ᾡ"  U1fa1
 <Multi_key> <bar> <greater> <grave> <Greek_omega>       : "ᾢ"  U1fa2
 <Multi_key> <bar> <grave> <greater> <Greek_omega>       : "ᾢ"  U1fa2
@@ -1783,22 +1446,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <greater> <Greek_omega>       : "ᾢ"  U1fa2
 <Multi_key> <grave> <greater> <bar> <Greek_omega>       : "ᾢ"  U1fa2
 <dead_iota> <dead_horn> <dead_grave> <Greek_omega>      : "ᾢ"  U1fa2
-<dead_iota> <U0313> <dead_grave> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_iota> <dead_psili> <dead_grave> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_iota> <dead_grave> <dead_horn> <Greek_omega>      : "ᾢ"  U1fa2
-<dead_iota> <dead_grave> <U0313> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_iota> <dead_grave> <dead_psili> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_horn> <dead_iota> <dead_grave> <Greek_omega>      : "ᾢ"  U1fa2
-<U0313> <dead_iota> <dead_grave> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_psili> <dead_iota> <dead_grave> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_horn> <dead_grave> <dead_iota> <Greek_omega>      : "ᾢ"  U1fa2
-<U0313> <dead_grave> <dead_iota> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_psili> <dead_grave> <dead_iota> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_grave> <dead_iota> <dead_horn> <Greek_omega>      : "ᾢ"  U1fa2
-<dead_grave> <dead_iota> <U0313> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_grave> <dead_iota> <dead_psili> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_grave> <dead_horn> <dead_iota> <Greek_omega>      : "ᾢ"  U1fa2
-<dead_grave> <U0313> <dead_iota> <Greek_omega>      : "ᾢ"  U1fa2
 <dead_grave> <dead_psili> <dead_iota> <Greek_omega>      : "ᾢ"  U1fa2
 <Multi_key> <bar> <less> <grave> <Greek_omega>          : "ᾣ"  U1fa3
 <Multi_key> <bar> <grave> <less> <Greek_omega>          : "ᾣ"  U1fa3
@@ -1807,22 +1464,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <less> <Greek_omega>          : "ᾣ"  U1fa3
 <Multi_key> <grave> <less> <bar> <Greek_omega>          : "ᾣ"  U1fa3
 <dead_iota> <dead_ogonek> <dead_grave> <Greek_omega>    : "ᾣ"  U1fa3
-<dead_iota> <U0314> <dead_grave> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_iota> <dead_dasia> <dead_grave> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_iota> <dead_grave> <dead_ogonek> <Greek_omega>    : "ᾣ"  U1fa3
-<dead_iota> <dead_grave> <U0314> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_iota> <dead_grave> <dead_dasia> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_ogonek> <dead_iota> <dead_grave> <Greek_omega>    : "ᾣ"  U1fa3
-<U0314> <dead_iota> <dead_grave> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_dasia> <dead_iota> <dead_grave> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_ogonek> <dead_grave> <dead_iota> <Greek_omega>    : "ᾣ"  U1fa3
-<U0314> <dead_grave> <dead_iota> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_dasia> <dead_grave> <dead_iota> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_grave> <dead_iota> <dead_ogonek> <Greek_omega>    : "ᾣ"  U1fa3
-<dead_grave> <dead_iota> <U0314> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_grave> <dead_iota> <dead_dasia> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_grave> <dead_ogonek> <dead_iota> <Greek_omega>    : "ᾣ"  U1fa3
-<dead_grave> <U0314> <dead_iota> <Greek_omega>    : "ᾣ"  U1fa3
 <dead_grave> <dead_dasia> <dead_iota> <Greek_omega>    : "ᾣ"  U1fa3
 <Multi_key> <bar> <greater> <apostrophe> <Greek_omega>  : "ᾤ"  U1fa4
 <Multi_key> <bar> <apostrophe> <greater> <Greek_omega>  : "ᾤ"  U1fa4
@@ -1831,22 +1482,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <greater> <Greek_omega>  : "ᾤ"  U1fa4
 <Multi_key> <apostrophe> <greater> <bar> <Greek_omega>  : "ᾤ"  U1fa4
 <dead_iota> <dead_horn> <dead_acute> <Greek_omega>      : "ᾤ"  U1fa4
-<dead_iota> <U0313> <dead_acute> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_iota> <dead_psili> <dead_acute> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_iota> <dead_acute> <dead_horn> <Greek_omega>      : "ᾤ"  U1fa4
-<dead_iota> <dead_acute> <U0313> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_iota> <dead_acute> <dead_psili> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_horn> <dead_iota> <dead_acute> <Greek_omega>      : "ᾤ"  U1fa4
-<U0313> <dead_iota> <dead_acute> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_psili> <dead_iota> <dead_acute> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_horn> <dead_acute> <dead_iota> <Greek_omega>      : "ᾤ"  U1fa4
-<U0313> <dead_acute> <dead_iota> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_psili> <dead_acute> <dead_iota> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_acute> <dead_iota> <dead_horn> <Greek_omega>      : "ᾤ"  U1fa4
-<dead_acute> <dead_iota> <U0313> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_acute> <dead_iota> <dead_psili> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_acute> <dead_horn> <dead_iota> <Greek_omega>      : "ᾤ"  U1fa4
-<dead_acute> <U0313> <dead_iota> <Greek_omega>      : "ᾤ"  U1fa4
 <dead_acute> <dead_psili> <dead_iota> <Greek_omega>      : "ᾤ"  U1fa4
 <Multi_key> <bar> <less> <apostrophe> <Greek_omega>     : "ᾥ"  U1fa5
 <Multi_key> <bar> <apostrophe> <less> <Greek_omega>     : "ᾥ"  U1fa5
@@ -1855,22 +1500,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <less> <Greek_omega>     : "ᾥ"  U1fa5
 <Multi_key> <apostrophe> <less> <bar> <Greek_omega>     : "ᾥ"  U1fa5
 <dead_iota> <dead_ogonek> <dead_acute> <Greek_omega>    : "ᾥ"  U1fa5
-<dead_iota> <U0314> <dead_acute> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_iota> <dead_dasia> <dead_acute> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_iota> <dead_acute> <dead_ogonek> <Greek_omega>    : "ᾥ"  U1fa5
-<dead_iota> <dead_acute> <U0314> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_iota> <dead_acute> <dead_dasia> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_ogonek> <dead_iota> <dead_acute> <Greek_omega>    : "ᾥ"  U1fa5
-<U0314> <dead_iota> <dead_acute> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_dasia> <dead_iota> <dead_acute> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_ogonek> <dead_acute> <dead_iota> <Greek_omega>    : "ᾥ"  U1fa5
-<U0314> <dead_acute> <dead_iota> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_dasia> <dead_acute> <dead_iota> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_acute> <dead_iota> <dead_ogonek> <Greek_omega>    : "ᾥ"  U1fa5
-<dead_acute> <dead_iota> <U0314> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_acute> <dead_iota> <dead_dasia> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_acute> <dead_ogonek> <dead_iota> <Greek_omega>    : "ᾥ"  U1fa5
-<dead_acute> <U0314> <dead_iota> <Greek_omega>    : "ᾥ"  U1fa5
 <dead_acute> <dead_dasia> <dead_iota> <Greek_omega>    : "ᾥ"  U1fa5
 <Multi_key> <bar> <greater> <asciitilde> <Greek_omega>  : "ᾦ"  U1fa6
 <Multi_key> <bar> <asciitilde> <greater> <Greek_omega>  : "ᾦ"  U1fa6
@@ -1879,22 +1518,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <greater> <Greek_omega>  : "ᾦ"  U1fa6
 <Multi_key> <asciitilde> <greater> <bar> <Greek_omega>  : "ᾦ"  U1fa6
 <dead_iota> <dead_horn> <dead_tilde> <Greek_omega>      : "ᾦ"  U1fa6
-<dead_iota> <U0313> <dead_tilde> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_iota> <dead_psili> <dead_tilde> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_iota> <dead_tilde> <dead_horn> <Greek_omega>      : "ᾦ"  U1fa6
-<dead_iota> <dead_tilde> <U0313> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_iota> <dead_tilde> <dead_psili> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_horn> <dead_iota> <dead_tilde> <Greek_omega>      : "ᾦ"  U1fa6
-<U0313> <dead_iota> <dead_tilde> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_psili> <dead_iota> <dead_tilde> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_horn> <dead_tilde> <dead_iota> <Greek_omega>      : "ᾦ"  U1fa6
-<U0313> <dead_tilde> <dead_iota> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_psili> <dead_tilde> <dead_iota> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_tilde> <dead_iota> <dead_horn> <Greek_omega>      : "ᾦ"  U1fa6
-<dead_tilde> <dead_iota> <U0313> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_tilde> <dead_iota> <dead_psili> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_tilde> <dead_horn> <dead_iota> <Greek_omega>      : "ᾦ"  U1fa6
-<dead_tilde> <U0313> <dead_iota> <Greek_omega>      : "ᾦ"  U1fa6
 <dead_tilde> <dead_psili> <dead_iota> <Greek_omega>      : "ᾦ"  U1fa6
 <Multi_key> <bar> <less> <asciitilde> <Greek_omega>     : "ᾧ"  U1fa7
 <Multi_key> <bar> <asciitilde> <less> <Greek_omega>     : "ᾧ"  U1fa7
@@ -1903,38 +1536,28 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <less> <Greek_omega>     : "ᾧ"  U1fa7
 <Multi_key> <asciitilde> <less> <bar> <Greek_omega>     : "ᾧ"  U1fa7
 <dead_iota> <dead_ogonek> <dead_tilde> <Greek_omega>    : "ᾧ"  U1fa7
-<dead_iota> <U0314> <dead_tilde> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_iota> <dead_dasia> <dead_tilde> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_iota> <dead_tilde> <dead_ogonek> <Greek_omega>    : "ᾧ"  U1fa7
-<dead_iota> <dead_tilde> <U0314> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_ogonek> <dead_iota> <dead_tilde> <Greek_omega>    : "ᾧ"  U1fa7
-<U0314> <dead_iota> <dead_tilde> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_dasia> <dead_iota> <dead_tilde> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_ogonek> <dead_tilde> <dead_iota> <Greek_omega>    : "ᾧ"  U1fa7
-<U0314> <dead_tilde> <dead_iota> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_dasia> <dead_tilde> <dead_iota> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_tilde> <dead_iota> <dead_ogonek> <Greek_omega>    : "ᾧ"  U1fa7
-<dead_tilde> <dead_iota> <U0314> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_tilde> <dead_iota> <dead_dasia> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_tilde> <dead_ogonek> <dead_iota> <Greek_omega>    : "ᾧ"  U1fa7
-<dead_tilde> <U0314> <dead_iota> <Greek_omega>    : "ᾧ"  U1fa7
 <dead_tilde> <dead_dasia> <dead_iota> <Greek_omega>    : "ᾧ"  U1fa7
 <Multi_key> <bar> <greater> <Greek_OMEGA>               : "ᾨ"  U1fa8
 <Multi_key> <greater> <bar> <Greek_OMEGA>               : "ᾨ"  U1fa8
 <dead_iota> <dead_horn> <Greek_OMEGA>                   : "ᾨ"  U1fa8
-<dead_iota> <U0313> <Greek_OMEGA>                   : "ᾨ"  U1fa8
 <dead_iota> <dead_psili> <Greek_OMEGA>                   : "ᾨ"  U1fa8
 <dead_horn> <dead_iota> <Greek_OMEGA>                   : "ᾨ"  U1fa8
-<U0313> <dead_iota> <Greek_OMEGA>                   : "ᾨ"  U1fa8
 <dead_psili> <dead_iota> <Greek_OMEGA>                   : "ᾨ"  U1fa8
 <Multi_key> <bar> <less> <Greek_OMEGA>                  : "ᾩ"  U1fa9
 <Multi_key> <less> <bar> <Greek_OMEGA>                  : "ᾩ"  U1fa9
 <dead_iota> <dead_ogonek> <Greek_OMEGA>                 : "ᾩ"  U1fa9
-<dead_iota> <U0314> <Greek_OMEGA>                 : "ᾩ"  U1fa9
 <dead_iota> <dead_dasia> <Greek_OMEGA>                 : "ᾩ"  U1fa9
 <dead_ogonek> <dead_iota> <Greek_OMEGA>                 : "ᾩ"  U1fa9
-<U0314> <dead_iota> <Greek_OMEGA>                 : "ᾩ"  U1fa9
 <dead_dasia> <dead_iota> <Greek_OMEGA>                 : "ᾩ"  U1fa9
 <Multi_key> <bar> <greater> <grave> <Greek_OMEGA>       : "ᾪ"  U1faa
 <Multi_key> <bar> <grave> <greater> <Greek_OMEGA>       : "ᾪ"  U1faa
@@ -1943,22 +1566,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <greater> <Greek_OMEGA>       : "ᾪ"  U1faa
 <Multi_key> <grave> <greater> <bar> <Greek_OMEGA>       : "ᾪ"  U1faa
 <dead_iota> <dead_horn> <dead_grave> <Greek_OMEGA>      : "ᾪ"  U1faa
-<dead_iota> <U0313> <dead_grave> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_iota> <dead_psili> <dead_grave> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_iota> <dead_grave> <dead_horn> <Greek_OMEGA>      : "ᾪ"  U1faa
-<dead_iota> <dead_grave> <U0313> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_iota> <dead_grave> <dead_psili> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_horn> <dead_iota> <dead_grave> <Greek_OMEGA>      : "ᾪ"  U1faa
-<U0313> <dead_iota> <dead_grave> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_psili> <dead_iota> <dead_grave> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_horn> <dead_grave> <dead_iota> <Greek_OMEGA>      : "ᾪ"  U1faa
-<U0313> <dead_grave> <dead_iota> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_psili> <dead_grave> <dead_iota> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_grave> <dead_iota> <dead_horn> <Greek_OMEGA>      : "ᾪ"  U1faa
-<dead_grave> <dead_iota> <U0313> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_grave> <dead_iota> <dead_psili> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_grave> <dead_horn> <dead_iota> <Greek_OMEGA>      : "ᾪ"  U1faa
-<dead_grave> <U0313> <dead_iota> <Greek_OMEGA>      : "ᾪ"  U1faa
 <dead_grave> <dead_psili> <dead_iota> <Greek_OMEGA>      : "ᾪ"  U1faa
 <Multi_key> <bar> <less> <grave> <Greek_OMEGA>          : "ᾫ"  U1fab
 <Multi_key> <bar> <grave> <less> <Greek_OMEGA>          : "ᾫ"  U1fab
@@ -1967,22 +1584,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <grave> <bar> <less> <Greek_OMEGA>          : "ᾫ"  U1fab
 <Multi_key> <grave> <less> <bar> <Greek_OMEGA>          : "ᾫ"  U1fab
 <dead_iota> <dead_ogonek> <dead_grave> <Greek_OMEGA>    : "ᾫ"  U1fab
-<dead_iota> <U0314> <dead_grave> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_iota> <dead_dasia> <dead_grave> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_iota> <dead_grave> <dead_ogonek> <Greek_OMEGA>    : "ᾫ"  U1fab
-<dead_iota> <dead_grave> <U0314> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_iota> <dead_grave> <dead_dasia> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_ogonek> <dead_iota> <dead_grave> <Greek_OMEGA>    : "ᾫ"  U1fab
-<U0314> <dead_iota> <dead_grave> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_dasia> <dead_iota> <dead_grave> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_ogonek> <dead_grave> <dead_iota> <Greek_OMEGA>    : "ᾫ"  U1fab
-<U0314> <dead_grave> <dead_iota> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_dasia> <dead_grave> <dead_iota> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_grave> <dead_iota> <dead_ogonek> <Greek_OMEGA>    : "ᾫ"  U1fab
-<dead_grave> <dead_iota> <U0314> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_grave> <dead_iota> <dead_dasia> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_grave> <dead_ogonek> <dead_iota> <Greek_OMEGA>    : "ᾫ"  U1fab
-<dead_grave> <U0314> <dead_iota> <Greek_OMEGA>    : "ᾫ"  U1fab
 <dead_grave> <dead_dasia> <dead_iota> <Greek_OMEGA>    : "ᾫ"  U1fab
 <Multi_key> <bar> <greater> <apostrophe> <Greek_OMEGA>  : "ᾬ"  U1fac
 <Multi_key> <bar> <apostrophe> <greater> <Greek_OMEGA>  : "ᾬ"  U1fac
@@ -1991,22 +1602,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <greater> <Greek_OMEGA>  : "ᾬ"  U1fac
 <Multi_key> <apostrophe> <greater> <bar> <Greek_OMEGA>  : "ᾬ"  U1fac
 <dead_iota> <dead_horn> <dead_acute> <Greek_OMEGA>      : "ᾬ"  U1fac
-<dead_iota> <U0313> <dead_acute> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_iota> <dead_psili> <dead_acute> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_iota> <dead_acute> <dead_horn> <Greek_OMEGA>      : "ᾬ"  U1fac
-<dead_iota> <dead_acute> <U0313> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_iota> <dead_acute> <dead_psili> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_horn> <dead_iota> <dead_acute> <Greek_OMEGA>      : "ᾬ"  U1fac
-<U0313> <dead_iota> <dead_acute> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_psili> <dead_iota> <dead_acute> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_horn> <dead_acute> <dead_iota> <Greek_OMEGA>      : "ᾬ"  U1fac
-<U0313> <dead_acute> <dead_iota> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_psili> <dead_acute> <dead_iota> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_acute> <dead_iota> <dead_horn> <Greek_OMEGA>      : "ᾬ"  U1fac
-<dead_acute> <dead_iota> <U0313> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_acute> <dead_iota> <dead_psili> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_acute> <dead_horn> <dead_iota> <Greek_OMEGA>      : "ᾬ"  U1fac
-<dead_acute> <U0313> <dead_iota> <Greek_OMEGA>      : "ᾬ"  U1fac
 <dead_acute> <dead_psili> <dead_iota> <Greek_OMEGA>      : "ᾬ"  U1fac
 <Multi_key> <bar> <less> <apostrophe> <Greek_OMEGA>     : "ᾭ"  U1fad
 <Multi_key> <bar> <apostrophe> <less> <Greek_OMEGA>     : "ᾭ"  U1fad
@@ -2015,22 +1620,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <apostrophe> <bar> <less> <Greek_OMEGA>     : "ᾭ"  U1fad
 <Multi_key> <apostrophe> <less> <bar> <Greek_OMEGA>     : "ᾭ"  U1fad
 <dead_iota> <dead_ogonek> <dead_acute> <Greek_OMEGA>    : "ᾭ"  U1fad
-<dead_iota> <U0314> <dead_acute> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_iota> <dead_dasia> <dead_acute> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_iota> <dead_acute> <dead_ogonek> <Greek_OMEGA>    : "ᾭ"  U1fad
-<dead_iota> <dead_acute> <U0314> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_iota> <dead_acute> <dead_dasia> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_ogonek> <dead_iota> <dead_acute> <Greek_OMEGA>    : "ᾭ"  U1fad
-<U0314> <dead_iota> <dead_acute> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_dasia> <dead_iota> <dead_acute> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_ogonek> <dead_acute> <dead_iota> <Greek_OMEGA>    : "ᾭ"  U1fad
-<U0314> <dead_acute> <dead_iota> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_dasia> <dead_acute> <dead_iota> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_acute> <dead_iota> <dead_ogonek> <Greek_OMEGA>    : "ᾭ"  U1fad
-<dead_acute> <dead_iota> <U0314> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_acute> <dead_iota> <dead_dasia> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_acute> <dead_ogonek> <dead_iota> <Greek_OMEGA>    : "ᾭ"  U1fad
-<dead_acute> <U0314> <dead_iota> <Greek_OMEGA>    : "ᾭ"  U1fad
 <dead_acute> <dead_dasia> <dead_iota> <Greek_OMEGA>    : "ᾭ"  U1fad
 <Multi_key> <bar> <greater> <asciitilde> <Greek_OMEGA>  : "ᾮ"  U1fae
 <Multi_key> <bar> <asciitilde> <greater> <Greek_OMEGA>  : "ᾮ"  U1fae
@@ -2039,22 +1638,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <greater> <Greek_OMEGA>  : "ᾮ"  U1fae
 <Multi_key> <asciitilde> <greater> <bar> <Greek_OMEGA>  : "ᾮ"  U1fae
 <dead_iota> <dead_horn> <dead_tilde> <Greek_OMEGA>      : "ᾮ"  U1fae
-<dead_iota> <U0313> <dead_tilde> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_iota> <dead_psili> <dead_tilde> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_iota> <dead_tilde> <dead_horn> <Greek_OMEGA>      : "ᾮ"  U1fae
-<dead_iota> <dead_tilde> <U0313> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_iota> <dead_tilde> <dead_psili> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_horn> <dead_iota> <dead_tilde> <Greek_OMEGA>      : "ᾮ"  U1fae
-<U0313> <dead_iota> <dead_tilde> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_psili> <dead_iota> <dead_tilde> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_horn> <dead_tilde> <dead_iota> <Greek_OMEGA>      : "ᾮ"  U1fae
-<U0313> <dead_tilde> <dead_iota> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_psili> <dead_tilde> <dead_iota> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_tilde> <dead_iota> <dead_horn> <Greek_OMEGA>      : "ᾮ"  U1fae
-<dead_tilde> <dead_iota> <U0313> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_tilde> <dead_iota> <dead_psili> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_tilde> <dead_horn> <dead_iota> <Greek_OMEGA>      : "ᾮ"  U1fae
-<dead_tilde> <U0313> <dead_iota> <Greek_OMEGA>      : "ᾮ"  U1fae
 <dead_tilde> <dead_psili> <dead_iota> <Greek_OMEGA>      : "ᾮ"  U1fae
 <Multi_key> <bar> <less> <asciitilde> <Greek_OMEGA>     : "ᾯ"  U1faf
 <Multi_key> <bar> <asciitilde> <less> <Greek_OMEGA>     : "ᾯ"  U1faf
@@ -2063,22 +1656,16 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <Multi_key> <asciitilde> <bar> <less> <Greek_OMEGA>     : "ᾯ"  U1faf
 <Multi_key> <asciitilde> <less> <bar> <Greek_OMEGA>     : "ᾯ"  U1faf
 <dead_iota> <dead_ogonek> <dead_tilde> <Greek_OMEGA>    : "ᾯ"  U1faf
-<dead_iota> <U0314> <dead_tilde> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_iota> <dead_dasia> <dead_tilde> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_iota> <dead_tilde> <dead_ogonek> <Greek_OMEGA>    : "ᾯ"  U1faf
-<dead_iota> <dead_tilde> <U0314> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_ogonek> <dead_iota> <dead_tilde> <Greek_OMEGA>    : "ᾯ"  U1faf
-<U0314> <dead_iota> <dead_tilde> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_dasia> <dead_iota> <dead_tilde> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_ogonek> <dead_tilde> <dead_iota> <Greek_OMEGA>    : "ᾯ"  U1faf
-<U0314> <dead_tilde> <dead_iota> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_dasia> <dead_tilde> <dead_iota> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_tilde> <dead_iota> <dead_ogonek> <Greek_OMEGA>    : "ᾯ"  U1faf
-<dead_tilde> <dead_iota> <U0314> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_tilde> <dead_iota> <dead_dasia> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_tilde> <dead_ogonek> <dead_iota> <Greek_OMEGA>    : "ᾯ"  U1faf
-<dead_tilde> <U0314> <dead_iota> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_tilde> <dead_dasia> <dead_iota> <Greek_OMEGA>    : "ᾯ"  U1faf
 <dead_breve> <Greek_alpha>                              : "ᾰ"  U1fb0
 <dead_macron> <Greek_alpha>                             : "ᾱ"  U1fb1
@@ -2182,74 +1769,54 @@ XCOMM	http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
 <dead_iota> <Greek_OMEGA>                               : "ῼ"  U1ffc
 <Multi_key> <greater> <Greek_rho>                       : "ῤ"  U1fe4
 <dead_horn> <Greek_rho>                                 : "ῤ"  U1fe4
-<U0313> <Greek_rho>                                 : "ῤ"  U1fe4
 <dead_psili> <Greek_rho>                                 : "ῤ"  U1fe4
 <Multi_key> <less> <Greek_rho>                          : "ῥ"  U1fe5
 <dead_ogonek> <Greek_rho>                               : "ῥ"  U1fe5
-<U0314> <Greek_rho>                               : "ῥ"  U1fe5
 <dead_dasia> <Greek_rho>                               : "ῥ"  U1fe5
 <Multi_key> <less> <Greek_RHO>                          : "Ῥ"  U1fec
 <dead_ogonek> <Greek_RHO>                               : "Ῥ"  U1fec
-<U0314> <Greek_RHO>                               : "Ῥ"  U1fec
 <dead_dasia> <Greek_RHO>                               : "Ῥ"  U1fec
 <dead_horn> <dead_grave> <space>                        : "῍"  U1fcd
-<U0313> <dead_grave> <space>                        : "῍"  U1fcd
 <dead_psili> <dead_grave> <space>                        : "῍"  U1fcd
 <dead_grave> <dead_horn> <space>                        : "῍"  U1fcd
-<dead_grave> <U0313> <space>                        : "῍"  U1fcd
 <dead_grave> <dead_psili> <space>                        : "῍"  U1fcd
 <dead_horn> <dead_acute> <space>                        : "῎"  U1fce
-<U0313> <dead_acute> <space>                        : "῎"  U1fce
 <dead_psili> <dead_acute> <space>                        : "῎"  U1fce
 <dead_acute> <dead_horn> <space>                        : "῎"  U1fce
-<dead_acute> <U0313> <space>                        : "῎"  U1fce
 <dead_acute> <dead_psili> <space>                        : "῎"  U1fce
 <dead_horn> <dead_tilde> <space>                        : "῏"  U1fcf
-<U0313> <dead_tilde> <space>                        : "῏"  U1fcf
 <dead_psili> <dead_tilde> <space>                        : "῏"  U1fcf
 <dead_tilde> <dead_horn> <space>                        : "῏"  U1fcf
-<dead_tilde> <U0313> <space>                        : "῏"  U1fcf
 <dead_tilde> <dead_psili> <space>                        : "῏"  U1fcf
 <dead_ogonek> <dead_grave> <space>                      : "῝"  U1fdd
-<U0314> <dead_grave> <space>                      : "῝"  U1fdd
 <dead_dasia> <dead_grave> <space>                      : "῝"  U1fdd
 <dead_grave> <dead_ogonek> <space>                      : "῝"  U1fdd
-<dead_grave> <U0314> <space>                      : "῝"  U1fdd
 <dead_grave> <dead_dasia> <space>                      : "῝"  U1fdd
 <dead_ogonek> <dead_acute> <space>                      : "῞"  U1fde
-<U0314> <dead_acute> <space>                      : "῞"  U1fde
 <dead_dasia> <dead_acute> <space>                      : "῞"  U1fde
 <dead_acute> <dead_ogonek> <space>                      : "῞"  U1fde
-<dead_acute> <U0314> <space>                      : "῞"  U1fde
 <dead_acute> <dead_dasia> <space>                      : "῞"  U1fde
 <dead_ogonek> <dead_tilde> <space>                      : "῟"  U1fdf
-<U0314> <dead_tilde> <space>                      : "῟"  U1fdf
 <dead_dasia> <dead_tilde> <space>                      : "῟"  U1fdf
 <dead_tilde> <dead_ogonek> <space>                      : "῟"  U1fdf
-<dead_tilde> <U0314> <space>                      : "῟"  U1fdf
 <dead_tilde> <dead_dasia> <space>                      : "῟"  U1fdf
 <dead_diaeresis> <dead_grave> <space>                   : "῭"  U1fed
 <dead_grave> <dead_diaeresis> <space>                   : "῭"  U1fed
 <dead_diaeresis> <dead_tilde> <space>                   : "῁"  U1fc1
 <dead_tilde> <dead_diaeresis> <space>                   : "῁"  U1fc1
 <dead_horn> <space>                                     : "᾿"  U1fbf
-<U0313> <space>                                     : "᾿"  U1fbf
 <dead_psili> <space>                                     : "᾿"  U1fbf
 <dead_horn> <dead_horn>                                 : "᾿"  U1fbf
-<U0313> <dead_horn>                                 : "᾿"  U1fbf
 <dead_psili> <dead_horn>                                 : "᾿"  U1fbf
 <dead_ogonek> <space>                                   : "῾"  U1ffe
-<U0314> <space>                                   : "῾"  U1ffe
 <dead_dasia> <space>                                   : "῾"  U1ffe
 <dead_ogonek> <dead_ogonek>                             : "῾"  U1ffe
-<U0314> <dead_ogonek>                             : "῾"  U1ffe
 <dead_dasia> <dead_ogonek>                             : "῾"  U1ffe
 <dead_grave> <space>                                    : "`"  U1fef
 <dead_grave> <dead_grave>                               : "`"  U1fef
 <dead_tilde> <space>                                    : "῀"  U1fc0
 <dead_tilde> <dead_tilde>                               : "῀"  U1fc0
 <dead_horn> <underscore>                                : "᾽"  U1fbd
-<U0313> <underscore>                                : "᾽"  U1fbd
 <dead_psili> <underscore>                                : "᾽"  U1fbd
 <dead_iota> <underscore>                                : "ι"  U1fbe
 <dead_iota> <space>                                     : "ͺ"  U037a
@@ -2389,6 +1956,19 @@ XCOMM Miscellaneous extensions.
 <Multi_key> <question> <exclam>         : "‽"   U203D # INTERROBANG
 <Multi_key> <exclam> <question>         : "‽"   U203D # INTERROBANG
 
+<Multi_key> <1> <3>			: "⅓"	U2153 # VULGAR FRACTION ONE THIRD
+<Multi_key> <2> <3>			: "⅔"	U2154 # VULGAR FRACTION TWO THIRDS
+<Multi_key> <1> <5>			: "⅕"	U2155 # VULGAR FRACTION ONE FIFTH
+<Multi_key> <2> <5>			: "⅖"	U2156 # VULGAR FRACTION TWO FIFTHS
+<Multi_key> <3> <5>			: "⅗"	U2157 # VULGAR FRACTION THREE FIFTHS
+<Multi_key> <4> <5>			: "⅘"	U2158 # VULGAR FRACTION FOUR FIFTHS
+<Multi_key> <1> <6>			: "⅙"	U2159 # VULGAR FRACTION ONE SIXTH
+<Multi_key> <5> <6>			: "⅚"	U215A # VULGAR FRACTION FIVE SIXTHS
+<Multi_key> <1> <8>			: "⅛"	U215B # VULGAR FRACTION ONE EIGHTH
+<Multi_key> <3> <8>			: "⅜"	U215C # VULGAR FRACTION THREE EIGHTHS
+<Multi_key> <5> <8>			: "⅝"	U215D # VULGAR FRACTION FIVE EIGHTHS
+<Multi_key> <7> <8>			: "⅞"	U215E # VULGAR FRACTION SEVEN EIGHTHS
+
 XCOMM
 XCOMM Khmer digraphs
 XCOMM
diff --git a/libX11/nls/el_GR.UTF-8/Makefile.in b/libX11/nls/el_GR.UTF-8/Makefile.in
index b0e5cdae5..3b9745159 100644
--- a/libX11/nls/el_GR.UTF-8/Makefile.in
+++ b/libX11/nls/el_GR.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/el_GR.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/el_GR.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/el_GR.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/el_GR.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/el_GR.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index 12806fb95..26084b906 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -215,6 +215,9 @@ XCOMM Other symbols
 <Multi_key> <question> <exclam>         : "‽"   U203D # INTERROBANG
 <Multi_key> <exclam> <question>         : "‽"   U203D # INTERROBANG
 
+<Multi_key> <C> <C> <C> <P>             : "☭"   U262D # HAMMER AND SICKLE
+<Multi_key> <less> <3>                  : "♥"   U2665 # BLACK HEART SUIT
+
 XCOMM Part 2
 
 XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically
@@ -225,29 +228,30 @@ XCOMM There are some conflicts among sequences, but I left them alone.
 XCOMM
 XCOMM group 1: cluster jamos made of three basic jamos
 
-## The follwing block gets overridden by later shorter compositions
-##<Multi_key> <U1107> <U1109> <U1100> 	: "ᄢ"   U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
-##<Multi_key> <U1107> <U1109> <U1103> 	: "ᄣ"   U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
-##<Multi_key> <U1107> <U1109> <U1107> 	: "ᄤ"   U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
-##<Multi_key> <U1107> <U1109> <U1109> 	: "ᄥ"   U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
-##<Multi_key> <U1107> <U1109> <U110C> 	: "ᄦ"   U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
-##<Multi_key> <U1107> <U1107> <U110B> 	: "ᄬ"   U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
-##<Multi_key> <U1109> <U1107> <U1100> 	: "ᄳ"   U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
-##<Multi_key> <U1109> <U1109> <U1109> 	: "ᄴ"   U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
-##<Multi_key> <U1169> <U1161> <U1175> 	: "ᅫ"   U116b # HANGUL JUNGSEONG WAE
-##<Multi_key> <U116E> <U1165> <U1175> 	: "ᅰ"   U1170 # HANGUL JUNGSEONG WE
-##<Multi_key> <U116E> <U1165> <U1173> 	: "ᆋ"   U118b # HANGUL JUNGSEONG U-EO-EU
-##<Multi_key> <U11A8> <U11BA> <U11A8> 	: "ᇄ"   U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
-##<Multi_key> <U11AF> <U11A8> <U11BA> 	: "ᇌ"   U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
-##<Multi_key> <U11AF> <U11AE> <U11C2> 	: "ᇏ"   U11cf # HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
-##<Multi_key> <U11AF> <U11B7> <U11A8> 	: "ᇑ"   U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
-##<Multi_key> <U11AF> <U11B7> <U11BA> 	: "ᇒ"   U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
-##<Multi_key> <U11AF> <U11B8> <U11BA> 	: "ᇓ"   U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
-##<Multi_key> <U11AF> <U11B8> <U11C2> 	: "ᇔ"   U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
-##<Multi_key> <U11AF> <U11B8> <U11BC> 	: "ᇕ"   U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
-##<Multi_key> <U11AF> <U11BA> <U11BA> 	: "ᇖ"   U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
-##<Multi_key> <U11B7> <U11BA> <U11BA> 	: "ᇞ"   U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
-##<Multi_key> <U11BC> <U11A8> <U11A8> 	: "ᇭ"   U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
+/* The follwing block gets overridden by later shorter compositions
+ * <Multi_key> <U1107> <U1109> <U1100> 	: "ᄢ"   U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
+ * <Multi_key> <U1107> <U1109> <U1103> 	: "ᄣ"   U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
+ * <Multi_key> <U1107> <U1109> <U1107> 	: "ᄤ"   U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
+ * <Multi_key> <U1107> <U1109> <U1109> 	: "ᄥ"   U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
+ * <Multi_key> <U1107> <U1109> <U110C> 	: "ᄦ"   U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
+ * <Multi_key> <U1107> <U1107> <U110B> 	: "ᄬ"   U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
+ * <Multi_key> <U1109> <U1107> <U1100> 	: "ᄳ"   U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
+ * <Multi_key> <U1109> <U1109> <U1109> 	: "ᄴ"   U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
+ * <Multi_key> <U1169> <U1161> <U1175> 	: "ᅫ"   U116b # HANGUL JUNGSEONG WAE
+ * <Multi_key> <U116E> <U1165> <U1175> 	: "ᅰ"   U1170 # HANGUL JUNGSEONG WE
+ * <Multi_key> <U116E> <U1165> <U1173> 	: "ᆋ"   U118b # HANGUL JUNGSEONG U-EO-EU
+ * <Multi_key> <U11A8> <U11BA> <U11A8> 	: "ᇄ"   U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
+ * <Multi_key> <U11AF> <U11A8> <U11BA> 	: "ᇌ"   U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
+ * <Multi_key> <U11AF> <U11AE> <U11C2> 	: "ᇏ"   U11cf # HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
+ * <Multi_key> <U11AF> <U11B7> <U11A8> 	: "ᇑ"   U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
+ * <Multi_key> <U11AF> <U11B7> <U11BA> 	: "ᇒ"   U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
+ * <Multi_key> <U11AF> <U11B8> <U11BA> 	: "ᇓ"   U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
+ * <Multi_key> <U11AF> <U11B8> <U11C2> 	: "ᇔ"   U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
+ * <Multi_key> <U11AF> <U11B8> <U11BC> 	: "ᇕ"   U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
+ * <Multi_key> <U11AF> <U11BA> <U11BA> 	: "ᇖ"   U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
+ * <Multi_key> <U11B7> <U11BA> <U11BA> 	: "ᇞ"   U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
+ * <Multi_key> <U11BC> <U11A8> <U11A8> 	: "ᇭ"   U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
+ */
 <Multi_key> <U1100> <U1100> 	: "ᄁ"   U1101 # HANGUL CHOSEONG SSANGKIYEOK
 <Multi_key> <U1103> <U1103> 	: "ᄄ"   U1104 # HANGUL CHOSEONG SSANGTIKEUT
 <Multi_key> <U1107> <U1107> 	: "ᄈ"   U1108 # HANGUL CHOSEONG SSANGPIEUP
@@ -488,16 +492,13 @@ XCOMM Part 3
 <Multi_key> <3> <4>              	: "¾"   threequarters # VULGAR FRACTION THREE QUARTERS
 <dead_grave> <A>                 	: "À"   Agrave # LATIN CAPITAL LETTER A WITH GRAVE
 <Multi_key> <grave> <A>          	: "À"   Agrave # LATIN CAPITAL LETTER A WITH GRAVE
-<combining_grave> <A>            	: "À"   Agrave # LATIN CAPITAL LETTER A WITH GRAVE
 <dead_acute> <A>                 	: "Á"   Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 <Multi_key> <acute> <A>          	: "Á"   Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 <Multi_key> <apostrophe> <A>     	: "Á"   Aacute # LATIN CAPITAL LETTER A WITH ACUTE
-<combining_acute> <A>            	: "Á"   Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 <dead_circumflex> <A>            	: "Â"   Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <A>    	: "Â"   Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 <dead_tilde> <A>                 	: "Ã"   Atilde # LATIN CAPITAL LETTER A WITH TILDE
 <Multi_key> <asciitilde> <A>     	: "Ã"   Atilde # LATIN CAPITAL LETTER A WITH TILDE
-<combining_tilde> <A>            	: "Ã"   Atilde # LATIN CAPITAL LETTER A WITH TILDE
 <dead_diaeresis> <A>             	: "Ä"   Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
 <Multi_key> <quotedbl> <A>       	: "Ä"   Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
 <dead_abovering> <A>             	: "Å"   Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
@@ -507,22 +508,18 @@ XCOMM Part 3
 <Multi_key> <cedilla> <C>          	: "Ç"   Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
 <dead_grave> <E>                 	: "È"   Egrave # LATIN CAPITAL LETTER E WITH GRAVE
 <Multi_key> <grave> <E>          	: "È"   Egrave # LATIN CAPITAL LETTER E WITH GRAVE
-<combining_grave> <E>            	: "È"   Egrave # LATIN CAPITAL LETTER E WITH GRAVE
 <dead_acute> <E>                 	: "É"   Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 <Multi_key> <acute> <E>          	: "É"   Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 <Multi_key> <apostrophe> <E>     	: "É"   Eacute # LATIN CAPITAL LETTER E WITH ACUTE
-<combining_acute> <E>            	: "É"   Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 <dead_circumflex> <E>            	: "Ê"   Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <E>    	: "Ê"   Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 <dead_diaeresis> <E>             	: "Ë"   Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
 <Multi_key> <quotedbl> <E>       	: "Ë"   Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
 <dead_grave> <I>                 	: "Ì"   Igrave # LATIN CAPITAL LETTER I WITH GRAVE
 <Multi_key> <grave> <I>          	: "Ì"   Igrave # LATIN CAPITAL LETTER I WITH GRAVE
-<combining_grave> <I>            	: "Ì"   Igrave # LATIN CAPITAL LETTER I WITH GRAVE
 <dead_acute> <I>                 	: "Í"   Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 <Multi_key> <acute> <I>          	: "Í"   Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 <Multi_key> <apostrophe> <I>     	: "Í"   Iacute # LATIN CAPITAL LETTER I WITH ACUTE
-<combining_acute> <I>            	: "Í"   Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 <dead_circumflex> <I>            	: "Î"   Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <I>    	: "Î"   Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 <dead_diaeresis> <I>             	: "Ï"   Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
@@ -530,19 +527,15 @@ XCOMM Part 3
 <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
-<combining_tilde> <N>            	: "Ñ"   Ntilde # LATIN CAPITAL LETTER N WITH TILDE
 <dead_grave> <O>                 	: "Ò"   Ograve # LATIN CAPITAL LETTER O WITH GRAVE
 <Multi_key> <grave> <O>          	: "Ò"   Ograve # LATIN CAPITAL LETTER O WITH GRAVE
-<combining_grave> <O>            	: "Ò"   Ograve # LATIN CAPITAL LETTER O WITH GRAVE
 <dead_acute> <O>                 	: "Ó"   Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 <Multi_key> <acute> <O>          	: "Ó"   Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 <Multi_key> <apostrophe> <O>     	: "Ó"   Oacute # LATIN CAPITAL LETTER O WITH ACUTE
-<combining_acute> <O>            	: "Ó"   Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 <dead_circumflex> <O>            	: "Ô"   Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <O>    	: "Ô"   Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 <dead_tilde> <O>                 	: "Õ"   Otilde # LATIN CAPITAL LETTER O WITH TILDE
 <Multi_key> <asciitilde> <O>     	: "Õ"   Otilde # LATIN CAPITAL LETTER O WITH TILDE
-<combining_tilde> <O>            	: "Õ"   Otilde # LATIN CAPITAL LETTER O WITH TILDE
 <dead_diaeresis> <O>             	: "Ö"   Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
 <Multi_key> <quotedbl> <O>       	: "Ö"   Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
 <Multi_key> <x> <x>              	: "×"   multiply # MULTIPLICATION SIGN
@@ -551,11 +544,9 @@ XCOMM Part 3
 <Multi_key> <KP_Divide> <O>      	: "Ø"   Oslash # LATIN CAPITAL LETTER O WITH STROKE
 <dead_grave> <U>                 	: "Ù"   Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
 <Multi_key> <grave> <U>          	: "Ù"   Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
-<combining_grave> <U>            	: "Ù"   Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
 <dead_acute> <U>                 	: "Ú"   Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 <Multi_key> <acute> <U>          	: "Ú"   Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 <Multi_key> <apostrophe> <U>     	: "Ú"   Uacute # LATIN CAPITAL LETTER U WITH ACUTE
-<combining_acute> <U>            	: "Ú"   Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 <dead_circumflex> <U>            	: "Û"   Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <U>    	: "Û"   Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 <dead_diaeresis> <U>             	: "Ü"   Udiaeresis # LATIN CAPITAL LETTER U WITH DIAERESIS
@@ -563,20 +554,16 @@ XCOMM Part 3
 <dead_acute> <Y>                 	: "Ý"   Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 <Multi_key> <acute> <Y>          	: "Ý"   Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 <Multi_key> <apostrophe> <Y>     	: "Ý"   Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
-<combining_acute> <Y>            	: "Ý"   Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 <Multi_key> <T> <H>              	: "Þ"   THORN # LATIN CAPITAL LETTER THORN
 <dead_grave> <a>                 	: "à"   agrave # LATIN SMALL LETTER A WITH GRAVE
 <Multi_key> <grave> <a>          	: "à"   agrave # LATIN SMALL LETTER A WITH GRAVE
-<combining_grave> <a>            	: "à"   agrave # LATIN SMALL LETTER A WITH GRAVE
 <dead_acute> <a>                 	: "á"   aacute # LATIN SMALL LETTER A WITH ACUTE
 <Multi_key> <acute> <a>          	: "á"   aacute # LATIN SMALL LETTER A WITH ACUTE
 <Multi_key> <apostrophe> <a>     	: "á"   aacute # LATIN SMALL LETTER A WITH ACUTE
-<combining_acute> <a>            	: "á"   aacute # LATIN SMALL LETTER A WITH ACUTE
 <dead_circumflex> <a>            	: "â"   acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <a>    	: "â"   acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
 <dead_tilde> <a>                 	: "ã"   atilde # LATIN SMALL LETTER A WITH TILDE
 <Multi_key> <asciitilde> <a>     	: "ã"   atilde # LATIN SMALL LETTER A WITH TILDE
-<combining_tilde> <a>            	: "ã"   atilde # LATIN SMALL LETTER A WITH TILDE
 <dead_diaeresis> <a>             	: "ä"   adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
 <Multi_key> <quotedbl> <a>       	: "ä"   adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
 <dead_abovering> <a>             	: "å"   aring # LATIN SMALL LETTER A WITH RING ABOVE
@@ -586,22 +573,18 @@ XCOMM Part 3
 <Multi_key> <cedilla> <c>          	: "ç"   ccedilla # LATIN SMALL LETTER C WITH CEDILLA
 <dead_grave> <e>                 	: "è"   egrave # LATIN SMALL LETTER E WITH GRAVE
 <Multi_key> <grave> <e>          	: "è"   egrave # LATIN SMALL LETTER E WITH GRAVE
-<combining_grave> <e>            	: "è"   egrave # LATIN SMALL LETTER E WITH GRAVE
 <dead_acute> <e>                 	: "é"   eacute # LATIN SMALL LETTER E WITH ACUTE
 <Multi_key> <acute> <e>          	: "é"   eacute # LATIN SMALL LETTER E WITH ACUTE
 <Multi_key> <apostrophe> <e>     	: "é"   eacute # LATIN SMALL LETTER E WITH ACUTE
-<combining_acute> <e>            	: "é"   eacute # LATIN SMALL LETTER E WITH ACUTE
 <dead_circumflex> <e>            	: "ê"   ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <e>    	: "ê"   ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
 <dead_diaeresis> <e>             	: "ë"   ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
 <Multi_key> <quotedbl> <e>       	: "ë"   ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
 <dead_grave> <i>                 	: "ì"   igrave # LATIN SMALL LETTER I WITH GRAVE
 <Multi_key> <grave> <i>          	: "ì"   igrave # LATIN SMALL LETTER I WITH GRAVE
-<combining_grave> <i>            	: "ì"   igrave # LATIN SMALL LETTER I WITH GRAVE
 <dead_acute> <i>                 	: "í"   iacute # LATIN SMALL LETTER I WITH ACUTE
 <Multi_key> <acute> <i>          	: "í"   iacute # LATIN SMALL LETTER I WITH ACUTE
 <Multi_key> <apostrophe> <i>     	: "í"   iacute # LATIN SMALL LETTER I WITH ACUTE
-<combining_acute> <i>            	: "í"   iacute # LATIN SMALL LETTER I WITH ACUTE
 <dead_circumflex> <i>            	: "î"   icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <i>    	: "î"   icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
 <dead_diaeresis> <i>             	: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
@@ -609,19 +592,15 @@ XCOMM Part 3
 <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
-<combining_tilde> <n>            	: "ñ"   ntilde # LATIN SMALL LETTER N WITH TILDE
 <dead_grave> <o>                 	: "ò"   ograve # LATIN SMALL LETTER O WITH GRAVE
 <Multi_key> <grave> <o>          	: "ò"   ograve # LATIN SMALL LETTER O WITH GRAVE
-<combining_grave> <o>            	: "ò"   ograve # LATIN SMALL LETTER O WITH GRAVE
 <dead_acute> <o>                 	: "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
 <Multi_key> <acute> <o>          	: "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
 <Multi_key> <apostrophe> <o>     	: "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
-<combining_acute> <o>            	: "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
 <dead_circumflex> <o>            	: "ô"   ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <o>    	: "ô"   ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
 <dead_tilde> <o>                 	: "õ"   otilde # LATIN SMALL LETTER O WITH TILDE
 <Multi_key> <asciitilde> <o>     	: "õ"   otilde # LATIN SMALL LETTER O WITH TILDE
-<combining_tilde> <o>            	: "õ"   otilde # LATIN SMALL LETTER O WITH TILDE
 <dead_diaeresis> <o>             	: "ö"   odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
 <Multi_key> <quotedbl> <o>       	: "ö"   odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
 <Multi_key> <colon> <minus>      	: "÷"   division # DIVISION SIGN
@@ -631,11 +610,9 @@ XCOMM Part 3
 <Multi_key> <KP_Divide> <o>      	: "ø"   oslash # LATIN SMALL LETTER O WITH STROKE
 <dead_grave> <u>                 	: "ù"   ugrave # LATIN SMALL LETTER U WITH GRAVE
 <Multi_key> <grave> <u>          	: "ù"   ugrave # LATIN SMALL LETTER U WITH GRAVE
-<combining_grave> <u>            	: "ù"   ugrave # LATIN SMALL LETTER U WITH GRAVE
 <dead_acute> <u>                 	: "ú"   uacute # LATIN SMALL LETTER U WITH ACUTE
 <Multi_key> <acute> <u>          	: "ú"   uacute # LATIN SMALL LETTER U WITH ACUTE
 <Multi_key> <apostrophe> <u>     	: "ú"   uacute # LATIN SMALL LETTER U WITH ACUTE
-<combining_acute> <u>            	: "ú"   uacute # LATIN SMALL LETTER U WITH ACUTE
 <dead_circumflex> <u>            	: "û"   ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <u>    	: "û"   ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
 <dead_diaeresis> <u>             	: "ü"   udiaeresis # LATIN SMALL LETTER U WITH DIAERESIS
@@ -643,7 +620,6 @@ XCOMM Part 3
 <dead_acute> <y>                 	: "ý"   yacute # LATIN SMALL LETTER Y WITH ACUTE
 <Multi_key> <acute> <y>          	: "ý"   yacute # LATIN SMALL LETTER Y WITH ACUTE
 <Multi_key> <apostrophe> <y>     	: "ý"   yacute # LATIN SMALL LETTER Y WITH ACUTE
-<combining_acute> <y>            	: "ý"   yacute # LATIN SMALL LETTER Y WITH ACUTE
 <Multi_key> <t> <h>              	: "þ"   thorn # LATIN SMALL LETTER THORN
 <dead_diaeresis> <y>             	: "ÿ"   ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
 <Multi_key> <quotedbl> <y>       	: "ÿ"   ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
@@ -666,11 +642,9 @@ XCOMM Part 3
 <dead_acute> <C>                 	: "Ć"   U0106 # LATIN CAPITAL LETTER C WITH ACUTE
 <Multi_key> <acute> <C>          	: "Ć"   U0106 # LATIN CAPITAL LETTER C WITH ACUTE
 <Multi_key> <apostrophe> <C>     	: "Ć"   U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-<combining_acute> <C>            	: "Ć"   U0106 # LATIN CAPITAL LETTER C WITH ACUTE
 <dead_acute> <c>                 	: "ć"   U0107 # LATIN SMALL LETTER C WITH ACUTE
 <Multi_key> <acute> <c>          	: "ć"   U0107 # LATIN SMALL LETTER C WITH ACUTE
 <Multi_key> <apostrophe> <c>     	: "ć"   U0107 # LATIN SMALL LETTER C WITH ACUTE
-<combining_acute> <c>            	: "ć"   U0107 # LATIN SMALL LETTER C WITH ACUTE
 <dead_circumflex> <C>            	: "Ĉ"   U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <C>    	: "Ĉ"   U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 <dead_circumflex> <c>            	: "ĉ"   U0109 # LATIN SMALL LETTER C WITH CIRCUMFLEX
@@ -749,10 +723,8 @@ XCOMM Part 3
 <Multi_key> <KP_Divide> <h>      	: "ħ"   U0127 # LATIN SMALL LETTER H WITH STROKE
 <dead_tilde> <I>                 	: "Ĩ"   U0128 # LATIN CAPITAL LETTER I WITH TILDE
 <Multi_key> <asciitilde> <I>     	: "Ĩ"   U0128 # LATIN CAPITAL LETTER I WITH TILDE
-<combining_tilde> <I>            	: "Ĩ"   U0128 # LATIN CAPITAL LETTER I WITH TILDE
 <dead_tilde> <i>                 	: "ĩ"   U0129 # LATIN SMALL LETTER I WITH TILDE
 <Multi_key> <asciitilde> <i>     	: "ĩ"   U0129 # LATIN SMALL LETTER I WITH TILDE
-<combining_tilde> <i>            	: "ĩ"   U0129 # LATIN SMALL LETTER I WITH TILDE
 <dead_macron> <I>                	: "Ī"   U012A # LATIN CAPITAL LETTER I WITH MACRON
 <Multi_key> <macron> <I>         	: "Ī"   U012A # LATIN CAPITAL LETTER I WITH MACRON
 <Multi_key> <underscore> <I>     	: "Ī"   U012A # LATIN CAPITAL LETTER I WITH MACRON
@@ -787,11 +759,9 @@ XCOMM Part 3
 <dead_acute> <L>                 	: "Ĺ"   U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 <Multi_key> <acute> <L>          	: "Ĺ"   U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 <Multi_key> <apostrophe> <L>     	: "Ĺ"   U0139 # LATIN CAPITAL LETTER L WITH ACUTE
-<combining_acute> <L>            	: "Ĺ"   U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 <dead_acute> <l>                 	: "ĺ"   U013A # LATIN SMALL LETTER L WITH ACUTE
 <Multi_key> <acute> <l>          	: "ĺ"   U013A # LATIN SMALL LETTER L WITH ACUTE
 <Multi_key> <apostrophe> <l>     	: "ĺ"   U013A # LATIN SMALL LETTER L WITH ACUTE
-<combining_acute> <l>            	: "ĺ"   U013A # LATIN SMALL LETTER L WITH ACUTE
 <dead_cedilla> <L>               	: "Ļ"   U013B # LATIN CAPITAL LETTER L WITH CEDILLA
 <Multi_key> <comma> <L>          	: "Ļ"   U013B # LATIN CAPITAL LETTER L WITH CEDILLA
 <Multi_key> <cedilla> <L>          	: "Ļ"   U013B # LATIN CAPITAL LETTER L WITH CEDILLA
@@ -811,11 +781,9 @@ XCOMM Part 3
 <dead_acute> <N>                 	: "Ń"   U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 <Multi_key> <acute> <N>          	: "Ń"   U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 <Multi_key> <apostrophe> <N>     	: "Ń"   U0143 # LATIN CAPITAL LETTER N WITH ACUTE
-<combining_acute> <N>            	: "Ń"   U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 <dead_acute> <n>                 	: "ń"   U0144 # LATIN SMALL LETTER N WITH ACUTE
 <Multi_key> <acute> <n>          	: "ń"   U0144 # LATIN SMALL LETTER N WITH ACUTE
 <Multi_key> <apostrophe> <n>     	: "ń"   U0144 # LATIN SMALL LETTER N WITH ACUTE
-<combining_acute> <n>            	: "ń"   U0144 # LATIN SMALL LETTER N WITH ACUTE
 <dead_cedilla> <N>               	: "Ņ"   U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
 <Multi_key> <comma> <N>          	: "Ņ"   U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
 <Multi_key> <cedilla> <N>          	: "Ņ"   U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
@@ -847,11 +815,9 @@ XCOMM Part 3
 <dead_acute> <R>                 	: "Ŕ"   U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 <Multi_key> <acute> <R>          	: "Ŕ"   U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 <Multi_key> <apostrophe> <R>     	: "Ŕ"   U0154 # LATIN CAPITAL LETTER R WITH ACUTE
-<combining_acute> <R>            	: "Ŕ"   U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 <dead_acute> <r>                 	: "ŕ"   U0155 # LATIN SMALL LETTER R WITH ACUTE
 <Multi_key> <acute> <r>          	: "ŕ"   U0155 # LATIN SMALL LETTER R WITH ACUTE
 <Multi_key> <apostrophe> <r>     	: "ŕ"   U0155 # LATIN SMALL LETTER R WITH ACUTE
-<combining_acute> <r>            	: "ŕ"   U0155 # LATIN SMALL LETTER R WITH ACUTE
 <dead_cedilla> <R>               	: "Ŗ"   U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
 <Multi_key> <comma> <R>          	: "Ŗ"   U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
 <Multi_key> <cedilla> <R>          	: "Ŗ"   U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
@@ -865,11 +831,9 @@ XCOMM Part 3
 <dead_acute> <S>                 	: "Ś"   U015A # LATIN CAPITAL LETTER S WITH ACUTE
 <Multi_key> <acute> <S>          	: "Ś"   U015A # LATIN CAPITAL LETTER S WITH ACUTE
 <Multi_key> <apostrophe> <S>     	: "Ś"   U015A # LATIN CAPITAL LETTER S WITH ACUTE
-<combining_acute> <S>            	: "Ś"   U015A # LATIN CAPITAL LETTER S WITH ACUTE
 <dead_acute> <s>                 	: "ś"   U015B # LATIN SMALL LETTER S WITH ACUTE
 <Multi_key> <acute> <s>          	: "ś"   U015B # LATIN SMALL LETTER S WITH ACUTE
 <Multi_key> <apostrophe> <s>     	: "ś"   U015B # LATIN SMALL LETTER S WITH ACUTE
-<combining_acute> <s>            	: "ś"   U015B # LATIN SMALL LETTER S WITH ACUTE
 <dead_circumflex> <S>            	: "Ŝ"   U015C # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <S>    	: "Ŝ"   U015C # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 <dead_circumflex> <s>            	: "ŝ"   U015D # LATIN SMALL LETTER S WITH CIRCUMFLEX
@@ -902,10 +866,8 @@ XCOMM Part 3
 <Multi_key> <KP_Divide> <t>      	: "ŧ"   U0167 # LATIN SMALL LETTER T WITH STROKE
 <dead_tilde> <U>                 	: "Ũ"   U0168 # LATIN CAPITAL LETTER U WITH TILDE
 <Multi_key> <asciitilde> <U>     	: "Ũ"   U0168 # LATIN CAPITAL LETTER U WITH TILDE
-<combining_tilde> <U>            	: "Ũ"   U0168 # LATIN CAPITAL LETTER U WITH TILDE
 <dead_tilde> <u>                 	: "ũ"   U0169 # LATIN SMALL LETTER U WITH TILDE
 <Multi_key> <asciitilde> <u>     	: "ũ"   U0169 # LATIN SMALL LETTER U WITH TILDE
-<combining_tilde> <u>            	: "ũ"   U0169 # LATIN SMALL LETTER U WITH TILDE
 <dead_macron> <U>                	: "Ū"   U016A # LATIN CAPITAL LETTER U WITH MACRON
 <Multi_key> <macron> <U>         	: "Ū"   U016A # LATIN CAPITAL LETTER U WITH MACRON
 <Multi_key> <underscore> <U>     	: "Ū"   U016A # LATIN CAPITAL LETTER U WITH MACRON
@@ -944,11 +906,9 @@ XCOMM Part 3
 <dead_acute> <Z>                 	: "Ź"   U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 <Multi_key> <acute> <Z>          	: "Ź"   U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 <Multi_key> <apostrophe> <Z>     	: "Ź"   U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
-<combining_acute> <Z>            	: "Ź"   U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 <dead_acute> <z>                 	: "ź"   U017A # LATIN SMALL LETTER Z WITH ACUTE
 <Multi_key> <acute> <z>          	: "ź"   U017A # LATIN SMALL LETTER Z WITH ACUTE
 <Multi_key> <apostrophe> <z>     	: "ź"   U017A # LATIN SMALL LETTER Z WITH ACUTE
-<combining_acute> <z>            	: "ź"   U017A # LATIN SMALL LETTER Z WITH ACUTE
 <dead_abovedot> <Z>              	: "Ż"   U017B # LATIN CAPITAL LETTER Z WITH DOT ABOVE
 <Multi_key> <period> <Z>         	: "Ż"   U017B # LATIN CAPITAL LETTER Z WITH DOT ABOVE
 <dead_abovedot> <z>              	: "ż"   U017C # LATIN SMALL LETTER Z WITH DOT ABOVE
@@ -993,9 +953,9 @@ XCOMM Part 3
 <Multi_key> <c> <U>              	: "Ǔ"   U01D3 # LATIN CAPITAL LETTER U WITH CARON
 <dead_caron> <u>                 	: "ǔ"   U01D4 # LATIN SMALL LETTER U WITH CARON
 <Multi_key> <c> <u>              	: "ǔ"   U01D4 # LATIN SMALL LETTER U WITH CARON
-<dead_macron> <U00DC>           	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-<Multi_key> <macron> <U00DC>    	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-<Multi_key> <underscore> <U00DC> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+<dead_macron> <Udiaeresis>           	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+<Multi_key> <macron> <Udiaeresis>    	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+<Multi_key> <underscore> <Udiaeresis> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <dead_diaeresis> <U> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <Multi_key> <quotedbl> <U> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
 <Multi_key> <macron> <dead_diaeresis> <U> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
@@ -1011,18 +971,15 @@ XCOMM Part 3
 <Multi_key> <macron> <quotedbl> <u> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
 <Multi_key> <underscore> <dead_diaeresis> <u> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
 <Multi_key> <underscore> <quotedbl> <u> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
-<dead_acute> <U00DC>            	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<Multi_key> <acute> <U00DC>     	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<Multi_key> <apostrophe> <U00DC> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<dead_acute> <Udiaeresis>            	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<Multi_key> <acute> <Udiaeresis>     	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<Multi_key> <apostrophe> <Udiaeresis> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <dead_diaeresis> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <Multi_key> <quotedbl> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <dead_diaeresis> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <quotedbl> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <U00DC>       	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <U> 	: "Ǘ"   U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <udiaeresis>        	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <udiaeresis> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <udiaeresis> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
@@ -1032,11 +989,8 @@ XCOMM Part 3
 <Multi_key> <acute> <quotedbl> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <udiaeresis>   	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<dead_caron> <U00DC>            	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-<Multi_key> <c> <U00DC>         	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+<dead_caron> <Udiaeresis>            	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+<Multi_key> <c> <Udiaeresis>         	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <dead_diaeresis> <U> 	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <Multi_key> <quotedbl> <U> 	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <Multi_key> <c> <dead_diaeresis> <U> 	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
@@ -1047,24 +1001,18 @@ XCOMM Part 3
 <dead_caron> <Multi_key> <quotedbl> <u> 	: "ǚ"   U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
 <Multi_key> <c> <dead_diaeresis> <u> 	: "ǚ"   U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
 <Multi_key> <c> <quotedbl> <u>   	: "ǚ"   U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-<dead_grave> <U00DC>            	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<Multi_key> <grave> <U00DC>     	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+<dead_grave> <Udiaeresis>            	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+<Multi_key> <grave> <Udiaeresis>     	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <dead_diaeresis> <U> 	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <Multi_key> <quotedbl> <U> 	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <dead_diaeresis> <U> 	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <quotedbl> <U> 	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <U00DC>       	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <dead_diaeresis> <U> 	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <Multi_key> <quotedbl> <U> 	: "Ǜ"   U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <udiaeresis>        	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <udiaeresis> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <dead_diaeresis> <u> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <Multi_key> <quotedbl> <u> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <dead_diaeresis> <u> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <quotedbl> <u> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <udiaeresis>   	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <dead_diaeresis> <u> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <Multi_key> <quotedbl> <u> 	: "ǜ"   U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_macron> <Adiaeresis>       	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
 <Multi_key> <macron> <Adiaeresis> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
 <Multi_key> <underscore> <Adiaeresis> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
@@ -1152,17 +1100,13 @@ XCOMM Part 3
 <dead_acute> <G>                 	: "Ǵ"   U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 <Multi_key> <acute> <G>          	: "Ǵ"   U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 <Multi_key> <apostrophe> <G>     	: "Ǵ"   U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
-<combining_acute> <G>            	: "Ǵ"   U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 <dead_acute> <g>                 	: "ǵ"   U01F5 # LATIN SMALL LETTER G WITH ACUTE
 <Multi_key> <acute> <g>          	: "ǵ"   U01F5 # LATIN SMALL LETTER G WITH ACUTE
 <Multi_key> <apostrophe> <g>     	: "ǵ"   U01F5 # LATIN SMALL LETTER G WITH ACUTE
-<combining_acute> <g>            	: "ǵ"   U01F5 # LATIN SMALL LETTER G WITH ACUTE
 <dead_grave> <N>                 	: "Ǹ"   U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
 <Multi_key> <grave> <N>          	: "Ǹ"   U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
-<combining_grave> <N>            	: "Ǹ"   U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
 <dead_grave> <n>                 	: "ǹ"   U01F9 # LATIN SMALL LETTER N WITH GRAVE
 <Multi_key> <grave> <n>          	: "ǹ"   U01F9 # LATIN SMALL LETTER N WITH GRAVE
-<combining_grave> <n>            	: "ǹ"   U01F9 # LATIN SMALL LETTER N WITH GRAVE
 <dead_acute> <Aring>             	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <acute> <Aring>      	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <Aring> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
@@ -1171,9 +1115,6 @@ XCOMM Part 3
 <Multi_key> <acute> <dead_abovering> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <dead_abovering> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <o> <apostrophe> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <Aring>        	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <dead_abovering> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <Multi_key> <o> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <dead_acute> <aring>             	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <acute> <aring>      	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <aring> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
@@ -1182,17 +1123,12 @@ XCOMM Part 3
 <Multi_key> <acute> <dead_abovering> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <dead_abovering> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <o> <apostrophe> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <aring>        	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <dead_abovering> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <Multi_key> <o> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <dead_acute> <AE>                	: "Ǽ"   U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 <Multi_key> <acute> <AE>         	: "Ǽ"   U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 <Multi_key> <apostrophe> <AE>    	: "Ǽ"   U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
-<combining_acute> <AE>           	: "Ǽ"   U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 <dead_acute> <ae>                	: "ǽ"   U01FD # LATIN SMALL LETTER AE WITH ACUTE
 <Multi_key> <acute> <ae>         	: "ǽ"   U01FD # LATIN SMALL LETTER AE WITH ACUTE
 <Multi_key> <apostrophe> <ae>    	: "ǽ"   U01FD # LATIN SMALL LETTER AE WITH ACUTE
-<combining_acute> <ae>           	: "ǽ"   U01FD # LATIN SMALL LETTER AE WITH ACUTE
 <dead_acute> <Ooblique>          	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <Ooblique>   	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <Ooblique> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
@@ -1203,9 +1139,6 @@ XCOMM Part 3
 <dead_acute> <Multi_key> <KP_Divide> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <KP_Divide> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Ooblique>     	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <slash> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <KP_Divide> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <dead_stroke> <dead_acute> <O>  	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <dead_acute> <oslash>            	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <oslash>     	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
@@ -1217,38 +1150,31 @@ XCOMM Part 3
 <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
-<combining_acute> <oslash>       	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <slash> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <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
-<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_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
@@ -1290,9 +1216,6 @@ XCOMM Part 3
 <Multi_key> <macron> <asciitilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <dead_tilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <asciitilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<dead_macron> <combining_tilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<Multi_key> <macron> <combining_tilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<Multi_key> <underscore> <combining_tilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <dead_macron> <otilde>           	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <macron> <otilde>    	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <otilde> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
@@ -1302,9 +1225,6 @@ XCOMM Part 3
 <Multi_key> <macron> <asciitilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <dead_tilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <asciitilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
-<dead_macron> <combining_tilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
-<Multi_key> <macron> <combining_tilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
-<Multi_key> <underscore> <combining_tilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_abovedot> <O>              	: "Ȯ"   U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 <Multi_key> <period> <O>         	: "Ȯ"   U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 <dead_abovedot> <o>              	: "ȯ"   U022F # LATIN SMALL LETTER O WITH DOT ABOVE
@@ -1400,39 +1320,30 @@ XCOMM Part 3
 <Multi_key> <quotedbl> <dead_acute> 	: "̈́"   U0344 # COMBINING GREEK DIALYTIKA TONOS
 <Multi_key> <quotedbl> <acute>   	: "̈́"   U0344 # COMBINING GREEK DIALYTIKA TONOS
 <Multi_key> <quotedbl> <apostrophe> 	: "̈́"   U0344 # COMBINING GREEK DIALYTIKA TONOS
-<Multi_key> <quotedbl> <combining_acute> 	: "̈́"   U0344 # COMBINING GREEK DIALYTIKA TONOS
 <Multi_key> <diaeresis> <dead_acute> 	: "΅"   U0385 # GREEK DIALYTIKA TONOS
 <Multi_key> <diaeresis> <acute>  	: "΅"   U0385 # GREEK DIALYTIKA TONOS
 <Multi_key> <diaeresis> <apostrophe> 	: "΅"   U0385 # GREEK DIALYTIKA TONOS
-<Multi_key> <diaeresis> <combining_acute> 	: "΅"   U0385 # GREEK DIALYTIKA TONOS
 <dead_acute> <Greek_ALPHA>       	: "Ά"   U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 <Multi_key> <acute> <Greek_ALPHA> 	: "Ά"   U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 <Multi_key> <apostrophe> <Greek_ALPHA> 	: "Ά"   U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
-<combining_acute> <Greek_ALPHA>  	: "Ά"   U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 <dead_acute> <Greek_EPSILON>     	: "Έ"   U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 <Multi_key> <acute> <Greek_EPSILON> 	: "Έ"   U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_EPSILON> 	: "Έ"   U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
-<combining_acute> <Greek_EPSILON> 	: "Έ"   U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 <dead_acute> <Greek_ETA>         	: "Ή"   U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 <Multi_key> <acute> <Greek_ETA>  	: "Ή"   U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 <Multi_key> <apostrophe> <Greek_ETA> 	: "Ή"   U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
-<combining_acute> <Greek_ETA>    	: "Ή"   U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 <dead_acute> <Greek_IOTA>        	: "Ί"   U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 <Multi_key> <acute> <Greek_IOTA> 	: "Ί"   U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 <Multi_key> <apostrophe> <Greek_IOTA> 	: "Ί"   U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
-<combining_acute> <Greek_IOTA>   	: "Ί"   U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 <dead_acute> <Greek_OMICRON>     	: "Ό"   U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 <Multi_key> <acute> <Greek_OMICRON> 	: "Ό"   U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 <Multi_key> <apostrophe> <Greek_OMICRON> 	: "Ό"   U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
-<combining_acute> <Greek_OMICRON> 	: "Ό"   U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 <dead_acute> <Greek_UPSILON>     	: "Ύ"   U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 <Multi_key> <acute> <Greek_UPSILON> 	: "Ύ"   U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_UPSILON> 	: "Ύ"   U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
-<combining_acute> <Greek_UPSILON> 	: "Ύ"   U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 <dead_acute> <Greek_OMEGA>       	: "Ώ"   U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 <Multi_key> <acute> <Greek_OMEGA> 	: "Ώ"   U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 <Multi_key> <apostrophe> <Greek_OMEGA> 	: "Ώ"   U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
-<combining_acute> <Greek_OMEGA>  	: "Ώ"   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
@@ -1442,9 +1353,6 @@ XCOMM Part 3
 <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
-<combining_acute> <Greek_iotadieresis> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<combining_acute> <dead_diaeresis> <Greek_iota> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<combining_acute> <Multi_key> <quotedbl> <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
 <dead_diaeresis> <Greek_UPSILON> 	: "Ϋ"   U03AB # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
@@ -1452,19 +1360,15 @@ XCOMM Part 3
 <dead_acute> <Greek_alpha>       	: "ά"   U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 <Multi_key> <acute> <Greek_alpha> 	: "ά"   U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 <Multi_key> <apostrophe> <Greek_alpha> 	: "ά"   U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
-<combining_acute> <Greek_alpha>  	: "ά"   U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 <dead_acute> <Greek_epsilon>     	: "έ"   U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 <Multi_key> <acute> <Greek_epsilon> 	: "έ"   U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_epsilon> 	: "έ"   U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
-<combining_acute> <Greek_epsilon> 	: "έ"   U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 <dead_acute> <Greek_eta>         	: "ή"   U03AE # GREEK SMALL LETTER ETA WITH TONOS
 <Multi_key> <acute> <Greek_eta>  	: "ή"   U03AE # GREEK SMALL LETTER ETA WITH TONOS
 <Multi_key> <apostrophe> <Greek_eta> 	: "ή"   U03AE # GREEK SMALL LETTER ETA WITH TONOS
-<combining_acute> <Greek_eta>    	: "ή"   U03AE # GREEK SMALL LETTER ETA WITH TONOS
 <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
-<combining_acute> <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
@@ -1474,9 +1378,6 @@ XCOMM Part 3
 <Multi_key> <acute> <quotedbl> <Greek_upsilon> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <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
-<combining_acute> <Greek_upsilondieresis> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<combining_acute> <dead_diaeresis> <Greek_upsilon> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<combining_acute> <Multi_key> <quotedbl> <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
 <dead_diaeresis> <Greek_upsilon> 	: "ϋ"   U03CB # GREEK SMALL LETTER UPSILON WITH DIALYTIKA
@@ -1484,34 +1385,27 @@ XCOMM Part 3
 <dead_acute> <Greek_omicron>     	: "ό"   U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
 <Multi_key> <acute> <Greek_omicron> 	: "ό"   U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
 <Multi_key> <apostrophe> <Greek_omicron> 	: "ό"   U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
-<combining_acute> <Greek_omicron> 	: "ό"   U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
 <dead_acute> <Greek_upsilon>     	: "ύ"   U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
 <Multi_key> <acute> <Greek_upsilon> 	: "ύ"   U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_upsilon> 	: "ύ"   U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
-<combining_acute> <Greek_upsilon> 	: "ύ"   U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
 <dead_acute> <Greek_omega>       	: "ώ"   U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
 <Multi_key> <acute> <Greek_omega> 	: "ώ"   U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
 <Multi_key> <apostrophe> <Greek_omega> 	: "ώ"   U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
-<combining_acute> <Greek_omega>  	: "ώ"   U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
 <Multi_key> <quotedbl> <U03D2> 	: "ϔ"   U03D4 # GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
 <dead_grave> <Cyrillic_IE>       	: "Ѐ"   U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
 <Multi_key> <grave> <Cyrillic_IE> 	: "Ѐ"   U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
-<combining_grave> <Cyrillic_IE>  	: "Ѐ"   U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
 <dead_diaeresis> <Cyrillic_IE>   	: "Ё"   U0401 # CYRILLIC CAPITAL LETTER IO
 <Multi_key> <quotedbl> <Cyrillic_IE> 	: "Ё"   U0401 # CYRILLIC CAPITAL LETTER IO
 <dead_acute> <Cyrillic_GHE>      	: "Ѓ"   U0403 # CYRILLIC CAPITAL LETTER GJE
 <Multi_key> <acute> <Cyrillic_GHE> 	: "Ѓ"   U0403 # CYRILLIC CAPITAL LETTER GJE
 <Multi_key> <apostrophe> <Cyrillic_GHE> 	: "Ѓ"   U0403 # CYRILLIC CAPITAL LETTER GJE
-<combining_acute> <Cyrillic_GHE> 	: "Ѓ"   U0403 # CYRILLIC CAPITAL LETTER GJE
 <dead_diaeresis> <Ukrainian_I>   	: "Ї"   U0407 # CYRILLIC CAPITAL LETTER YI
 <Multi_key> <quotedbl> <Ukrainian_I> 	: "Ї"   U0407 # CYRILLIC CAPITAL LETTER YI
 <dead_acute> <Cyrillic_KA>       	: "Ќ"   U040C # CYRILLIC CAPITAL LETTER KJE
 <Multi_key> <acute> <Cyrillic_KA> 	: "Ќ"   U040C # CYRILLIC CAPITAL LETTER KJE
 <Multi_key> <apostrophe> <Cyrillic_KA> 	: "Ќ"   U040C # CYRILLIC CAPITAL LETTER KJE
-<combining_acute> <Cyrillic_KA>  	: "Ќ"   U040C # CYRILLIC CAPITAL LETTER KJE
 <dead_grave> <Cyrillic_I>        	: "Ѝ"   U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
 <Multi_key> <grave> <Cyrillic_I> 	: "Ѝ"   U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
-<combining_grave> <Cyrillic_I>   	: "Ѝ"   U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
 <dead_breve> <Cyrillic_U>        	: "Ў"   U040E # CYRILLIC CAPITAL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_U>     	: "Ў"   U040E # CYRILLIC CAPITAL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_U>     	: "Ў"   U040E # CYRILLIC CAPITAL LETTER SHORT U
@@ -1523,27 +1417,23 @@ XCOMM Part 3
 <Multi_key> <b> <Cyrillic_i>     	: "й"   U0439 # CYRILLIC SMALL LETTER SHORT I
 <dead_grave> <Cyrillic_ie>       	: "ѐ"   U0450 # CYRILLIC SMALL LETTER IE WITH GRAVE
 <Multi_key> <grave> <Cyrillic_ie> 	: "ѐ"   U0450 # CYRILLIC SMALL LETTER IE WITH GRAVE
-<combining_grave> <Cyrillic_ie>  	: "ѐ"   U0450 # CYRILLIC SMALL LETTER IE WITH GRAVE
 <dead_diaeresis> <Cyrillic_ie>   	: "ё"   U0451 # CYRILLIC SMALL LETTER IO
 <Multi_key> <quotedbl> <Cyrillic_ie> 	: "ё"   U0451 # CYRILLIC SMALL LETTER IO
 <dead_acute> <Cyrillic_ghe>      	: "ѓ"   U0453 # CYRILLIC SMALL LETTER GJE
 <Multi_key> <acute> <Cyrillic_ghe> 	: "ѓ"   U0453 # CYRILLIC SMALL LETTER GJE
 <Multi_key> <apostrophe> <Cyrillic_ghe> 	: "ѓ"   U0453 # CYRILLIC SMALL LETTER GJE
-<combining_acute> <Cyrillic_ghe> 	: "ѓ"   U0453 # CYRILLIC SMALL LETTER GJE
 <dead_diaeresis> <Ukrainian_i>   	: "ї"   U0457 # CYRILLIC SMALL LETTER YI
 <Multi_key> <quotedbl> <Ukrainian_i> 	: "ї"   U0457 # CYRILLIC SMALL LETTER YI
 <dead_acute> <Cyrillic_ka>       	: "ќ"   U045C # CYRILLIC SMALL LETTER KJE
 <Multi_key> <acute> <Cyrillic_ka> 	: "ќ"   U045C # CYRILLIC SMALL LETTER KJE
 <Multi_key> <apostrophe> <Cyrillic_ka> 	: "ќ"   U045C # CYRILLIC SMALL LETTER KJE
-<combining_acute> <Cyrillic_ka>  	: "ќ"   U045C # CYRILLIC SMALL LETTER KJE
 <dead_grave> <Cyrillic_i>        	: "ѝ"   U045D # CYRILLIC SMALL LETTER I WITH GRAVE
 <Multi_key> <grave> <Cyrillic_i> 	: "ѝ"   U045D # CYRILLIC SMALL LETTER I WITH GRAVE
-<combining_grave> <Cyrillic_i>   	: "ѝ"   U045D # CYRILLIC SMALL LETTER I WITH GRAVE
 <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
@@ -1679,14 +1569,14 @@ XCOMM Part 3
 <Multi_key> <U0CC6> <U0CD6> 	: "ೈ"   U0CC8 # KANNADA VOWEL SIGN AI
 <Multi_key> <U0CC6> <U0CC2> 	: "ೊ"   U0CCA # KANNADA VOWEL SIGN O
 <Multi_key> <U0CCA> <U0CD5> 	: "ೋ"   U0CCB # KANNADA VOWEL SIGN OO
-##<Multi_key> <U0CC6> <U0CC2> <U0CD5> 	: "ೋ"   U0CCB # KANNADA VOWEL SIGN OO
+/* <Multi_key> <U0CC6> <U0CC2> <U0CD5> 	: "ೋ"   U0CCB # KANNADA VOWEL SIGN OO */
 <Multi_key> <U0D46> <U0D3E> 	: "ൊ"   U0D4A # MALAYALAM VOWEL SIGN O
 <Multi_key> <U0D47> <U0D3E> 	: "ോ"   U0D4B # MALAYALAM VOWEL SIGN OO
 <Multi_key> <U0D46> <U0D57> 	: "ൌ"   U0D4C # MALAYALAM VOWEL SIGN AU
 <Multi_key> <U0DD9> <U0DCA> 	: "ේ"   U0DDA # SINHALA VOWEL SIGN DIGA KOMBUVA
 <Multi_key> <U0DD9> <U0DCF> 	: "ො"   U0DDC # SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA
 <Multi_key> <U0DDC> <U0DCA> 	: "ෝ"   U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
-##<Multi_key> <U0DD9> <U0DCF> <U0DCA> 	: "ෝ"   U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
+/* <Multi_key> <U0DD9> <U0DCF> <U0DCA> 	: "ෝ"   U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA */
 <Multi_key> <U0DD9> <U0DDF> 	: "ෞ"   U0DDE # SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA
 <Multi_key> <U0FB7> <U0F42> 	: "གྷ"   U0F43 # TIBETAN LETTER GHA
 <Multi_key> <U0FB7> <U0F4C> 	: "ཌྷ"   U0F4D # TIBETAN LETTER DDHA
@@ -1706,9 +1596,7 @@ XCOMM Part 3
 <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
 <dead_belowring> <A>                  	: "Ḁ"   U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
-<U0325> <a>                  	: "ḁ"   U1E01 # LATIN SMALL 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
@@ -1716,13 +1604,9 @@ XCOMM Part 3
 <Multi_key> <period> <b>         	: "ḃ"   U1E03 # LATIN SMALL LETTER B WITH DOT ABOVE
 <dead_belowdot> <B>              	: "Ḅ"   U1E04 # LATIN CAPITAL LETTER B WITH DOT BELOW
 <Multi_key> <exclam> <B>         	: "Ḅ"   U1E04 # LATIN CAPITAL LETTER B WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <b>         	: "ḅ"   U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
-<U0331> <B>                  	: "Ḇ"   U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
 <dead_belowmacron> <B>                  	: "Ḇ"   U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
-<U0331> <b>                  	: "ḇ"   U1E07 # LATIN SMALL 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
@@ -1734,12 +1618,7 @@ XCOMM Part 3
 <Multi_key> <acute> <comma> <C>  	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <cedilla> <C>  	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <dead_cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <cedilla> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Ccedilla>     	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <dead_cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <comma> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <dead_acute> <ccedilla>          	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <ccedilla>   	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <ccedilla> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
@@ -1750,25 +1629,16 @@ XCOMM Part 3
 <Multi_key> <acute> <comma> <c>  	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <cedilla> <c>  	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <dead_cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <cedilla> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <ccedilla>     	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <dead_cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <comma> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <dead_abovedot> <D>              	: "Ḋ"   U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
 <Multi_key> <period> <D>         	: "Ḋ"   U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
 <dead_abovedot> <d>              	: "ḋ"   U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
 <Multi_key> <period> <d>         	: "ḋ"   U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
 <dead_belowdot> <D>              	: "Ḍ"   U1E0C # LATIN CAPITAL LETTER D WITH DOT BELOW
 <Multi_key> <exclam> <D>         	: "Ḍ"   U1E0C # LATIN CAPITAL LETTER D WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <d>         	: "ḍ"   U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
-<U0331> <D>                  	: "Ḏ"   U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
 <dead_belowmacron> <D>                  	: "Ḏ"   U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
-<U0331> <d>                  	: "ḏ"   U1E0F # LATIN SMALL 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
@@ -1776,9 +1646,7 @@ XCOMM Part 3
 <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
 <dead_belowcircumflex> <D>                  	: "Ḓ"   U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-<U032D> <d>                  	: "ḓ"   U1E13 # LATIN SMALL 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
@@ -1788,10 +1656,6 @@ XCOMM Part 3
 <Multi_key> <grave> <dead_macron> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Emacron>      	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <dead_grave> <emacron>           	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <emacron>    	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <e>   	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
@@ -1800,10 +1664,6 @@ XCOMM Part 3
 <Multi_key> <grave> <dead_macron> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <emacron>      	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <dead_acute> <Emacron>           	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <acute> <Emacron>    	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <Emacron> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
@@ -1816,10 +1676,6 @@ XCOMM Part 3
 <Multi_key> <apostrophe> <dead_macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Emacron>      	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <dead_acute> <emacron>           	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <acute> <emacron>    	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <emacron> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
@@ -1832,17 +1688,9 @@ XCOMM Part 3
 <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
-<combining_acute> <emacron>      	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<U032D> <E>                  	: "Ḙ"   U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <E>                  	: "Ḙ"   U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-<U032D> <e>                  	: "ḙ"   U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <e>                  	: "ḙ"   U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
-<U0330> <E>                  	: "Ḛ"   U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
 <dead_belowtilde> <E>                  	: "Ḛ"   U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
-<U0330> <e>                  	: "ḛ"   U1E1B # LATIN SMALL 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
@@ -1884,10 +1732,8 @@ XCOMM Part 3
 <Multi_key> <period> <h>         	: "ḣ"   U1E23 # LATIN SMALL LETTER H WITH DOT ABOVE
 <dead_belowdot> <H>              	: "Ḥ"   U1E24 # LATIN CAPITAL LETTER H WITH DOT BELOW
 <Multi_key> <exclam> <H>         	: "Ḥ"   U1E24 # LATIN CAPITAL LETTER H WITH DOT BELOW
-<combining_belowdot> <H>         	: "Ḥ"   U1E24 # LATIN CAPITAL LETTER H WITH DOT BELOW
 <dead_belowdot> <h>              	: "ḥ"   U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
 <Multi_key> <exclam> <h>         	: "ḥ"   U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
-<combining_belowdot> <h>         	: "ḥ"   U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
 <dead_diaeresis> <H>             	: "Ḧ"   U1E26 # LATIN CAPITAL LETTER H WITH DIAERESIS
 <Multi_key> <quotedbl> <H>       	: "Ḧ"   U1E26 # LATIN CAPITAL LETTER H WITH DIAERESIS
 <dead_diaeresis> <h>             	: "ḧ"   U1E27 # LATIN SMALL LETTER H WITH DIAERESIS
@@ -1898,13 +1744,9 @@ XCOMM Part 3
 <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
 <dead_belowbreve> <H>                  	: "Ḫ"   U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
-<U032E> <h>                  	: "ḫ"   U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
 <dead_belowbreve> <h>                  	: "ḫ"   U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
-<U0330> <I>                  	: "Ḭ"   U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
 <dead_belowtilde> <I>                  	: "Ḭ"   U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
-<U0330> <i>                  	: "ḭ"   U1E2D # LATIN SMALL 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
@@ -1915,9 +1757,6 @@ XCOMM Part 3
 <Multi_key> <acute> <quotedbl> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <Idiaeresis>   	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <dead_acute> <idiaeresis>        	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <idiaeresis> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <idiaeresis> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
@@ -1927,33 +1766,22 @@ XCOMM Part 3
 <Multi_key> <acute> <quotedbl> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <idiaeresis>   	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <dead_acute> <K>                 	: "Ḱ"   U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
 <Multi_key> <acute> <K>          	: "Ḱ"   U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
 <Multi_key> <apostrophe> <K>     	: "Ḱ"   U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
-<combining_acute> <K>            	: "Ḱ"   U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
 <dead_acute> <k>                 	: "ḱ"   U1E31 # LATIN SMALL LETTER K WITH ACUTE
 <Multi_key> <acute> <k>          	: "ḱ"   U1E31 # LATIN SMALL LETTER K WITH ACUTE
 <Multi_key> <apostrophe> <k>     	: "ḱ"   U1E31 # LATIN SMALL LETTER K WITH ACUTE
-<combining_acute> <k>            	: "ḱ"   U1E31 # LATIN SMALL LETTER K WITH ACUTE
 <dead_belowdot> <K>              	: "Ḳ"   U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
 <Multi_key> <exclam> <K>         	: "Ḳ"   U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <k>         	: "ḳ"   U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
-<U0331> <K>                  	: "Ḵ"   U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
 <dead_belowmacron> <K>                  	: "Ḵ"   U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
-<U0331> <k>                  	: "ḵ"   U1E35 # LATIN SMALL 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
-<combining_belowdot> <L>         	: "Ḷ"   U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
 <dead_belowdot> <l>              	: "ḷ"   U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
 <Multi_key> <exclam> <l>         	: "ḷ"   U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
-<combining_belowdot> <l>         	: "ḷ"   U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
 <dead_macron> <U1E36>        	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1E36> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1E36> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
@@ -1963,9 +1791,6 @@ XCOMM Part 3
 <Multi_key> <macron> <exclam> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <dead_belowdot> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <exclam> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<dead_macron> <combining_belowdot> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <dead_macron> <U1E37>        	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1E37> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1E37> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
@@ -1975,52 +1800,35 @@ XCOMM Part 3
 <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
-<dead_macron> <combining_belowdot> <l> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <l> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <l> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<U0331> <L>                  	: "Ḻ"   U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
 <dead_belowmacron> <L>                  	: "Ḻ"   U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
-<U0331> <l>                  	: "ḻ"   U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
 <dead_belowmacron> <l>                  	: "ḻ"   U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
-<U032D> <L>                  	: "Ḽ"   U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <L>                  	: "Ḽ"   U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-<U032D> <l>                  	: "ḽ"   U1E3D # LATIN SMALL 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
-<combining_acute> <M>            	: "Ḿ"   U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
 <dead_acute> <m>                 	: "ḿ"   U1E3F # LATIN SMALL LETTER M WITH ACUTE
 <Multi_key> <acute> <m>          	: "ḿ"   U1E3F # LATIN SMALL LETTER M WITH ACUTE
 <Multi_key> <apostrophe> <m>     	: "ḿ"   U1E3F # LATIN SMALL LETTER M WITH ACUTE
-<combining_acute> <m>            	: "ḿ"   U1E3F # LATIN SMALL LETTER M WITH ACUTE
 <dead_abovedot> <M>              	: "Ṁ"   U1E40 # LATIN CAPITAL LETTER M WITH DOT ABOVE
 <Multi_key> <period> <M>         	: "Ṁ"   U1E40 # LATIN CAPITAL LETTER M WITH DOT ABOVE
 <dead_abovedot> <m>              	: "ṁ"   U1E41 # LATIN SMALL LETTER M WITH DOT ABOVE
 <Multi_key> <period> <m>         	: "ṁ"   U1E41 # LATIN SMALL LETTER M WITH DOT ABOVE
 <dead_belowdot> <M>              	: "Ṃ"   U1E42 # LATIN CAPITAL LETTER M WITH DOT BELOW
 <Multi_key> <exclam> <M>         	: "Ṃ"   U1E42 # LATIN CAPITAL LETTER M WITH DOT BELOW
-<combining_belowdot> <M>         	: "Ṃ"   U1E42 # LATIN CAPITAL LETTER M WITH DOT BELOW
 <dead_belowdot> <m>              	: "ṃ"   U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
 <Multi_key> <exclam> <m>         	: "ṃ"   U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
-<combining_belowdot> <m>         	: "ṃ"   U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
 <dead_abovedot> <N>              	: "Ṅ"   U1E44 # LATIN CAPITAL LETTER N WITH DOT ABOVE
 <Multi_key> <period> <N>         	: "Ṅ"   U1E44 # LATIN CAPITAL LETTER N WITH DOT ABOVE
 <dead_abovedot> <n>              	: "ṅ"   U1E45 # LATIN SMALL LETTER N WITH DOT ABOVE
 <Multi_key> <period> <n>         	: "ṅ"   U1E45 # LATIN SMALL LETTER N WITH DOT ABOVE
 <dead_belowdot> <N>              	: "Ṇ"   U1E46 # LATIN CAPITAL LETTER N WITH DOT BELOW
 <Multi_key> <exclam> <N>         	: "Ṇ"   U1E46 # LATIN CAPITAL LETTER N WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <n>         	: "ṇ"   U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
-<U0331> <N>                  	: "Ṉ"   U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
 <dead_belowmacron> <N>                  	: "Ṉ"   U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
-<U0331> <n>                  	: "ṉ"   U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
 <dead_belowmacron> <n>                  	: "ṉ"   U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
-<U032D> <N>                  	: "Ṋ"   U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <N>                  	: "Ṋ"   U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-<U032D> <n>                  	: "ṋ"   U1E4B # LATIN SMALL 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
@@ -2031,13 +1839,6 @@ XCOMM Part 3
 <Multi_key> <acute> <asciitilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <Otilde>       	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <dead_acute> <otilde>            	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <acute> <otilde>     	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <otilde> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
@@ -2047,29 +1848,18 @@ XCOMM Part 3
 <Multi_key> <acute> <asciitilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <otilde>       	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <dead_diaeresis> <Otilde>        	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <Otilde>  	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <dead_tilde> <O> 	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <Multi_key> <asciitilde> <O> 	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <dead_tilde> <O> 	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <asciitilde> <O> 	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_diaeresis> <combining_tilde> <O> 	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<Multi_key> <quotedbl> <combining_tilde> <O> 	: "Ṏ"   U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <otilde>        	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <otilde>  	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <dead_tilde> <o> 	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <Multi_key> <asciitilde> <o> 	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <dead_tilde> <o> 	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <asciitilde> <o> 	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_diaeresis> <combining_tilde> <o> 	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<Multi_key> <quotedbl> <combining_tilde> <o> 	: "ṏ"   U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <dead_grave> <Omacron>           	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <Omacron>    	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <O>   	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
@@ -2078,10 +1868,6 @@ XCOMM Part 3
 <Multi_key> <grave> <dead_macron> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Omacron>      	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <dead_grave> <omacron>           	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <omacron>    	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <o>   	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
@@ -2090,10 +1876,6 @@ XCOMM Part 3
 <Multi_key> <grave> <dead_macron> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <omacron>      	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <dead_acute> <Omacron>           	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <acute> <Omacron>    	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <Omacron> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
@@ -2106,10 +1888,6 @@ XCOMM Part 3
 <Multi_key> <apostrophe> <dead_macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Omacron>      	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <dead_acute> <omacron>           	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <acute> <omacron>    	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <omacron> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
@@ -2122,18 +1900,12 @@ XCOMM Part 3
 <Multi_key> <apostrophe> <dead_macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <omacron>      	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <dead_acute> <P>                 	: "Ṕ"   U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
 <Multi_key> <acute> <P>          	: "Ṕ"   U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
 <Multi_key> <apostrophe> <P>     	: "Ṕ"   U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
-<combining_acute> <P>            	: "Ṕ"   U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
 <dead_acute> <p>                 	: "ṕ"   U1E55 # LATIN SMALL LETTER P WITH ACUTE
 <Multi_key> <acute> <p>          	: "ṕ"   U1E55 # LATIN SMALL LETTER P WITH ACUTE
 <Multi_key> <apostrophe> <p>     	: "ṕ"   U1E55 # LATIN SMALL LETTER P WITH ACUTE
-<combining_acute> <p>            	: "ṕ"   U1E55 # LATIN SMALL LETTER P WITH ACUTE
 <dead_abovedot> <P>              	: "Ṗ"   U1E56 # LATIN CAPITAL LETTER P WITH DOT ABOVE
 <Multi_key> <period> <P>         	: "Ṗ"   U1E56 # LATIN CAPITAL LETTER P WITH DOT ABOVE
 <dead_abovedot> <p>              	: "ṗ"   U1E57 # LATIN SMALL LETTER P WITH DOT ABOVE
@@ -2144,10 +1916,8 @@ XCOMM Part 3
 <Multi_key> <period> <r>         	: "ṙ"   U1E59 # LATIN SMALL LETTER R WITH DOT ABOVE
 <dead_belowdot> <R>              	: "Ṛ"   U1E5A # LATIN CAPITAL LETTER R WITH DOT BELOW
 <Multi_key> <exclam> <R>         	: "Ṛ"   U1E5A # LATIN CAPITAL LETTER R WITH DOT BELOW
-<combining_belowdot> <R>         	: "Ṛ"   U1E5A # LATIN CAPITAL LETTER R WITH DOT BELOW
 <dead_belowdot> <r>              	: "ṛ"   U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
 <Multi_key> <exclam> <r>         	: "ṛ"   U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
-<combining_belowdot> <r>         	: "ṛ"   U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
 <dead_macron> <U1E5A>        	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1E5A> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1E5A> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
@@ -2157,9 +1927,6 @@ XCOMM Part 3
 <Multi_key> <macron> <exclam> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <dead_belowdot> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <exclam> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<dead_macron> <combining_belowdot> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <dead_macron> <U1E5B>        	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1E5B> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1E5B> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
@@ -2169,12 +1936,7 @@ XCOMM Part 3
 <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
-<dead_macron> <combining_belowdot> <r> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <r> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <r> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<U0331> <R>                  	: "Ṟ"   U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
 <dead_belowmacron> <R>                  	: "Ṟ"   U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
-<U0331> <r>                  	: "ṟ"   U1E5F # LATIN SMALL 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
@@ -2182,10 +1944,8 @@ XCOMM Part 3
 <Multi_key> <period> <s>         	: "ṡ"   U1E61 # LATIN SMALL LETTER S WITH DOT ABOVE
 <dead_belowdot> <S>              	: "Ṣ"   U1E62 # LATIN CAPITAL LETTER S WITH DOT BELOW
 <Multi_key> <exclam> <S>         	: "Ṣ"   U1E62 # LATIN CAPITAL LETTER S WITH DOT BELOW
-<combining_belowdot> <S>         	: "Ṣ"   U1E62 # LATIN CAPITAL LETTER S WITH DOT BELOW
 <dead_belowdot> <s>              	: "ṣ"   U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
 <Multi_key> <exclam> <s>         	: "ṣ"   U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
-<combining_belowdot> <s>         	: "ṣ"   U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
 <dead_abovedot> <Sacute>         	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <Sacute>    	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <dead_acute> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
@@ -2194,8 +1954,6 @@ XCOMM Part 3
 <Multi_key> <period> <dead_acute> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <acute> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <apostrophe> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_abovedot> <combining_acute> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<Multi_key> <period> <combining_acute> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <sacute>         	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <sacute>    	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <dead_acute> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
@@ -2204,8 +1962,6 @@ XCOMM Part 3
 <Multi_key> <period> <dead_acute> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <acute> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <apostrophe> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_abovedot> <combining_acute> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-<Multi_key> <period> <combining_acute> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <Scaron>         	: "Ṧ"   U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
 <Multi_key> <period> <Scaron>    	: "Ṧ"   U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
 <dead_abovedot> <dead_caron> <S> 	: "Ṧ"   U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
@@ -2222,45 +1978,29 @@ XCOMM Part 3
 <dead_abovedot> <Multi_key> <exclam> <S> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <dead_belowdot> <S> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <exclam> <S> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_abovedot> <combining_belowdot> <S> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<Multi_key> <period> <combining_belowdot> <S> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <U1E63>      	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <U1E63> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <dead_belowdot> <s> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <Multi_key> <exclam> <s> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <dead_belowdot> <s> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <exclam> <s> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_abovedot> <combining_belowdot> <s> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<Multi_key> <period> <combining_belowdot> <s> 	: "ṩ"   U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <T>              	: "Ṫ"   U1E6A # LATIN CAPITAL LETTER T WITH DOT ABOVE
 <Multi_key> <period> <T>         	: "Ṫ"   U1E6A # LATIN CAPITAL LETTER T WITH DOT ABOVE
 <dead_abovedot> <t>              	: "ṫ"   U1E6B # LATIN SMALL LETTER T WITH DOT ABOVE
 <Multi_key> <period> <t>         	: "ṫ"   U1E6B # LATIN SMALL LETTER T WITH DOT ABOVE
 <dead_belowdot> <T>              	: "Ṭ"   U1E6C # LATIN CAPITAL LETTER T WITH DOT BELOW
 <Multi_key> <exclam> <T>         	: "Ṭ"   U1E6C # LATIN CAPITAL LETTER T WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <t>         	: "ṭ"   U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
-<U0331> <T>                  	: "Ṯ"   U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
 <dead_belowmacron> <T>                  	: "Ṯ"   U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
-<U0331> <t>                  	: "ṯ"   U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
 <dead_belowmacron> <t>                  	: "ṯ"   U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
-<U032D> <T>                  	: "Ṱ"   U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <T>                  	: "Ṱ"   U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-<U032D> <t>                  	: "ṱ"   U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <t>                  	: "ṱ"   U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
-<U0324> <U>                  	: "Ṳ"   U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
 <dead_belowdiaeresis> <U>                  	: "Ṳ"   U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-<U0324> <u>                  	: "ṳ"   U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
 <dead_belowdiaeresis> <u>                  	: "ṳ"   U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
-<U0330> <U>                  	: "Ṵ"   U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
 <dead_belowtilde> <U>                  	: "Ṵ"   U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
-<U0330> <u>                  	: "ṵ"   U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
 <dead_belowtilde> <u>                  	: "ṵ"   U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
-<U032D> <U>                  	: "Ṷ"   U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
 <dead_belowcircumflex> <U>                  	: "Ṷ"   U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-<U032D> <u>                  	: "ṷ"   U1E77 # LATIN SMALL 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
@@ -2271,13 +2011,6 @@ XCOMM Part 3
 <Multi_key> <acute> <asciitilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <Utilde>       	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <dead_acute> <utilde>            	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <acute> <utilde>     	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <utilde> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
@@ -2287,13 +2020,6 @@ XCOMM Part 3
 <Multi_key> <acute> <asciitilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <utilde>       	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <dead_diaeresis> <Umacron>       	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
 <Multi_key> <quotedbl> <Umacron> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
 <dead_diaeresis> <dead_macron> <U> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
@@ -2312,30 +2038,22 @@ XCOMM Part 3
 <Multi_key> <quotedbl> <underscore> <u> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
 <dead_tilde> <V>                 	: "Ṽ"   U1E7C # LATIN CAPITAL LETTER V WITH TILDE
 <Multi_key> <asciitilde> <V>     	: "Ṽ"   U1E7C # LATIN CAPITAL LETTER V WITH TILDE
-<combining_tilde> <V>            	: "Ṽ"   U1E7C # LATIN CAPITAL LETTER V WITH TILDE
 <dead_tilde> <v>                 	: "ṽ"   U1E7D # LATIN SMALL LETTER V WITH TILDE
 <Multi_key> <asciitilde> <v>     	: "ṽ"   U1E7D # LATIN SMALL LETTER V WITH TILDE
-<combining_tilde> <v>            	: "ṽ"   U1E7D # LATIN SMALL LETTER V WITH TILDE
 <dead_belowdot> <V>              	: "Ṿ"   U1E7E # LATIN CAPITAL LETTER V WITH DOT BELOW
 <Multi_key> <exclam> <V>         	: "Ṿ"   U1E7E # LATIN CAPITAL LETTER V WITH DOT BELOW
-<combining_belowdot> <V>         	: "Ṿ"   U1E7E # LATIN CAPITAL LETTER V WITH DOT BELOW
 <dead_belowdot> <v>              	: "ṿ"   U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
 <Multi_key> <exclam> <v>         	: "ṿ"   U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
-<combining_belowdot> <v>         	: "ṿ"   U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
 <dead_grave> <W>                 	: "Ẁ"   U1E80 # LATIN CAPITAL LETTER W WITH GRAVE
 <Multi_key> <grave> <W>          	: "Ẁ"   U1E80 # LATIN CAPITAL LETTER W WITH GRAVE
-<combining_grave> <W>            	: "Ẁ"   U1E80 # LATIN CAPITAL LETTER W WITH GRAVE
 <dead_grave> <w>                 	: "ẁ"   U1E81 # LATIN SMALL LETTER W WITH GRAVE
 <Multi_key> <grave> <w>          	: "ẁ"   U1E81 # LATIN SMALL LETTER W WITH GRAVE
-<combining_grave> <w>            	: "ẁ"   U1E81 # LATIN SMALL LETTER W WITH GRAVE
 <dead_acute> <W>                 	: "Ẃ"   U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
 <Multi_key> <acute> <W>          	: "Ẃ"   U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
 <Multi_key> <apostrophe> <W>     	: "Ẃ"   U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
-<combining_acute> <W>            	: "Ẃ"   U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
 <dead_acute> <w>                 	: "ẃ"   U1E83 # LATIN SMALL LETTER W WITH ACUTE
 <Multi_key> <acute> <w>          	: "ẃ"   U1E83 # LATIN SMALL LETTER W WITH ACUTE
 <Multi_key> <apostrophe> <w>     	: "ẃ"   U1E83 # LATIN SMALL LETTER W WITH ACUTE
-<combining_acute> <w>            	: "ẃ"   U1E83 # LATIN SMALL LETTER W WITH ACUTE
 <dead_diaeresis> <W>             	: "Ẅ"   U1E84 # LATIN CAPITAL LETTER W WITH DIAERESIS
 <Multi_key> <quotedbl> <W>       	: "Ẅ"   U1E84 # LATIN CAPITAL LETTER W WITH DIAERESIS
 <dead_diaeresis> <w>             	: "ẅ"   U1E85 # LATIN SMALL LETTER W WITH DIAERESIS
@@ -2346,10 +2064,8 @@ XCOMM Part 3
 <Multi_key> <period> <w>         	: "ẇ"   U1E87 # LATIN SMALL LETTER W WITH DOT ABOVE
 <dead_belowdot> <W>              	: "Ẉ"   U1E88 # LATIN CAPITAL LETTER W WITH DOT BELOW
 <Multi_key> <exclam> <W>         	: "Ẉ"   U1E88 # LATIN CAPITAL LETTER W WITH DOT BELOW
-<combining_belowdot> <W>         	: "Ẉ"   U1E88 # LATIN CAPITAL LETTER W WITH DOT BELOW
 <dead_belowdot> <w>              	: "ẉ"   U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
 <Multi_key> <exclam> <w>         	: "ẉ"   U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
-<combining_belowdot> <w>         	: "ẉ"   U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
 <dead_abovedot> <X>              	: "Ẋ"   U1E8A # LATIN CAPITAL LETTER X WITH DOT ABOVE
 <Multi_key> <period> <X>         	: "Ẋ"   U1E8A # LATIN CAPITAL LETTER X WITH DOT ABOVE
 <dead_abovedot> <x>              	: "ẋ"   U1E8B # LATIN SMALL LETTER X WITH DOT ABOVE
@@ -2368,15 +2084,10 @@ XCOMM Part 3
 <Multi_key> <asciicircum> <z>    	: "ẑ"   U1E91 # LATIN SMALL LETTER Z WITH CIRCUMFLEX
 <dead_belowdot> <Z>              	: "Ẓ"   U1E92 # LATIN CAPITAL LETTER Z WITH DOT BELOW
 <Multi_key> <exclam> <Z>         	: "Ẓ"   U1E92 # LATIN CAPITAL LETTER Z WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <z>         	: "ẓ"   U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
-<U0331> <Z>                  	: "Ẕ"   U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
 <dead_belowmacron> <Z>                  	: "Ẕ"   U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
-<U0331> <z>                  	: "ẕ"   U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
 <dead_belowmacron> <z>                  	: "ẕ"   U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
-<U0331> <h>                  	: "ẖ"   U1E96 # LATIN SMALL LETTER H 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
@@ -2388,16 +2099,12 @@ XCOMM Part 3
 <Multi_key> <period> <U017F> 	: "ẛ"   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
-<combining_belowdot> <A>         	: "Ạ"   U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
 <dead_belowdot> <a>              	: "ạ"   U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
 <Multi_key> <exclam> <a>         	: "ạ"   U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
-<combining_belowdot> <a>         	: "ạ"   U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
 <dead_hook> <A>                  	: "Ả"   U1EA2 # LATIN CAPITAL LETTER A WITH HOOK ABOVE
 <Multi_key> <question> <A>       	: "Ả"   U1EA2 # LATIN CAPITAL LETTER A WITH HOOK ABOVE
-<combining_hook> <A>             	: "Ả"   U1EA2 # LATIN CAPITAL LETTER A WITH HOOK ABOVE
 <dead_hook> <a>                  	: "ả"   U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
 <Multi_key> <question> <a>       	: "ả"   U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
-<combining_hook> <a>             	: "ả"   U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
 <dead_acute> <Acircumflex>       	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <Acircumflex> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <Acircumflex> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
@@ -2407,9 +2114,6 @@ XCOMM Part 3
 <Multi_key> <acute> <asciicircum> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Acircumflex>  	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_acute> <acircumflex>       	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <acircumflex> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <acircumflex> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
@@ -2419,71 +2123,48 @@ XCOMM Part 3
 <Multi_key> <acute> <asciicircum> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <acircumflex>  	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_grave> <Acircumflex>       	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <Acircumflex> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <A> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <A> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <A> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <A> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Acircumflex>  	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <A> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <A> 	: "Ầ"   U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <acircumflex>       	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <acircumflex> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <a> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <a> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <a> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <a> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <acircumflex>  	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <a> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <a> 	: "ầ"   U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_hook> <Acircumflex>        	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <Acircumflex> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <A> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <A> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <A> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <A> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Acircumflex>   	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <A> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <A> 	: "Ẩ"   U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <acircumflex>        	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <acircumflex> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <a> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <a> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <a> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <a> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <acircumflex>   	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <a> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <a> 	: "ẩ"   U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_tilde> <Acircumflex>       	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <Acircumflex> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <A> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <A> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <A> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <A> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Acircumflex>  	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <A> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <A> 	: "Ẫ"   U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <acircumflex>       	: "ẫ"   U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <acircumflex> 	: "ẫ"   U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <a> 	: "ẫ"   U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <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
-<combining_tilde> <acircumflex>  	: "ẫ"   U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <a> 	: "ẫ"   U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <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_circumflex> <combining_belowdot> <A> 	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <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
@@ -2491,8 +2172,6 @@ XCOMM Part 3
 <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
 <Multi_key> <asciicircum> <exclam> <a> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <a> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <a> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_belowdot> <acircumflex>    	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_acute> <Abreve>            	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <acute> <Abreve>     	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
@@ -2504,10 +2183,6 @@ XCOMM Part 3
 <Multi_key> <acute> <b> <A>      	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <dead_breve> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <b> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Abreve>       	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <dead_breve> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <U> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <b> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <dead_acute> <abreve>            	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <acute> <abreve>     	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <abreve> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
@@ -2518,10 +2193,6 @@ XCOMM Part 3
 <Multi_key> <acute> <b> <a>      	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <dead_breve> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <b> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <abreve>       	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <dead_breve> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <U> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <b> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <dead_grave> <Abreve>            	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <Abreve>     	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <dead_grave> <dead_breve> <A>    	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
@@ -2529,10 +2200,6 @@ XCOMM Part 3
 <dead_grave> <Multi_key> <b> <A> 	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <dead_breve> <A> 	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <b> <A>      	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Abreve>       	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <dead_breve> <A> 	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <U> <A> 	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <b> <A> 	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <dead_grave> <abreve>            	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <abreve>     	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <dead_grave> <dead_breve> <a>    	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
@@ -2540,10 +2207,6 @@ XCOMM Part 3
 <dead_grave> <Multi_key> <b> <a> 	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <dead_breve> <a> 	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <b> <a>      	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <abreve>       	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <dead_breve> <a> 	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <U> <a> 	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <b> <a> 	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <dead_hook> <Abreve>             	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <Abreve>  	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_hook> <dead_breve> <A>     	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
@@ -2551,10 +2214,6 @@ XCOMM Part 3
 <dead_hook> <Multi_key> <b> <A>  	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <dead_breve> <A> 	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <b> <A>   	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Abreve>        	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <dead_breve> <A> 	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <U> <A> 	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <b> <A> 	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_hook> <abreve>             	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <abreve>  	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_hook> <dead_breve> <a>     	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
@@ -2562,10 +2221,6 @@ XCOMM Part 3
 <dead_hook> <Multi_key> <b> <a>  	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <dead_breve> <a> 	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <b> <a>   	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <abreve>        	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <dead_breve> <a> 	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <U> <a> 	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <b> <a> 	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_tilde> <Abreve>            	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <Abreve> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_tilde> <dead_breve> <A>    	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
@@ -2573,10 +2228,6 @@ XCOMM Part 3
 <dead_tilde> <Multi_key> <b> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <dead_breve> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <b> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Abreve>       	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <dead_breve> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <U> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <b> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_tilde> <abreve>            	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <abreve> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <dead_tilde> <dead_breve> <a>    	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
@@ -2584,10 +2235,6 @@ XCOMM Part 3
 <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
-<combining_tilde> <abreve>       	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <dead_breve> <a> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <U> <a> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <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
@@ -2597,9 +2244,6 @@ XCOMM Part 3
 <Multi_key> <U> <exclam> <A>     	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <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_breve> <combining_belowdot> <A> 	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <combining_belowdot> <A> 	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <combining_belowdot> <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
@@ -2610,28 +2254,19 @@ XCOMM Part 3
 <Multi_key> <U> <exclam> <a>     	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <dead_belowdot> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <exclam> <a>     	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<dead_breve> <combining_belowdot> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <combining_belowdot> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <combining_belowdot> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <dead_belowdot> <abreve>         	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <dead_belowdot> <E>              	: "Ẹ"   U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
 <Multi_key> <exclam> <E>         	: "Ẹ"   U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
-<combining_belowdot> <E>         	: "Ẹ"   U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
 <dead_belowdot> <e>              	: "ẹ"   U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
 <Multi_key> <exclam> <e>         	: "ẹ"   U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
-<combining_belowdot> <e>         	: "ẹ"   U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
 <dead_hook> <E>                  	: "Ẻ"   U1EBA # LATIN CAPITAL LETTER E WITH HOOK ABOVE
 <Multi_key> <question> <E>       	: "Ẻ"   U1EBA # LATIN CAPITAL LETTER E WITH HOOK ABOVE
-<combining_hook> <E>             	: "Ẻ"   U1EBA # LATIN CAPITAL LETTER E WITH HOOK ABOVE
 <dead_hook> <e>                  	: "ẻ"   U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
 <Multi_key> <question> <e>       	: "ẻ"   U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
-<combining_hook> <e>             	: "ẻ"   U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
 <dead_tilde> <E>                 	: "Ẽ"   U1EBC # LATIN CAPITAL LETTER E WITH TILDE
 <Multi_key> <asciitilde> <E>     	: "Ẽ"   U1EBC # LATIN CAPITAL LETTER E WITH TILDE
-<combining_tilde> <E>            	: "Ẽ"   U1EBC # LATIN CAPITAL LETTER E WITH TILDE
 <dead_tilde> <e>                 	: "ẽ"   U1EBD # LATIN SMALL LETTER E WITH TILDE
 <Multi_key> <asciitilde> <e>     	: "ẽ"   U1EBD # LATIN SMALL LETTER E WITH TILDE
-<combining_tilde> <e>            	: "ẽ"   U1EBD # LATIN SMALL LETTER E WITH TILDE
 <dead_acute> <Ecircumflex>       	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <Ecircumflex> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <Ecircumflex> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
@@ -2641,9 +2276,6 @@ XCOMM Part 3
 <Multi_key> <acute> <asciicircum> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Ecircumflex>  	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_acute> <ecircumflex>       	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <ecircumflex> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <ecircumflex> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
@@ -2653,71 +2285,48 @@ XCOMM Part 3
 <Multi_key> <acute> <asciicircum> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <ecircumflex>  	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_grave> <Ecircumflex>       	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <Ecircumflex> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <E> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <E> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <E> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <E> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Ecircumflex>  	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <E> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <E> 	: "Ề"   U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <ecircumflex>       	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <ecircumflex> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <e> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <e> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <e> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <e> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <ecircumflex>  	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <e> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <e> 	: "ề"   U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_hook> <Ecircumflex>        	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <Ecircumflex> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <E> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <E> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <E> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <E> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Ecircumflex>   	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <E> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <E> 	: "Ể"   U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <ecircumflex>        	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <ecircumflex> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <e> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <e> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <e> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <e> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <ecircumflex>   	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <e> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <e> 	: "ể"   U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_tilde> <Ecircumflex>       	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <Ecircumflex> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <E> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <E> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <E> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <E> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Ecircumflex>  	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <E> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <E> 	: "Ễ"   U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <ecircumflex>       	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <ecircumflex> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <e> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <e> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <e> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <e> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <ecircumflex>  	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <e> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <e> 	: "ễ"   U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <U1EB8>    	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1EB8> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <E> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <E> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <E> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <E> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <E> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <E> 	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_belowdot> <Ecircumflex>    	: "Ệ"   U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1EB9>    	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1EB9> 	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
@@ -2725,33 +2334,23 @@ XCOMM Part 3
 <dead_circumflex> <Multi_key> <exclam> <e> 	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <e> 	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <e> 	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <e> 	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <e> 	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_belowdot> <ecircumflex>    	: "ệ"   U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_hook> <I>                  	: "Ỉ"   U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
 <Multi_key> <question> <I>       	: "Ỉ"   U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
-<combining_hook> <I>             	: "Ỉ"   U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
 <dead_hook> <i>                  	: "ỉ"   U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
 <Multi_key> <question> <i>       	: "ỉ"   U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
-<combining_hook> <i>             	: "ỉ"   U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
 <dead_belowdot> <I>              	: "Ị"   U1ECA # LATIN CAPITAL LETTER I WITH DOT BELOW
 <Multi_key> <exclam> <I>         	: "Ị"   U1ECA # LATIN CAPITAL LETTER I WITH DOT BELOW
-<combining_belowdot> <I>         	: "Ị"   U1ECA # LATIN CAPITAL LETTER I WITH DOT BELOW
 <dead_belowdot> <i>              	: "ị"   U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
 <Multi_key> <exclam> <i>         	: "ị"   U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
-<combining_belowdot> <i>         	: "ị"   U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
 <dead_belowdot> <O>              	: "Ọ"   U1ECC # LATIN CAPITAL LETTER O WITH DOT BELOW
 <Multi_key> <exclam> <O>         	: "Ọ"   U1ECC # LATIN CAPITAL LETTER O WITH DOT BELOW
-<combining_belowdot> <O>         	: "Ọ"   U1ECC # LATIN CAPITAL LETTER O WITH DOT BELOW
 <dead_belowdot> <o>              	: "ọ"   U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
 <Multi_key> <exclam> <o>         	: "ọ"   U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
-<combining_belowdot> <o>         	: "ọ"   U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
 <dead_hook> <O>                  	: "Ỏ"   U1ECE # LATIN CAPITAL LETTER O WITH HOOK ABOVE
 <Multi_key> <question> <O>       	: "Ỏ"   U1ECE # LATIN CAPITAL LETTER O WITH HOOK ABOVE
-<combining_hook> <O>             	: "Ỏ"   U1ECE # LATIN CAPITAL LETTER O WITH HOOK ABOVE
 <dead_hook> <o>                  	: "ỏ"   U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
 <Multi_key> <question> <o>       	: "ỏ"   U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
-<combining_hook> <o>             	: "ỏ"   U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
 <dead_acute> <Ocircumflex>       	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <Ocircumflex> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <Ocircumflex> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
@@ -2761,9 +2360,6 @@ XCOMM Part 3
 <Multi_key> <acute> <asciicircum> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Ocircumflex>  	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_acute> <ocircumflex>       	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <ocircumflex> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <ocircumflex> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
@@ -2773,71 +2369,48 @@ XCOMM Part 3
 <Multi_key> <acute> <asciicircum> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <ocircumflex>  	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_grave> <Ocircumflex>       	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <Ocircumflex> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <O> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <O> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <O> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <O> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Ocircumflex>  	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <O> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <O> 	: "Ồ"   U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <ocircumflex>       	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <ocircumflex> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <o> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <o> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <o> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <o> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <ocircumflex>  	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <o> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <o> 	: "ồ"   U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_hook> <Ocircumflex>        	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <Ocircumflex> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <O> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <O> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <O> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <O> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Ocircumflex>   	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <O> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <O> 	: "Ổ"   U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <ocircumflex>        	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <ocircumflex> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <o> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <o> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <o> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <o> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <ocircumflex>   	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <o> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <o> 	: "ổ"   U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_tilde> <Ocircumflex>       	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <Ocircumflex> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <O> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <O> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <O> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <O> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Ocircumflex>  	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <O> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <O> 	: "Ỗ"   U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <ocircumflex>       	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <ocircumflex> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <o> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <o> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <o> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <o> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <ocircumflex>  	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <o> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <o> 	: "ỗ"   U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <U1ECC>    	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1ECC> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <O> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <O> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <O> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <O> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <O> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <O> 	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_belowdot> <Ocircumflex>    	: "Ộ"   U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1ECD>    	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1ECD> 	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
@@ -2845,8 +2418,6 @@ XCOMM Part 3
 <dead_circumflex> <Multi_key> <exclam> <o> 	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <o> 	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <o> 	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <o> 	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <o> 	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_belowdot> <ocircumflex>    	: "ộ"   U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_acute> <Ohorn>             	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <dead_acute> <U01A0>         	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
@@ -2858,9 +2429,6 @@ XCOMM Part 3
 <Multi_key> <acute> <plus> <O>   	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <O> 	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <O> 	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<combining_acute> <Ohorn>        	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <O> 	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <O> 	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <dead_acute> <ohorn>             	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <dead_acute> <U01A1>         	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <acute> <ohorn>      	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
@@ -2871,9 +2439,6 @@ XCOMM Part 3
 <Multi_key> <acute> <plus> <o>   	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <o> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <o> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<combining_acute> <ohorn>        	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <o> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <o> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <dead_grave> <Ohorn>             	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <U01A0>         	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <Ohorn>      	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
@@ -2881,9 +2446,6 @@ XCOMM Part 3
 <dead_grave> <Multi_key> <plus> <O> 	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <O> 	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <O>   	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<combining_grave> <Ohorn>        	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <O> 	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <O> 	: "Ờ"   U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <ohorn>             	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_grave> <U01A1>         	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <ohorn>      	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
@@ -2891,9 +2453,6 @@ XCOMM Part 3
 <dead_grave> <Multi_key> <plus> <o> 	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <o> 	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <o>   	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<combining_grave> <ohorn>        	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <o> 	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <o> 	: "ờ"   U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_hook> <Ohorn>              	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <U01A0>          	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <Ohorn>   	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
@@ -2901,9 +2460,6 @@ XCOMM Part 3
 <dead_hook> <Multi_key> <plus> <O> 	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <O> 	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <O> 	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <Ohorn>         	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <O> 	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <O> 	: "Ở"   U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <ohorn>              	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <U01A1>          	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <ohorn>   	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
@@ -2911,9 +2467,6 @@ XCOMM Part 3
 <dead_hook> <Multi_key> <plus> <o> 	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <o> 	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <o> 	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <ohorn>         	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <o> 	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <o> 	: "ở"   U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_tilde> <Ohorn>             	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <U01A0>         	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <Ohorn> 	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
@@ -2921,9 +2474,6 @@ XCOMM Part 3
 <dead_tilde> <Multi_key> <plus> <O> 	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <O> 	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <O> 	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<combining_tilde> <Ohorn>        	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <O> 	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <O> 	: "Ỡ"   U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <ohorn>             	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_tilde> <U01A1>         	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <ohorn> 	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
@@ -2931,9 +2481,6 @@ XCOMM Part 3
 <dead_tilde> <Multi_key> <plus> <o> 	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <o> 	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <o> 	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<combining_tilde> <ohorn>        	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <o> 	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <o> 	: "ỡ"   U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_belowdot> <Ohorn>          	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <U01A0>      	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <Ohorn>     	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
@@ -2941,9 +2488,6 @@ XCOMM Part 3
 <dead_belowdot> <Multi_key> <plus> <O> 	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <O> 	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <O>  	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <Ohorn>     	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <O> 	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <O> 	: "Ợ"   U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <ohorn>          	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <U01A1>      	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <ohorn>     	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
@@ -2951,21 +2495,14 @@ XCOMM Part 3
 <dead_belowdot> <Multi_key> <plus> <o> 	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <o> 	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <o>  	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <ohorn>     	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <o> 	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <o> 	: "ợ"   U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <U>              	: "Ụ"   U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
 <Multi_key> <exclam> <U>         	: "Ụ"   U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
-<combining_belowdot> <U>         	: "Ụ"   U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
 <dead_belowdot> <u>              	: "ụ"   U1EE5 # LATIN SMALL LETTER U WITH DOT BELOW
 <Multi_key> <exclam> <u>         	: "ụ"   U1EE5 # LATIN SMALL LETTER U WITH DOT BELOW
-<combining_belowdot> <u>         	: "ụ"   U1EE5 # LATIN SMALL LETTER U WITH DOT BELOW
 <dead_hook> <U>                  	: "Ủ"   U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
 <Multi_key> <question> <U>       	: "Ủ"   U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
-<combining_hook> <U>             	: "Ủ"   U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
 <dead_hook> <u>                  	: "ủ"   U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
 <Multi_key> <question> <u>       	: "ủ"   U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
-<combining_hook> <u>             	: "ủ"   U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
 <dead_acute> <Uhorn>             	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <dead_acute> <U01AF>         	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <acute> <Uhorn>      	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
@@ -2976,9 +2513,6 @@ XCOMM Part 3
 <Multi_key> <acute> <plus> <U>   	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <U> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <U> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<combining_acute> <Uhorn>        	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <U> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <U> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <dead_acute> <uhorn>             	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <dead_acute> <U01B0>         	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <acute> <uhorn>      	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
@@ -2989,9 +2523,6 @@ XCOMM Part 3
 <Multi_key> <acute> <plus> <u>   	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <u> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <u> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<combining_acute> <uhorn>        	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <u> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <u> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <dead_grave> <Uhorn>             	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <U01AF>         	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <Uhorn>      	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
@@ -2999,9 +2530,6 @@ XCOMM Part 3
 <dead_grave> <Multi_key> <plus> <U> 	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <U> 	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <U>   	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<combining_grave> <Uhorn>        	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <U> 	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <U> 	: "Ừ"   U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <uhorn>             	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_grave> <U01B0>         	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <uhorn>      	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
@@ -3009,9 +2537,6 @@ XCOMM Part 3
 <dead_grave> <Multi_key> <plus> <u> 	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <u> 	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <u>   	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<combining_grave> <uhorn>        	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <u> 	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <u> 	: "ừ"   U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_hook> <Uhorn>              	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <U01AF>          	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <Uhorn>   	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
@@ -3019,9 +2544,6 @@ XCOMM Part 3
 <dead_hook> <Multi_key> <plus> <U> 	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <U> 	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <U> 	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <Uhorn>         	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <U> 	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <U> 	: "Ử"   U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <uhorn>              	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <U01B0>          	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <uhorn>   	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
@@ -3029,9 +2551,6 @@ XCOMM Part 3
 <dead_hook> <Multi_key> <plus> <u> 	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <u> 	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <u> 	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <uhorn>         	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <u> 	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <u> 	: "ử"   U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_tilde> <Uhorn>             	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <U01AF>         	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <Uhorn> 	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
@@ -3039,9 +2558,6 @@ XCOMM Part 3
 <dead_tilde> <Multi_key> <plus> <U> 	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <U> 	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <U> 	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<combining_tilde> <Uhorn>        	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <U> 	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <U> 	: "Ữ"   U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <uhorn>             	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_tilde> <U01B0>         	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <uhorn> 	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
@@ -3049,9 +2565,6 @@ XCOMM Part 3
 <dead_tilde> <Multi_key> <plus> <u> 	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <u> 	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <u> 	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<combining_tilde> <uhorn>        	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <u> 	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <u> 	: "ữ"   U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_belowdot> <Uhorn>          	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <U01AF>      	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <Uhorn>     	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
@@ -3059,9 +2572,6 @@ XCOMM Part 3
 <dead_belowdot> <Multi_key> <plus> <U> 	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <U> 	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <U>  	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <Uhorn>     	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <U> 	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <U> 	: "Ự"   U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <uhorn>          	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <U01B0>      	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <uhorn>     	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
@@ -3069,1133 +2579,619 @@ XCOMM Part 3
 <dead_belowdot> <Multi_key> <plus> <u> 	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <u> 	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <u>  	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <uhorn>     	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <u> 	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <u> 	: "ự"   U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_grave> <Y>                 	: "Ỳ"   U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
 <Multi_key> <grave> <Y>          	: "Ỳ"   U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
-<combining_grave> <Y>            	: "Ỳ"   U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
 <dead_grave> <y>                 	: "ỳ"   U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
 <Multi_key> <grave> <y>          	: "ỳ"   U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
-<combining_grave> <y>            	: "ỳ"   U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
 <dead_belowdot> <Y>              	: "Ỵ"   U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
 <Multi_key> <exclam> <Y>         	: "Ỵ"   U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
-<combining_belowdot> <Y>         	: "Ỵ"   U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
 <dead_belowdot> <y>              	: "ỵ"   U1EF5 # LATIN SMALL LETTER Y WITH DOT BELOW
 <Multi_key> <exclam> <y>         	: "ỵ"   U1EF5 # LATIN SMALL LETTER Y WITH DOT BELOW
-<combining_belowdot> <y>         	: "ỵ"   U1EF5 # LATIN SMALL LETTER Y WITH DOT BELOW
 <dead_hook> <Y>                  	: "Ỷ"   U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
 <Multi_key> <question> <Y>       	: "Ỷ"   U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-<combining_hook> <Y>             	: "Ỷ"   U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
 <dead_hook> <y>                  	: "ỷ"   U1EF7 # LATIN SMALL LETTER Y WITH HOOK ABOVE
 <Multi_key> <question> <y>       	: "ỷ"   U1EF7 # LATIN SMALL LETTER Y WITH HOOK ABOVE
-<combining_hook> <y>             	: "ỷ"   U1EF7 # LATIN SMALL LETTER Y WITH HOOK ABOVE
 <dead_tilde> <Y>                 	: "Ỹ"   U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
 <Multi_key> <asciitilde> <Y>     	: "Ỹ"   U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
-<combining_tilde> <Y>            	: "Ỹ"   U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
 <dead_tilde> <y>                 	: "ỹ"   U1EF9 # LATIN SMALL LETTER Y WITH TILDE
 <Multi_key> <asciitilde> <y>     	: "ỹ"   U1EF9 # LATIN SMALL LETTER Y WITH TILDE
-<combining_tilde> <y>            	: "ỹ"   U1EF9 # LATIN SMALL LETTER Y WITH TILDE
-<U0313> <Greek_alpha>        	: "ἀ"   U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
 <dead_psili> <Greek_alpha>        	: "ἀ"   U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
 <Multi_key> <parenright> <Greek_alpha> 	: "ἀ"   U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
-<U0314> <Greek_alpha>        	: "ἁ"   U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
 <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> <U0313> <Greek_alpha> 	: "ἂ"   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> <U0313> <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
-<combining_grave> <U1F00>    	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_alpha> 	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_alpha> 	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_alpha> 	: "ἃ"   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> <U0314> <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
-<combining_grave> <U1F01>    	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_alpha> 	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_alpha> 	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_alpha> 	: "ἄ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F00>    	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_alpha> 	: "ἅ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F01>    	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<U0342> <U1F00>          	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_alpha> 	: "ἆ"   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> <U0313> <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
-<U0342> <U1F01>          	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA 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
-<U0342> <U0314> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_alpha> 	: "ἇ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_ALPHA>        	: "Ἀ"   U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
 <dead_psili> <Greek_ALPHA>        	: "Ἀ"   U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
 <Multi_key> <parenright> <Greek_ALPHA> 	: "Ἀ"   U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
-<U0314> <Greek_ALPHA>        	: "Ἁ"   U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
 <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> <U0313> <Greek_ALPHA> 	: "Ἂ"   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> <U0313> <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
-<combining_grave> <U1F08>    	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_ALPHA> 	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_ALPHA> 	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_ALPHA> 	: "Ἃ"   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> <U0314> <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
-<combining_grave> <U1F09>    	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_ALPHA> 	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_ALPHA> 	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_ALPHA> 	: "Ἄ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F08>    	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_ALPHA> 	: "Ἅ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F09>    	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<U0342> <U1F08>          	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_ALPHA> 	: "Ἆ"   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> <U0313> <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
-<U0342> <U1F09>          	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA 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
-<U0342> <U0314> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_ALPHA> 	: "Ἇ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_epsilon>      	: "ἐ"   U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
 <dead_psili> <Greek_epsilon>      	: "ἐ"   U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
 <Multi_key> <parenright> <Greek_epsilon> 	: "ἐ"   U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
-<U0314> <Greek_epsilon>      	: "ἑ"   U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
 <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> <U0313> <Greek_epsilon> 	: "ἒ"   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> <U0313> <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
-<combining_grave> <U1F10>    	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_epsilon> 	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_epsilon> 	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_epsilon> 	: "ἓ"   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> <U0314> <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
-<combining_grave> <U1F11>    	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_epsilon> 	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_epsilon> 	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_epsilon> 	: "ἔ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F10>    	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_epsilon> 	: "ἕ"   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> <U0314> <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
 <Multi_key> <acute> <parenleft> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U1F11>    	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<U0313> <Greek_EPSILON>      	: "Ἐ"   U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
 <dead_psili> <Greek_EPSILON>      	: "Ἐ"   U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
 <Multi_key> <parenright> <Greek_EPSILON> 	: "Ἐ"   U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
-<U0314> <Greek_EPSILON>      	: "Ἑ"   U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
 <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> <U0313> <Greek_EPSILON> 	: "Ἒ"   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> <U0313> <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
-<combining_grave> <U1F18>    	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_EPSILON> 	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_EPSILON> 	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_EPSILON> 	: "Ἓ"   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> <U0314> <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
-<combining_grave> <U1F19>    	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_EPSILON> 	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_EPSILON> 	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_EPSILON> 	: "Ἔ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F18>    	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_EPSILON> 	: "Ἕ"   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> <U0314> <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
 <Multi_key> <acute> <parenleft> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U1F19>    	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<U0313> <Greek_eta>          	: "ἠ"   U1F20 # GREEK SMALL LETTER ETA WITH PSILI
 <dead_psili> <Greek_eta>          	: "ἠ"   U1F20 # GREEK SMALL LETTER ETA WITH PSILI
 <Multi_key> <parenright> <Greek_eta> 	: "ἠ"   U1F20 # GREEK SMALL LETTER ETA WITH PSILI
-<U0314> <Greek_eta>          	: "ἡ"   U1F21 # GREEK SMALL LETTER ETA WITH DASIA
 <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> <U0313> <Greek_eta> 	: "ἢ"   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> <U0313> <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
-<combining_grave> <U1F20>    	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_eta> 	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_eta> 	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_eta> 	: "ἣ"   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> <U0314> <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
-<combining_grave> <U1F21>    	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_eta> 	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_eta> 	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_eta> 	: "ἤ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F20>    	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_eta> 	: "ἥ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F21>    	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<U0342> <U1F20>          	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_eta> 	: "ἦ"   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> <U0313> <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
-<U0342> <U1F21>          	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA 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
-<U0342> <U0314> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_eta> 	: "ἧ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_ETA>          	: "Ἠ"   U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
 <dead_psili> <Greek_ETA>          	: "Ἠ"   U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
 <Multi_key> <parenright> <Greek_ETA> 	: "Ἠ"   U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
-<U0314> <Greek_ETA>          	: "Ἡ"   U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
 <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> <U0313> <Greek_ETA> 	: "Ἢ"   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> <U0313> <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
-<combining_grave> <U1F28>    	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_ETA> 	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_ETA> 	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_ETA> 	: "Ἣ"   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> <U0314> <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
-<combining_grave> <U1F29>    	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_ETA> 	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_ETA> 	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_ETA> 	: "Ἤ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F28>    	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_ETA> 	: "Ἥ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F29>    	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<U0342> <U1F28>          	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_ETA> 	: "Ἦ"   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> <U0313> <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
-<U0342> <U1F29>          	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA 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
-<U0342> <U0314> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_ETA> 	: "Ἧ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_iota>         	: "ἰ"   U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
 <dead_psili> <Greek_iota>         	: "ἰ"   U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
 <Multi_key> <parenright> <Greek_iota> 	: "ἰ"   U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
-<U0314> <Greek_iota>         	: "ἱ"   U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
 <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> <U0313> <Greek_iota> 	: "ἲ"   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> <U0313> <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
-<combining_grave> <U1F30>    	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_iota> 	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_iota> 	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_iota> 	: "ἳ"   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> <U0314> <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
-<combining_grave> <U1F31>    	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_iota> 	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_iota> 	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_iota> 	: "ἴ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F30>    	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_iota> 	: "ἵ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F31>    	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<U0342> <U1F30>          	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_iota> 	: "ἶ"   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> <U0313> <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
-<U0342> <U1F31>          	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA 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
-<U0342> <U0314> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_iota> 	: "ἷ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_IOTA>         	: "Ἰ"   U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
 <dead_psili> <Greek_IOTA>         	: "Ἰ"   U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
 <Multi_key> <parenright> <Greek_IOTA> 	: "Ἰ"   U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
-<U0314> <Greek_IOTA>         	: "Ἱ"   U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
 <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> <U0313> <Greek_IOTA> 	: "Ἲ"   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> <U0313> <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
-<combining_grave> <U1F38>    	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_IOTA> 	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_IOTA> 	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_IOTA> 	: "Ἳ"   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> <U0314> <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
-<combining_grave> <U1F39>    	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_IOTA> 	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_IOTA> 	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_IOTA> 	: "Ἴ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F38>    	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_IOTA> 	: "Ἵ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F39>    	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<U0342> <U1F38>          	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_IOTA> 	: "Ἶ"   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> <U0313> <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
-<U0342> <U1F39>          	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA 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
-<U0342> <U0314> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_IOTA> 	: "Ἷ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_omicron>      	: "ὀ"   U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
 <dead_psili> <Greek_omicron>      	: "ὀ"   U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
 <Multi_key> <parenright> <Greek_omicron> 	: "ὀ"   U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
-<U0314> <Greek_omicron>      	: "ὁ"   U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
 <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> <U0313> <Greek_omicron> 	: "ὂ"   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> <U0313> <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
-<combining_grave> <U1F40>    	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_omicron> 	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_omicron> 	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_omicron> 	: "ὃ"   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> <U0314> <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
-<combining_grave> <U1F41>    	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_omicron> 	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_omicron> 	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_omicron> 	: "ὄ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F40>    	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_omicron> 	: "ὅ"   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> <U0314> <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
 <Multi_key> <acute> <parenleft> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U1F41>    	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<U0313> <Greek_OMICRON>      	: "Ὀ"   U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
 <dead_psili> <Greek_OMICRON>      	: "Ὀ"   U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
 <Multi_key> <parenright> <Greek_OMICRON> 	: "Ὀ"   U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
-<U0314> <Greek_OMICRON>      	: "Ὁ"   U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
 <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> <U0313> <Greek_OMICRON> 	: "Ὂ"   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> <U0313> <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
-<combining_grave> <U1F48>    	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_OMICRON> 	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_OMICRON> 	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_OMICRON> 	: "Ὃ"   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> <U0314> <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
-<combining_grave> <U1F49>    	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_OMICRON> 	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_OMICRON> 	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_OMICRON> 	: "Ὄ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F48>    	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_OMICRON> 	: "Ὅ"   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> <U0314> <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
 <Multi_key> <acute> <parenleft> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <dead_dasia> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U1F49>    	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<U0313> <Greek_upsilon>      	: "ὐ"   U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
 <dead_psili> <Greek_upsilon>      	: "ὐ"   U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
 <Multi_key> <parenright> <Greek_upsilon> 	: "ὐ"   U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
-<U0314> <Greek_upsilon>      	: "ὑ"   U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
 <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> <U0313> <Greek_upsilon> 	: "ὒ"   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> <U0313> <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
-<combining_grave> <U1F50>    	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_upsilon> 	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_upsilon> 	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_upsilon> 	: "ὓ"   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> <U0314> <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
-<combining_grave> <U1F51>    	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_upsilon> 	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_upsilon> 	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_upsilon> 	: "ὔ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F50>    	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_upsilon> 	: "ὕ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F51>    	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<U0342> <U1F50>          	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_upsilon> 	: "ὖ"   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> <U0313> <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
-<U0342> <U1F51>          	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA 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
-<U0342> <U0314> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_upsilon> 	: "ὗ"   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> <U0314> <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
-<U0314> <Greek_UPSILON>      	: "Ὑ"   U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
 <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> <U0314> <Greek_UPSILON> 	: "Ὓ"   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> <U0314> <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
-<combining_grave> <U1F59>    	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_UPSILON> 	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_UPSILON> 	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_UPSILON> 	: "Ὕ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F59>    	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<U0342> <U1F59>          	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <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
-<U0342> <U0314> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_UPSILON> 	: "Ὗ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0313> <Greek_omega>        	: "ὠ"   U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
 <dead_psili> <Greek_omega>        	: "ὠ"   U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
 <Multi_key> <parenright> <Greek_omega> 	: "ὠ"   U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
-<U0314> <Greek_omega>        	: "ὡ"   U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
 <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> <U0313> <Greek_omega> 	: "ὢ"   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> <U0313> <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
-<combining_grave> <U1F60>    	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_omega> 	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_omega> 	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_omega> 	: "ὣ"   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> <U0314> <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
-<combining_grave> <U1F61>    	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_omega> 	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_omega> 	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_omega> 	: "ὤ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F60>    	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_omega> 	: "ὥ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F61>    	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<U0342> <U1F60>          	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_omega> 	: "ὦ"   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> <U0313> <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
-<U0342> <U1F61>          	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA 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
-<U0342> <U0314> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_omega> 	: "ὧ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_OMEGA>        	: "Ὠ"   U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
 <dead_psili> <Greek_OMEGA>        	: "Ὠ"   U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
 <Multi_key> <parenright> <Greek_OMEGA> 	: "Ὠ"   U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
-<U0314> <Greek_OMEGA>        	: "Ὡ"   U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
 <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> <U0313> <Greek_OMEGA> 	: "Ὢ"   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> <U0313> <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
-<combining_grave> <U1F68>    	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_OMEGA> 	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <dead_psili> <Greek_OMEGA> 	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <Greek_OMEGA> 	: "Ὣ"   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> <U0314> <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
-<combining_grave> <U1F69>    	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_OMEGA> 	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <dead_dasia> <Greek_OMEGA> 	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <Greek_OMEGA> 	: "Ὤ"   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> <U0313> <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> <U0313> <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
-<combining_acute> <U1F68>    	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <dead_psili> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <Greek_OMEGA> 	: "Ὥ"   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> <U0314> <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> <U0314> <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
-<combining_acute> <U1F69>    	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <dead_dasia> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<U0342> <U1F68>          	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U0342> <dead_psili> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <Greek_OMEGA> 	: "Ὦ"   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> <U0313> <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
-<U0342> <U1F69>          	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA 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
-<U0342> <U0314> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0342> <dead_dasia> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <Greek_OMEGA> 	: "Ὧ"   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> <U0314> <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
 <Multi_key> <asciitilde> <parenleft> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <dead_grave> <Greek_alpha>       	: "ὰ"   U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
 <Multi_key> <grave> <Greek_alpha> 	: "ὰ"   U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
-<combining_grave> <Greek_alpha>  	: "ὰ"   U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
 <dead_grave> <Greek_epsilon>     	: "ὲ"   U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
 <Multi_key> <grave> <Greek_epsilon> 	: "ὲ"   U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
-<combining_grave> <Greek_epsilon> 	: "ὲ"   U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
 <dead_grave> <Greek_eta>         	: "ὴ"   U1F74 # GREEK SMALL LETTER ETA WITH VARIA
 <Multi_key> <grave> <Greek_eta>  	: "ὴ"   U1F74 # GREEK SMALL LETTER ETA WITH VARIA
-<combining_grave> <Greek_eta>    	: "ὴ"   U1F74 # GREEK SMALL LETTER ETA WITH VARIA
 <dead_grave> <Greek_iota>        	: "ὶ"   U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
 <Multi_key> <grave> <Greek_iota> 	: "ὶ"   U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
-<combining_grave> <Greek_iota>   	: "ὶ"   U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
 <dead_grave> <Greek_omicron>     	: "ὸ"   U1F78 # GREEK SMALL LETTER OMICRON WITH VARIA
 <Multi_key> <grave> <Greek_omicron> 	: "ὸ"   U1F78 # GREEK SMALL LETTER OMICRON WITH VARIA
-<combining_grave> <Greek_omicron> 	: "ὸ"   U1F78 # GREEK SMALL LETTER OMICRON WITH VARIA
 <dead_grave> <Greek_upsilon>     	: "ὺ"   U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
 <Multi_key> <grave> <Greek_upsilon> 	: "ὺ"   U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
-<combining_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
-<combining_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> <U0313> <Greek_alpha> 	: "ᾀ"   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> <U0313> <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> <U0314> <Greek_alpha> 	: "ᾁ"   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> <U0314> <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
@@ -4204,52 +3200,28 @@ XCOMM Part 3
 <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> <U0313> <Greek_alpha> 	: "ᾂ"   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> <U0313> <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
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1F00> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F00> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <dead_psili> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <Greek_alpha> 	: "ᾃ"   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> <U0314> <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
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1F01> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F01> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <dead_dasia> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4258,32 +3230,18 @@ XCOMM Part 3
 <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> <U0313> <Greek_alpha> 	: "ᾄ"   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> <U0313> <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> <U0313> <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> <U0313> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4292,98 +3250,56 @@ XCOMM Part 3
 <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> <U0314> <Greek_alpha> 	: "ᾅ"   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> <U0314> <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> <U0314> <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> <U0314> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1F00> 	: "ᾆ"   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> <U0342> <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> <U0342> <U0313> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <dead_psili> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <Greek_alpha> 	: "ᾆ"   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> <U0313> <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
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1F01> 	: "ᾇ"   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> <U0342> <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> <U0342> <U0314> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <dead_dasia> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <Greek_alpha> 	: "ᾇ"   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> <U0314> <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
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0314> <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> <U0313> <Greek_ALPHA> 	: "ᾈ"   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> <U0313> <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> <U0314> <Greek_ALPHA> 	: "ᾉ"   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> <U0314> <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
@@ -4392,52 +3308,28 @@ XCOMM Part 3
 <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> <U0313> <Greek_ALPHA> 	: "ᾊ"   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> <U0313> <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
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1F08> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F08> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <dead_psili> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <Greek_ALPHA> 	: "ᾋ"   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> <U0314> <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
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1F09> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F09> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <dead_dasia> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4446,32 +3338,18 @@ XCOMM Part 3
 <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> <U0313> <Greek_ALPHA> 	: "ᾌ"   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> <U0313> <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> <U0313> <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> <U0313> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4480,98 +3358,56 @@ XCOMM Part 3
 <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> <U0314> <Greek_ALPHA> 	: "ᾍ"   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> <U0314> <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> <U0314> <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> <U0314> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1F08> 	: "ᾎ"   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> <U0342> <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> <U0342> <U0313> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <dead_psili> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <Greek_ALPHA> 	: "ᾎ"   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> <U0313> <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
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1F09> 	: "ᾏ"   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> <U0342> <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> <U0342> <U0314> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <dead_dasia> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <Greek_ALPHA> 	: "ᾏ"   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> <U0314> <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
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0314> <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> <U0313> <Greek_eta> 	: "ᾐ"   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> <U0313> <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> <U0314> <Greek_eta> 	: "ᾑ"   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> <U0314> <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
@@ -4580,52 +3416,28 @@ XCOMM Part 3
 <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> <U0313> <Greek_eta> 	: "ᾒ"   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> <U0313> <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
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1F20> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F20> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <dead_psili> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <Greek_eta> 	: "ᾓ"   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> <U0314> <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
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1F21> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F21> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <dead_dasia> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4634,32 +3446,18 @@ XCOMM Part 3
 <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> <U0313> <Greek_eta> 	: "ᾔ"   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> <U0313> <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> <U0313> <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> <U0313> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4668,98 +3466,56 @@ XCOMM Part 3
 <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> <U0314> <Greek_eta> 	: "ᾕ"   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> <U0314> <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> <U0314> <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> <U0314> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1F20> 	: "ᾖ"   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> <U0342> <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> <U0342> <U0313> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <dead_psili> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <Greek_eta> 	: "ᾖ"   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> <U0313> <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
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1F21> 	: "ᾗ"   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> <U0342> <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> <U0342> <U0314> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <dead_dasia> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <Greek_eta> 	: "ᾗ"   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> <U0314> <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
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0314> <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> <U0313> <Greek_ETA> 	: "ᾘ"   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> <U0313> <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> <U0314> <Greek_ETA> 	: "ᾙ"   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> <U0314> <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
@@ -4768,52 +3524,28 @@ XCOMM Part 3
 <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> <U0313> <Greek_ETA> 	: "ᾚ"   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> <U0313> <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
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1F28> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F28> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <dead_psili> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <Greek_ETA> 	: "ᾛ"   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> <U0314> <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
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1F29> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F29> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <dead_dasia> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4822,32 +3554,18 @@ XCOMM Part 3
 <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> <U0313> <Greek_ETA> 	: "ᾜ"   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> <U0313> <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> <U0313> <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> <U0313> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4856,98 +3574,56 @@ XCOMM Part 3
 <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> <U0314> <Greek_ETA> 	: "ᾝ"   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> <U0314> <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> <U0314> <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> <U0314> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1F28> 	: "ᾞ"   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> <U0342> <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> <U0342> <U0313> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <dead_psili> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <Greek_ETA> 	: "ᾞ"   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> <U0313> <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
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1F29> 	: "ᾟ"   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> <U0342> <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> <U0342> <U0314> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <dead_dasia> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <Greek_ETA> 	: "ᾟ"   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> <U0314> <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
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0314> <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> <U0313> <Greek_omega> 	: "ᾠ"   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> <U0313> <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> <U0314> <Greek_omega> 	: "ᾡ"   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> <U0314> <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
@@ -4956,52 +3632,28 @@ XCOMM Part 3
 <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> <U0313> <Greek_omega> 	: "ᾢ"   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> <U0313> <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
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1F60> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F60> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <dead_psili> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <Greek_omega> 	: "ᾣ"   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> <U0314> <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
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1F61> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F61> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <dead_dasia> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -5010,32 +3662,18 @@ XCOMM Part 3
 <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> <U0313> <Greek_omega> 	: "ᾤ"   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> <U0313> <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> <U0313> <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> <U0313> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -5044,98 +3682,56 @@ XCOMM Part 3
 <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> <U0314> <Greek_omega> 	: "ᾥ"   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> <U0314> <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> <U0314> <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> <U0314> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1F60> 	: "ᾦ"   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> <U0342> <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> <U0342> <U0313> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <dead_psili> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <Greek_omega> 	: "ᾦ"   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> <U0313> <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
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1F61> 	: "ᾧ"   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> <U0342> <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> <U0342> <U0314> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <dead_dasia> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <Greek_omega> 	: "ᾧ"   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> <U0314> <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
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0314> <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> <U0313> <Greek_OMEGA> 	: "ᾨ"   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> <U0313> <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> <U0314> <Greek_OMEGA> 	: "ᾩ"   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> <U0314> <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
@@ -5144,52 +3740,28 @@ XCOMM Part 3
 <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> <U0313> <Greek_OMEGA> 	: "ᾪ"   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> <U0313> <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
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1F68> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F68> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <dead_psili> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <Greek_OMEGA> 	: "ᾫ"   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> <U0314> <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
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1F69> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1F69> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <dead_dasia> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -5198,32 +3770,18 @@ XCOMM Part 3
 <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> <U0313> <Greek_OMEGA> 	: "ᾬ"   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> <U0313> <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> <U0313> <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> <U0313> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -5232,82 +3790,44 @@ XCOMM Part 3
 <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> <U0314> <Greek_OMEGA> 	: "ᾭ"   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> <U0314> <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> <U0314> <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> <U0314> <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
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1F68> 	: "ᾮ"   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> <U0342> <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> <U0342> <U0313> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <dead_psili> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <Greek_OMEGA> 	: "ᾮ"   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> <U0313> <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
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1F69> 	: "ᾯ"   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> <U0342> <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> <U0342> <U0314> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <dead_dasia> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <Greek_OMEGA> 	: "ᾯ"   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> <U0314> <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
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_breve> <Greek_alpha>       	: "ᾰ"   U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
@@ -5322,8 +3842,6 @@ XCOMM Part 3
 <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> <combining_grave> <Greek_alpha> 	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -5334,17 +3852,12 @@ XCOMM Part 3
 <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_iota> <combining_acute> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<U0342> <Greek_alpha>        	: "ᾶ"   U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
 <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> <U0342> <Greek_alpha> 	: "ᾷ"   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> <U0342> <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
 <Multi_key> <Greek_iota> <asciitilde> <Greek_alpha> 	: "ᾷ"   U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_breve> <Greek_ALPHA>       	: "Ᾰ"   U1FB8 # GREEK CAPITAL LETTER ALPHA WITH VRACHY
@@ -5355,10 +3868,8 @@ XCOMM Part 3
 <Multi_key> <underscore> <Greek_ALPHA> 	: "Ᾱ"   U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON
 <dead_grave> <Greek_ALPHA>       	: "Ὰ"   U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
 <Multi_key> <grave> <Greek_ALPHA> 	: "Ὰ"   U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
-<combining_grave> <Greek_ALPHA>  	: "Ὰ"   U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
 <dead_iota> <Greek_ALPHA>        	: "ᾼ"   U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_ALPHA> 	: "ᾼ"   U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-<Multi_key> <diaeresis> <U0342> 	: "῁"   U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
 <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
@@ -5367,8 +3878,6 @@ XCOMM Part 3
 <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> <combining_grave> <Greek_eta> 	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -5379,35 +3888,25 @@ XCOMM Part 3
 <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_iota> <combining_acute> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<U0342> <Greek_eta>          	: "ῆ"   U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
 <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> <U0342> <Greek_eta> 	: "ῇ"   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> <U0342> <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
 <Multi_key> <Greek_iota> <asciitilde> <Greek_eta> 	: "ῇ"   U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_grave> <Greek_EPSILON>     	: "Ὲ"   U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
 <Multi_key> <grave> <Greek_EPSILON> 	: "Ὲ"   U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
-<combining_grave> <Greek_EPSILON> 	: "Ὲ"   U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
 <dead_grave> <Greek_ETA>         	: "Ὴ"   U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
 <Multi_key> <grave> <Greek_ETA>  	: "Ὴ"   U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
-<combining_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> <combining_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> <combining_acute> 	: "῎"   U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U1FBF> <U0342> 	: "῏"   U1FCF # GREEK PSILI AND PERISPOMENI
 <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
@@ -5422,17 +3921,10 @@ XCOMM Part 3
 <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
-<combining_grave> <Greek_iotadieresis> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<combining_grave> <dead_diaeresis> <Greek_iota> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<combining_grave> <Multi_key> <quotedbl> <Greek_iota> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<U0342> <Greek_iota>         	: "ῖ"   U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
 <dead_tilde> <Greek_iota>        	: "ῖ"   U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_iota> 	: "ῖ"   U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
-<U0342> <Greek_iotadieresis> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND 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
-<U0342> <dead_diaeresis> <Greek_iota> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-<U0342> <Multi_key> <quotedbl> <Greek_iota> 	: "ῗ"   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
@@ -5445,15 +3937,11 @@ XCOMM Part 3
 <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
-<combining_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> <combining_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> <combining_acute> 	: "῞"   U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U1FFE> <U0342> 	: "῟"   U1FDF # GREEK DASIA AND PERISPOMENI
 <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
@@ -5468,23 +3956,14 @@ XCOMM Part 3
 <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
 <Multi_key> <grave> <quotedbl> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<combining_grave> <Greek_upsilondieresis> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<combining_grave> <dead_diaeresis> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<combining_grave> <Multi_key> <quotedbl> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<U0313> <Greek_rho>          	: "ῤ"   U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
 <dead_psili> <Greek_rho>          	: "ῤ"   U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
 <Multi_key> <parenright> <Greek_rho> 	: "ῤ"   U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
-<U0314> <Greek_rho>          	: "ῥ"   U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
 <dead_dasia> <Greek_rho>          	: "ῥ"   U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
 <Multi_key> <parenleft> <Greek_rho> 	: "ῥ"   U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
-<U0342> <Greek_upsilon>      	: "ῦ"   U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
 <dead_tilde> <Greek_upsilon>     	: "ῦ"   U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_upsilon> 	: "ῦ"   U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-<U0342> <Greek_upsilondieresis> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND 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
-<U0342> <dead_diaeresis> <Greek_upsilon> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-<U0342> <Multi_key> <quotedbl> <Greek_upsilon> 	: "ῧ"   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
@@ -5497,21 +3976,16 @@ XCOMM Part 3
 <Multi_key> <underscore> <Greek_UPSILON> 	: "Ῡ"   U1FE9 # GREEK CAPITAL LETTER UPSILON WITH MACRON
 <dead_grave> <Greek_UPSILON>     	: "Ὺ"   U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
 <Multi_key> <grave> <Greek_UPSILON> 	: "Ὺ"   U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
-<combining_grave> <Greek_UPSILON> 	: "Ὺ"   U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
-<U0314> <Greek_RHO>          	: "Ῥ"   U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
 <dead_dasia> <Greek_RHO>          	: "Ῥ"   U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
 <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
-<Multi_key> <diaeresis> <combining_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> <combining_grave> <Greek_omega> 	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -5522,25 +3996,18 @@ XCOMM Part 3
 <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_iota> <combining_acute> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<U0342> <Greek_omega>        	: "ῶ"   U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
 <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> <U0342> <Greek_omega> 	: "ῷ"   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> <U0342> <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
 <Multi_key> <Greek_iota> <asciitilde> <Greek_omega> 	: "ῷ"   U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_grave> <Greek_OMICRON>     	: "Ὸ"   U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
 <Multi_key> <grave> <Greek_OMICRON> 	: "Ὸ"   U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
-<combining_grave> <Greek_OMICRON> 	: "Ὸ"   U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
 <dead_grave> <Greek_OMEGA>       	: "Ὼ"   U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
 <Multi_key> <grave> <Greek_OMEGA> 	: "Ὼ"   U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
-<combining_grave> <Greek_OMEGA>  	: "Ὼ"   U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
 <dead_iota> <Greek_OMEGA>        	: "ῼ"   U1FFC # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_OMEGA> 	: "ῼ"   U1FFC # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
 <dead_circumflex> <0>            	: "⁰"   U2070 # SUPERSCRIPT ZERO
@@ -5665,6 +4132,18 @@ XCOMM Part 3
 <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
+<Multi_key> <1> <3>			: "⅓"	U2153 # VULGAR FRACTION ONE THIRD
+<Multi_key> <2> <3>			: "⅔"	U2154 # VULGAR FRACTION TWO THIRDS
+<Multi_key> <1> <5>			: "⅕"	U2155 # VULGAR FRACTION ONE FIFTH
+<Multi_key> <2> <5>			: "⅖"	U2156 # VULGAR FRACTION TWO FIFTHS
+<Multi_key> <3> <5>			: "⅗"	U2157 # VULGAR FRACTION THREE FIFTHS
+<Multi_key> <4> <5>			: "⅘"	U2158 # VULGAR FRACTION FOUR FIFTHS
+<Multi_key> <1> <6>			: "⅙"	U2159 # VULGAR FRACTION ONE SIXTH
+<Multi_key> <5> <6>			: "⅚"	U215A # VULGAR FRACTION FIVE SIXTHS
+<Multi_key> <1> <8>			: "⅛"	U215B # VULGAR FRACTION ONE EIGHTH
+<Multi_key> <3> <8>			: "⅜"	U215C # VULGAR FRACTION THREE EIGHTHS
+<Multi_key> <5> <8>			: "⅝"	U215D # VULGAR FRACTION FIVE EIGHTHS
+<Multi_key> <7> <8>			: "⅞"	U215E # VULGAR FRACTION SEVEN EIGHTHS
 <Multi_key> <slash> <leftarrow>  	: "↚"   U219A # LEFTWARDS ARROW WITH STROKE
 <Multi_key> <KP_Divide> <leftarrow> 	: "↚"   U219A # LEFTWARDS ARROW WITH STROKE
 <Multi_key> <slash> <rightarrow> 	: "↛"   U219B # RIGHTWARDS ARROW WITH STROKE
@@ -5680,9 +4159,13 @@ XCOMM Part 3
 <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> <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> <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
@@ -6247,25 +4730,25 @@ XCOMM Part 3
 <Multi_key> <U1D157> <U1D165> 	: "𝅗𝅥"   U1D15E # MUSICAL SYMBOL HALF NOTE
 <Multi_key> <U1D158> <U1D165> 	: "𝅘𝅥"   U1D15F # MUSICAL SYMBOL QUARTER NOTE
 <Multi_key> <U1D15F> <U1D16E> 	: "𝅘𝅥𝅮"   U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-##<Multi_key> <U1D158> <U1D165> <U1D16E> 	: "𝅘𝅥𝅮"   U1D160 # MUSICAL SYMBOL EIGHTH NOTE
+/* <Multi_key> <U1D158> <U1D165> <U1D16E> 	: "𝅘𝅥𝅮"   U1D160 # MUSICAL SYMBOL EIGHTH NOTE */
 <Multi_key> <U1D15F> <U1D16F> 	: "𝅘𝅥𝅯"   U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
-##<Multi_key> <U1D158> <U1D165> <U1D16F> 	: "𝅘𝅥𝅯"   U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
+/* <Multi_key> <U1D158> <U1D165> <U1D16F> 	: "𝅘𝅥𝅯"   U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE */
 <Multi_key> <U1D15F> <U1D170> 	: "𝅘𝅥𝅰"   U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
-##<Multi_key> <U1D158> <U1D165> <U1D170> 	: "𝅘𝅥𝅰"   U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
+/* <Multi_key> <U1D158> <U1D165> <U1D170> 	: "𝅘𝅥𝅰"   U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE */
 <Multi_key> <U1D15F> <U1D171> 	: "𝅘𝅥𝅱"   U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
-##<Multi_key> <U1D158> <U1D165> <U1D171> 	: "𝅘𝅥𝅱"   U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
+/* <Multi_key> <U1D158> <U1D165> <U1D171> 	: "𝅘𝅥𝅱"   U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE */
 <Multi_key> <U1D15F> <U1D172> 	: "𝅘𝅥𝅲"   U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-##<Multi_key> <U1D158> <U1D165> <U1D172> 	: "𝅘𝅥𝅲"   U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
+/* <Multi_key> <U1D158> <U1D165> <U1D172> 	: "𝅘𝅥𝅲"   U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE */
 <Multi_key> <U1D1B9> <U1D165> 	: "𝆹𝅥"   U1D1BB # MUSICAL SYMBOL MINIMA
 <Multi_key> <U1D1BA> <U1D165> 	: "𝆺𝅥"   U1D1BC # MUSICAL SYMBOL MINIMA BLACK
 <Multi_key> <U1D1BB> <U1D16E> 	: "𝆹𝅥𝅮"   U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
-##<Multi_key> <U1D1B9> <U1D165> <U1D16E> 	: "𝆹𝅥𝅮"   U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
+/* <Multi_key> <U1D1B9> <U1D165> <U1D16E> 	: "𝆹𝅥𝅮"   U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE */
 <Multi_key> <U1D1BC> <U1D16E> 	: "𝆺𝅥𝅮"   U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
-##<Multi_key> <U1D1BA> <U1D165> <U1D16E> 	: "𝆺𝅥𝅮"   U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
+/* <Multi_key> <U1D1BA> <U1D165> <U1D16E> 	: "𝆺𝅥𝅮"   U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK */
 <Multi_key> <U1D1BB> <U1D16F> 	: "𝆹𝅥𝅯"   U1D1BF # MUSICAL SYMBOL FUSA WHITE
-##<Multi_key> <U1D1B9> <U1D165> <U1D16F> 	: "𝆹𝅥𝅯"   U1D1BF # MUSICAL SYMBOL FUSA WHITE
+/* <Multi_key> <U1D1B9> <U1D165> <U1D16F> 	: "𝆹𝅥𝅯"   U1D1BF # MUSICAL SYMBOL FUSA WHITE */
 <Multi_key> <U1D1BC> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK
-##<Multi_key> <U1D1BA> <U1D165> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+/* <Multi_key> <U1D1BA> <U1D165> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK */
 
 XCOMM
 XCOMM Khmer digraphs
@@ -6286,3 +4769,396 @@ XCOMM
 <UFEF9>	:   "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
 <UFEF5>	:   "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
 
+XCOMM
+XCOMM French-Dvorak Bépo compositions
+XCOMM
+
+<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_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 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 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> <minus> 	      : "⁻"   U207B               # SUPERSCRIPT MINUS
+<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 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 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 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 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 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 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
+<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_belowcomma> <dead_belowcomma>   : ","   comma               # COMMA
+<dead_belowcomma> <nobreakspace>      : "̦"   U0326               # COMBINING COMMA BELOW
+<dead_belowcomma> <space> 	      : ","   comma               # COMMA
+<dead_currency> <A> 		      : "₳"   U20B3               # AUSTRAL SIGN
+<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> <D> 		      : "₯"   U20AF               # DRACHMA SIGN
+<dead_currency> <d> 		      : "₫"   DongSign            # DONG SIGN
+<dead_currency> <E> 		      : "₠"   EcuSign             # EURO-CURRENCY SIGN
+<dead_currency> <e> 		      : "€"   EuroSign            # EURO SIGN
+<dead_currency> <F> 		      : "₣"   FFrancSign          # FRENCH FRANC SIGN
+<dead_currency> <f> 		      : "ƒ"   function            # LATIN SMALL LETTER F WITH HOOK
+<dead_currency> <G> 		      : "₲"   U20B2               # GUARANI SIGN
+<dead_currency> <g> 		      : "₲"   U20B2               # GUARANI SIGN
+<dead_currency> <H> 		      : "₴"   U20B4               # HRYVNIA SIGN
+<dead_currency> <h> 		      : "₴"   U20B4               # HRYVNIA SIGN
+<dead_currency> <I> 		      : "៛"   U17DB               # KHMER CURRENCY SYMBOL RIEL
+<dead_currency> <i> 		      : "﷼"   UFDFC               # RIAL SIGN
+<dead_currency> <K> 		      : "₭"   U20AD               # KIP SIGN
+<dead_currency> <k> 		      : "₭"   U20AD               # KIP SIGN
+<dead_currency> <L> 		      : "₤"   LiraSign            # LIRA SIGN
+<dead_currency> <l> 		      : "£"   sterling            # POUND SIGN
+<dead_currency> <M> 		      : "ℳ"   U2133               # SCRIPT CAPITAL M
+<dead_currency> <m> 		      : "₥"   MillSign            # MILL SIGN
+<dead_currency> <N> 		      : "₦"   NairaSign           # NAIRA SIGN
+<dead_currency> <n> 		      : "₦"   NairaSign           # NAIRA SIGN
+<dead_currency> <O> 		      : "૱"   U0AF1               # GUJARATI RUPEE SIGN
+<dead_currency> <o> 		      : "௹"   U0BF9               # TAMIL RUPEE SIGN
+<dead_currency> <P> 		      : "₧"   PesetaSign          # PESETA SIGN
+<dead_currency> <p> 		      : "₰"   U20B0               # GERMAN PENNY SIGN
+<dead_currency> <r> 		      : "₢"   CruzeiroSign        # CRUZEIRO SIGN
+<dead_currency> <R> 		      : "₨"   RupeeSign           # RUPEE SIGN
+<dead_currency> <S> 		      : "$"   dollar              # DOLLAR SIGN
+<dead_currency> <s> 		      : "₪"   NewSheqelSign       # NEW SHEQEL SIGN
+<dead_currency> <T> 		      : "₮"   U20AE               # TUGRIK SIGN
+<dead_currency> <t> 		      : "৳"   U09F3               # BENGALI RUPEE SIGN
+<dead_currency> <THORN> 	      : "৲"   U09F2               # BENGALI RUPEE MARK
+<dead_currency> <thorn> 	      : "৲"   U09F2               # BENGALI RUPEE MARK
+<dead_currency> <U> 		      : "圓"   U5713              # YUAN / WEN
+<dead_currency> <u> 		      : "元"   U5143              # YUAN / WEN
+<dead_currency> <W> 		      : "₩"   WonSign             # WON SIGN
+<dead_currency> <w> 		      : "₩"   WonSign             # WON SIGN
+<dead_currency> <Y> 		      : "円"   U5186              # YEN
+<dead_currency> <y> 		      : "¥"   yen                 # YEN SIGN
+<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> 	      : "ǜ"   U01DC               # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+<dead_diaeresis> <nobreakspace>       : "̈"   U0308                # COMBINING DIAERESIS
+<dead_doubleacute> <nobreakspace>     : "̋"   U030B                # COMBINING DOUBLE ACUTE ACCENT
+<dead_grave> <V>   		      : "Ǜ"   U01DB               # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+<dead_grave> <v>   		      : "ǜ"   U01DC               # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+<dead_grave> <nobreakspace> 	      : "̀"   U0300      # COMBINING GRAVE ACCENT
+<dead_hook> <B> 		      : "Ɓ"   U0181               # LATIN CAPITAL LETTER B WITH HOOK
+<dead_hook> <b> 		      : "ɓ"   U0253               # LATIN SMALL LETTER B WITH HOOK
+<dead_hook> <C> 		      : "Ƈ"   U0187               # LATIN CAPITAL LETTER C WITH HOOK
+<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
+<dead_hook> <m> 		      : "ɱ"   U0271               # LATIN SMALL LETTER M WITH HOOK
+<dead_hook> <N> 		      : "Ɲ"   U019D               # LATIN CAPITAL LETTER N WITH LEFT HOOK
+<dead_hook> <n> 		      : "ɲ"   U0272               # LATIN SMALL LETTER N WITH LEFT HOOK
+<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> <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
+<dead_hook> <w> 		      : "ⱳ"   U2C73               # LATIN SMALL LETTER W WITH HOOK
+<dead_hook> <Z> 		      : "Ȥ"   U0224               # LATIN CAPITAL LETTER Z WITH HOOK
+<dead_hook> <z> 		      : "ȥ"   U0225               # LATIN SMALL LETTER Z WITH HOOK
+<dead_hook> <dead_hook> 	      : "̉"   U0309                # COMBINING HOOK ABOVE
+<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 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 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> 		      : "ḕ"   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> 		      : "ṑ"   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
+<dead_stroke> <e> 		      : "ɇ"   U0247               # LATIN SMALL LETTER E WITH STROKE
+<dead_stroke> <greater> 	      : "≯"   U226F               # NOT GREATER-THAN
+<dead_stroke> <greaterthanequal>      : "≱"   U2271               # NEITHER GREATER-THAN NOR EQUAL TO
+<dead_stroke> <J> 		      : "Ɉ"   U0248               # LATIN CAPITAL LETTER J WITH STROKE
+<dead_stroke> <j> 		      : "ɉ"   U0249               # LATIN SMALL LETTER J WITH STROKE
+<dead_stroke> <U0269> 		      : "ᵼ"   U1D7C               # LATIN SMALL LETTER IOTA WITH STROKE
+<dead_stroke> <U0237> 		      : "ɟ"   U025F               # LATIN SMALL LETTER DOTLESS J WITH STROKE
+<dead_stroke> <less> 		      : "≮"   U226E               # NOT LESS-THAN
+<dead_stroke> <lessthanequal> 	      : "≰"   U2270               # NEITHER LESS-THAN NOR EQUAL TO
+<dead_stroke> <Oacute> 		      : "Ǿ"   U01FE               # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+<dead_stroke> <oacute> 		      : "ǿ"   U01FF               # LATIN SMALL LETTER O WITH STROKE AND ACUTE
+<dead_stroke> <P> 		      : "Ᵽ"   U2C63               # LATIN CAPITAL LETTER P WITH STROKE
+<dead_stroke> <p> 		      : "ᵽ"   U1D7D               # LATIN SMALL LETTER P WITH STROKE
+<dead_stroke> <R> 		      : "Ɍ"   U024C               # LATIN CAPITAL LETTER R WITH STROKE
+<dead_stroke> <r> 		      : "ɍ"   U024D               # LATIN SMALL LETTER R WITH STROKE
+<dead_stroke> <U> 		      : "Ʉ"   U0244               # LATIN CAPITAL LETTER U BAR
+<dead_stroke> <u> 		      : "ʉ"   U0289               # LATIN SMALL LETTER U BAR
+<dead_stroke> <Y> 		      : "Ɏ"   U024E               # LATIN CAPITAL LETTER Y WITH STROKE
+<dead_stroke> <y> 		      : "ɏ"   U024F               # LATIN SMALL LETTER Y WITH STROKE
+<dead_stroke> <dead_stroke> 	      : "/"   slash               # SOLIDUS
+<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> 	      : "ṏ"   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
+<dead_circumflex> <dead_grave> <e>    : "ề"   ecircumflexgrave    # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+<dead_circumflex> <dead_grave> <O>    : "Ồ"   Ocircumflexgrave    # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+<dead_circumflex> <dead_grave> <o>    : "ồ"   ocircumflexgrave    # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+<dead_circumflex> <dead_hook> <A>     : "Ẩ"   Acircumflexhook     # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_circumflex> <dead_hook> <a>     : "ẩ"   acircumflexhook     # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<dead_circumflex> <dead_hook> <E>     : "Ể"   Ecircumflexhook     # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+<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
diff --git a/libX11/nls/en_US.UTF-8/Makefile.in b/libX11/nls/en_US.UTF-8/Makefile.in
index 3bdf4f456..583ae36c4 100644
--- a/libX11/nls/en_US.UTF-8/Makefile.in
+++ b/libX11/nls/en_US.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/en_US.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/en_US.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/en_US.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/en_US.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre b/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
index 5bb70bbcc..0c751e4de 100644
--- a/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
+++ b/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre
@@ -30,17 +30,107 @@ fs1	{
 		primary	ISO8859-1:GR
 	}
 }
-XCOMM 	fs2 class (Kanji)
+XCOMM	fs2 class (ISO8859 families)
 fs2	{
 	charset	{
+		name	ISO8859-2:GR
+	}
+	font	{
+		primary	ISO8859-2:GR
+	}
+}
+XCOMM	fs3 class (ISO8859 families)
+fs3	{
+	charset	{
+		name	ISO8859-3:GR
+	}
+	font	{
+		primary	ISO8859-3:GR
+	}
+}
+XCOMM	fs4 class (ISO8859 families)
+fs4	{
+	charset	{
+		name	ISO8859-4:GR
+	}
+	font	{
+		primary	ISO8859-4:GR
+	}
+}
+XCOMM	fs5 class (ISO8859 families)
+fs5	{
+	charset	{
+		name	ISO8859-5:GR
+	}
+	font	{
+		primary	ISO8859-5:GR
+	}
+}
+XCOMM	fs6 class (koi8-r)
+fs6	{
+	charset	{
+		name	KOI8-R:GR
+	}
+	font	{
+		primary	KOI8-R:GR
+	}
+}
+XCOMM	fs7 class (ISO8859 families)
+fs7	{
+	charset	{
+		name	ISO8859-7:GR
+	}
+	font	{
+		primary	ISO8859-7:GR
+	}
+}
+XCOMM	fs9 class (ISO8859 families)
+fs8	{
+	charset	{
+		name	ISO8859-9:GR
+	}
+	font	{
+		primary	ISO8859-9:GR
+	}
+}
+XCOMM	fs13 class (ISO8859 families)
+fs9	{
+	charset	{
+		name	ISO8859-13:GR
+	}
+	font	{
+		primary	ISO8859-13:GR
+	}
+}
+XCOMM	fs14 class (ISO8859 families)
+fs10	{
+	charset	{
+		name	ISO8859-14:GR
+	}
+	font	{
+		primary	ISO8859-14:GR
+	}
+}
+XCOMM	fs15 class (ISO8859 families)
+fs11	{
+	charset	{
+		name	ISO8859-15:GR
+	}
+	font	{
+		primary	ISO8859-15:GR
+	}
+}
+XCOMM 	fs16 class (Kanji)
+fs12	{
+	charset	{
 		name	JISX0208.1983-0:GL
 	}
 	font	{
 		primary	JISX0208.1983-0:GL
 	}
 }
-XCOMM   fs3 class (Korean Character)
-fs3	{
+XCOMM   fs17 class (Korean Character)
+fs13	{
 	charset	{
 		name	KSC5601.1987-0:GL
 	}
@@ -48,8 +138,8 @@ fs3	{
 		primary	KSC5601.1987-0:GL
 	}
 }
-XCOMM   fs4 class (Chinese Han Character)
-fs4	{
+XCOMM   fs18 class (Chinese Han Character)
+fs14	{
 	charset	{
 		name	GB2312.1980-0:GL
 	}
@@ -57,8 +147,8 @@ fs4	{
 		primary	GB2312.1980-0:GL
 	}
 }
-XCOMM	fs5 class (Half Kana)
-fs5	{
+XCOMM	fs20 class (Half Kana)
+fs15	{
 	charset	{
 		name	JISX0201.1976-0:GR
 	}
@@ -68,8 +158,8 @@ fs5	{
 	}
 }
 XCOMM	ISO10646 should come last so the fonts above will actually be used
-XCOMM	fs6 class
-fs6	{
+XCOMM	fs24 class
+fs16	{
 	charset	{
 		name	ISO10646-1
 	}
@@ -103,37 +193,107 @@ cs1     {
 }
  
 XCOMM	cs2 class
-cs2	{
+cs2     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-2:GR
+}
+ 
+XCOMM	cs3 class
+cs3     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-3:GR
+}
+ 
+XCOMM	cs4 class
+cs4     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-4:GR
+}
+ 
+XCOMM	cs5 class
+cs5     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-5:GR
+}
+ 
+XCOMM	cs6 class
+cs6     {
+        side            GR
+        length          1
+        ct_encoding     KOI8-R: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     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-13:GR
+}
+ 
+XCOMM	cs14 class
+cs10     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-14:GR
+}
+ 
+XCOMM	cs15 class
+cs11     {
+        side            GR
+        length          1
+        ct_encoding     ISO8859-15:GR
+}
+ 
+XCOMM	cs16 class
+cs12	{
 	side		GR
 	length		2
 	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
 			JISX0208.1983-1:GL; JISX0208.1983-1:GR
 }
 
-XCOMM	cs3 class
-cs3     {
+XCOMM	cs17 class
+cs13     {
         side            GL
         length          2
         ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
                         KSC5601.1987-1:GL; KSC5601.1987-1:GR
 }
  
-XCOMM	cs4 class
-cs4     {
+XCOMM	cs18 class
+cs14     {
         side            GR
         length          2
         ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
 }
  
-XCOMM	cs5 class
-cs5	{
+XCOMM	cs20 class
+cs15	{
 	side		GR
 	length		1
 	ct_encoding	JISX0201.1976-0:GR
 }
-
-XCOMM	cs6 class
-cs6	{
+ 
+XCOMM	cs24 class
+cs16	{
 	side		none
 	ct_encoding	ISO10646-1
 }
diff --git a/libX11/nls/georgian-academy/Makefile.in b/libX11/nls/georgian-academy/Makefile.in
index e2cfa84a7..f088237b1 100644
--- a/libX11/nls/georgian-academy/Makefile.in
+++ b/libX11/nls/georgian-academy/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/georgian-academy/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/georgian-academy/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/georgian-academy/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/georgian-academy/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/georgian-ps/Makefile.in b/libX11/nls/georgian-ps/Makefile.in
index d03808a07..3e3c69817 100644
--- a/libX11/nls/georgian-ps/Makefile.in
+++ b/libX11/nls/georgian-ps/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/georgian-ps/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/georgian-ps/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/georgian-ps/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/georgian-ps/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ibm-cp1133/Makefile.in b/libX11/nls/ibm-cp1133/Makefile.in
index 92b00e8e7..226eb48d4 100644
--- a/libX11/nls/ibm-cp1133/Makefile.in
+++ b/libX11/nls/ibm-cp1133/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ibm-cp1133/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ibm-cp1133/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ibm-cp1133/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ibm-cp1133/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iscii-dev/Makefile.in b/libX11/nls/iscii-dev/Makefile.in
index e36402f6c..9d4cb8dc2 100644
--- a/libX11/nls/iscii-dev/Makefile.in
+++ b/libX11/nls/iscii-dev/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iscii-dev/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iscii-dev/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iscii-dev/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iscii-dev/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/isiri-3342/Makefile.in b/libX11/nls/isiri-3342/Makefile.in
index 614001547..85004fa76 100644
--- a/libX11/nls/isiri-3342/Makefile.in
+++ b/libX11/nls/isiri-3342/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/isiri-3342/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/isiri-3342/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/isiri-3342/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/isiri-3342/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-1/Makefile.in b/libX11/nls/iso8859-1/Makefile.in
index 812bf03c2..2d1094d5c 100644
--- a/libX11/nls/iso8859-1/Makefile.in
+++ b/libX11/nls/iso8859-1/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-1/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-1/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-1/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-1/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-10/Makefile.in b/libX11/nls/iso8859-10/Makefile.in
index 126987526..1f83b30d0 100644
--- a/libX11/nls/iso8859-10/Makefile.in
+++ b/libX11/nls/iso8859-10/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-10
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-10/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-10/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-10/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-10/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-11/Makefile.in b/libX11/nls/iso8859-11/Makefile.in
index a9ff22d5b..3167164a6 100644
--- a/libX11/nls/iso8859-11/Makefile.in
+++ b/libX11/nls/iso8859-11/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-11
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-11/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-11/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-11/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-11/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-13/Makefile.in b/libX11/nls/iso8859-13/Makefile.in
index 4f3971936..53f7208c7 100644
--- a/libX11/nls/iso8859-13/Makefile.in
+++ b/libX11/nls/iso8859-13/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-13
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-13/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-13/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-13/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-13/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-14/Makefile.in b/libX11/nls/iso8859-14/Makefile.in
index 5343d03c5..c129fb119 100644
--- a/libX11/nls/iso8859-14/Makefile.in
+++ b/libX11/nls/iso8859-14/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-14
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-14/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-14/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-14/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-14/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-15/Makefile.in b/libX11/nls/iso8859-15/Makefile.in
index a3470219c..bd89074ab 100644
--- a/libX11/nls/iso8859-15/Makefile.in
+++ b/libX11/nls/iso8859-15/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-15
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-15/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-15/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-15/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-15/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-2/Makefile.in b/libX11/nls/iso8859-2/Makefile.in
index aca5bd367..97489c066 100644
--- a/libX11/nls/iso8859-2/Makefile.in
+++ b/libX11/nls/iso8859-2/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-2
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-2/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-2/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-2/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-3/Makefile.in b/libX11/nls/iso8859-3/Makefile.in
index b22bc3d7f..f7650dbb9 100644
--- a/libX11/nls/iso8859-3/Makefile.in
+++ b/libX11/nls/iso8859-3/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-3
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-3/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-3/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-3/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-3/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-4/Makefile.in b/libX11/nls/iso8859-4/Makefile.in
index 19c312ab5..62327ec8b 100644
--- a/libX11/nls/iso8859-4/Makefile.in
+++ b/libX11/nls/iso8859-4/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-4
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-4/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-4/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-4/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-4/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-5/Makefile.in b/libX11/nls/iso8859-5/Makefile.in
index 23f23bd8b..a68fb6de6 100644
--- a/libX11/nls/iso8859-5/Makefile.in
+++ b/libX11/nls/iso8859-5/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-5
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-5/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-5/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-5/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-5/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-6/Makefile.in b/libX11/nls/iso8859-6/Makefile.in
index e90f65145..5c3a2551f 100644
--- a/libX11/nls/iso8859-6/Makefile.in
+++ b/libX11/nls/iso8859-6/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-6
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-6/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-6/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-6/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-6/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-7/Makefile.in b/libX11/nls/iso8859-7/Makefile.in
index 001049489..78d7ed686 100644
--- a/libX11/nls/iso8859-7/Makefile.in
+++ b/libX11/nls/iso8859-7/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-7
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-7/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-7/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-7/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-7/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-8/Makefile.in b/libX11/nls/iso8859-8/Makefile.in
index 61bcc876e..a2bd17854 100644
--- a/libX11/nls/iso8859-8/Makefile.in
+++ b/libX11/nls/iso8859-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-9/Makefile.in b/libX11/nls/iso8859-9/Makefile.in
index 3e1bbae2e..cd5883edd 100644
--- a/libX11/nls/iso8859-9/Makefile.in
+++ b/libX11/nls/iso8859-9/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-9/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-9/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-9/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-9/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/iso8859-9e/Makefile.in b/libX11/nls/iso8859-9e/Makefile.in
index 5a50f096b..d80bb56dc 100644
--- a/libX11/nls/iso8859-9e/Makefile.in
+++ b/libX11/nls/iso8859-9e/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9e
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/iso8859-9e/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/iso8859-9e/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/iso8859-9e/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/iso8859-9e/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ja.JIS/Makefile.in b/libX11/nls/ja.JIS/Makefile.in
index 81735981c..426de5761 100644
--- a/libX11/nls/ja.JIS/Makefile.in
+++ b/libX11/nls/ja.JIS/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ja.JIS
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ja.JIS/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ja.JIS/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ja.JIS/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ja.JIS/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ja.S90/Makefile.in b/libX11/nls/ja.S90/Makefile.in
index cd69bfbf8..3d4d40e0d 100644
--- a/libX11/nls/ja.S90/Makefile.in
+++ b/libX11/nls/ja.S90/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ja.S90
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ja.S90/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ja.S90/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ja.S90/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ja.S90/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ja.SJIS/Makefile.in b/libX11/nls/ja.SJIS/Makefile.in
index 1218e19b5..38e577a18 100644
--- a/libX11/nls/ja.SJIS/Makefile.in
+++ b/libX11/nls/ja.SJIS/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ja.SJIS
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ja.SJIS/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ja.SJIS/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ja.SJIS/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ja.SJIS/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ja.U90/Makefile.in b/libX11/nls/ja.U90/Makefile.in
index b5afce468..ecc255f19 100644
--- a/libX11/nls/ja.U90/Makefile.in
+++ b/libX11/nls/ja.U90/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ja.U90
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ja.U90/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ja.U90/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ja.U90/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ja.U90/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ja/Makefile.in b/libX11/nls/ja/Makefile.in
index 81af2b04e..03327f01f 100644
--- a/libX11/nls/ja/Makefile.in
+++ b/libX11/nls/ja/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ja
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ja/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ja/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ja/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ja/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ja_JP.UTF-8/Makefile.in b/libX11/nls/ja_JP.UTF-8/Makefile.in
index 5072d7d6e..36304aea5 100644
--- a/libX11/nls/ja_JP.UTF-8/Makefile.in
+++ b/libX11/nls/ja_JP.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ja_JP.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ja_JP.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ja_JP.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ja_JP.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ja_JP.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ko/Makefile.in b/libX11/nls/ko/Makefile.in
index ecae6fa7a..c50dc9806 100644
--- a/libX11/nls/ko/Makefile.in
+++ b/libX11/nls/ko/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ko
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ko/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ko/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ko/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ko/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/ko_KR.UTF-8/Makefile.in b/libX11/nls/ko_KR.UTF-8/Makefile.in
index 8ca45dafb..674e83af0 100644
--- a/libX11/nls/ko_KR.UTF-8/Makefile.in
+++ b/libX11/nls/ko_KR.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ko_KR.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/ko_KR.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/ko_KR.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ko_KR.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/ko_KR.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/koi8-c/Makefile.in b/libX11/nls/koi8-c/Makefile.in
index cdf20b5e2..589404f3a 100644
--- a/libX11/nls/koi8-c/Makefile.in
+++ b/libX11/nls/koi8-c/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-c
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/koi8-c/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/koi8-c/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/koi8-c/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/koi8-c/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/koi8-r/Makefile.in b/libX11/nls/koi8-r/Makefile.in
index ab8cabb4d..dcd4a342e 100644
--- a/libX11/nls/koi8-r/Makefile.in
+++ b/libX11/nls/koi8-r/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-r
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/koi8-r/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/koi8-r/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/koi8-r/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/koi8-r/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/koi8-u/Makefile.in b/libX11/nls/koi8-u/Makefile.in
index 4bb3f2766..0bb0a023b 100644
--- a/libX11/nls/koi8-u/Makefile.in
+++ b/libX11/nls/koi8-u/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-u
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/koi8-u/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/koi8-u/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/koi8-u/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/koi8-u/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/locale.alias.pre b/libX11/nls/locale.alias.pre
index 71d55e039..44891d14d 100644
--- a/libX11/nls/locale.alias.pre
+++ b/libX11/nls/locale.alias.pre
@@ -51,6 +51,8 @@ ar_EG:						ar_EG.ISO8859-6
 ar_EG.iso88596:					ar_EG.ISO8859-6
 ar_EG.ISO-8859-6:				ar_EG.ISO8859-6
 ar_EG.utf8:					ar_EG.UTF-8
+ar_IN.utf8:					ar_IN.UTF-8
+ar_IN.UTF-8:					ar_IN.UTF-8
 ar_IQ:						ar_IQ.ISO8859-6
 ar_IQ.iso88596:					ar_IQ.ISO8859-6
 ar_IQ.ISO-8859-6:				ar_IQ.ISO8859-6
@@ -61,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
@@ -111,12 +112,15 @@ az:						az_AZ.ISO8859-9E
 az_AZ:						az_AZ.ISO8859-9E
 az_AZ.iso88599e:				az_AZ.ISO8859-9E
 be:						be_BY.CP1251
+be@latin:					be_BY.UTF-8@latin
 be_BY:						be_BY.CP1251
+be_BY@latin:					be_BY.UTF-8@latin
 be_BY.cp1251:					be_BY.CP1251
 be_BY.microsoftcp1251:				be_BY.CP1251
 be_BY.microsoft-cp1251:				be_BY.CP1251
 be_BY.MICROSOFT-CP1251:				be_BY.CP1251
 be_BY.utf8:					be_BY.UTF-8
+be_BY.utf8@latin:				be_BY.UTF-8@latin
 bg:						bg_BG.CP1251
 bg_BG:						bg_BG.CP1251
 bg_BG.cp1251:					bg_BG.CP1251
@@ -129,6 +133,8 @@ bg_BG.koi8r:					bg_BG.KOI8-R
 be_BG.utf8:					bg_BG.UTF-8
 bn_IN.utf8:					bn_IN.UTF-8
 bn_IN.UTF-8:					bn_IN.UTF-8
+bo_IN.utf8:					bo_IN.UTF-8
+bo_IN.UTF-8:					bo_IN.UTF-8
 br:						br_FR.ISO8859-1
 br_FR:						br_FR.ISO8859-1
 br_FR.iso88591:					br_FR.ISO8859-1
@@ -205,6 +211,7 @@ cy_GB.ISO-8859-14:				cy_GB.ISO8859-14
 cy_GB.iso885915:				cy_GB.ISO8859-15
 cy_GB.ISO-8859-15:				cy_GB.ISO8859-15
 da:						da_DK.ISO8859-1
+da.ISO8859-15:					da_DK.ISO8859-15
 da_DK:						da_DK.ISO8859-1
 DA_DK:						da_DK.ISO8859-1
 da_DK.88591:					da_DK.ISO8859-1
@@ -218,6 +225,7 @@ da_DK.8859-15:					da_DK.ISO8859-15
 da_DK.utf8:					da_DK.UTF-8
 DA_DK.UTF-8:					da_DK.UTF-8
 de:						de_DE.ISO8859-1
+de.ISO8859-15:					de_DE.ISO8859-15
 de_AT:						de_AT.ISO8859-1
 de_AT@euro:					de_AT.ISO8859-15
 de_AT.iso88591:					de_AT.ISO8859-1
@@ -349,15 +357,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
@@ -376,6 +375,7 @@ eo_EO.ISO8859-3:				eo_EO.ISO8859-3
 eo_XX:						eo_XX.ISO8859-3
 eo_XX.ISO8859-3:				eo_XX.ISO8859-3
 es:						es_ES.ISO8859-1
+es.UTF-8:					es_ES.UTF-8
 es_AR:						es_AR.ISO8859-1
 es_AR.iso88591:					es_AR.ISO8859-1
 es_AR.ISO-8859-1:				es_AR.ISO8859-1
@@ -500,6 +500,7 @@ fa_IR:						fa_IR.UTF-8
 fa_IR.isiri3342:				fa_IR.ISIRI-3342
 fa_IR.utf8:					fa_IR.UTF-8
 fi:						fi_FI.ISO8859-15
+fi.ISO8859-15:					fi_FI.ISO8859-15
 fi_FI:						fi_FI.ISO8859-15
 fi_FI.88591:					fi_FI.ISO8859-1
 fi_FI.88591.en:					fi_FI.ISO8859-1
@@ -520,6 +521,8 @@ fo_FO.iso885915:				fo_FO.ISO8859-15
 fo_FO.ISO-8859-15:				fo_FO.ISO8859-15
 fo_FO.utf8:					fo_FO.UTF-8
 fr:						fr_FR.ISO8859-1
+fr.ISO8859-15:					fr_FR.ISO8859-15
+fr.UTF-8:					fr_FR.UTF-8
 fr_BE:						fr_BE.ISO8859-1
 fr_BE.88591:					fr_BE.ISO8859-1
 fr_BE.88591.en:					fr_BE.ISO8859-1
@@ -631,6 +634,9 @@ HI_IN:						hi_IN.ISCII-DEV
 hi_IN.isciidev:					hi_IN.ISCII-DEV
 hi_IN.utf8:					hi_IN.UTF-8
 HI_IN.UTF-8:					hi_IN.UTF-8
+hne:						hne_IN.UTF-8
+hne_IN.utf8:					hne_IN.UTF-8
+hne_IN.UTF-8:					hne_IN.UTF-8
 hr:						hr_HR.ISO8859-2
 hr_HR:						hr_HR.ISO8859-2
 hr_HR.iso88592:					hr_HR.ISO8859-2
@@ -641,6 +647,7 @@ hu:						hu_HU.ISO8859-2
 hu_HU:						hu_HU.ISO8859-2
 hu_HU.iso88592:					hu_HU.ISO8859-2
 hu_HU.ISO-8859-2:				hu_HU.ISO8859-2
+hu_HU.utf8:					hu_HU.UTF-8
 XCOMM in was the old ISO code for Indonesian (now id).  These lines should be
 XCOMM deleted in the future.
 in:						id_ID.ISO8859-1
@@ -654,6 +661,8 @@ is_IS.iso885915:				is_IS.ISO8859-15
 is_IS.ISO-8859-15:				is_IS.ISO8859-15
 is_IS.utf8:					is_IS.UTF-8
 it:						it_IT.ISO8859-1
+it.ISO8859-15:					it_IT.ISO8859-15
+it.UTF-8:					it_IT.UTF-8
 it_CH:						it_CH.ISO8859-1
 it_CH.iso88591:					it_CH.ISO8859-1
 it_CH.ISO_8859-1:				it_CH.ISO8859-1
@@ -692,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
@@ -705,6 +712,7 @@ ja_JP.ISO-2022-JP:				ja_JP.JIS7
 ja_JP.JIS:					ja_JP.JIS7
 ja_JP.jis7:					ja_JP.JIS7
 ja_JP.mscode:					ja_JP.SJIS
+ja_JP.PCK:					ja_JP.SJIS
 ja_JP.SJIS:					ja_JP.SJIS
 ja_JP.sjis:					ja_JP.SJIS
 ja_JP.utf8:					ja_JP.UTF-8
@@ -724,6 +732,7 @@ kn:						kn_IN.UTF-8
 kn_IN.utf8:					kn_IN.UTF-8
 kn_IN.UTF-8:					kn_IN.UTF-8
 ko:						ko_KR.eucKR
+ko.UTF-8:					ko_KR.UTF-8
 ko_KR:						ko_KR.eucKR
 KO_KR:						ko_KR.eucKR
 ko_KR.EUC:					ko_KR.eucKR
@@ -732,6 +741,12 @@ ko_KR.euc:					ko_KR.eucKR
 ko_KR.euckr:					ko_KR.eucKR
 ko_KR.utf8:					ko_KR.UTF-8
 KO_KR.UTF-8:					ko_KR.UTF-8
+ks:						ks_IN.UTF-8
+ks_IN.utf8:					ks_IN.UTF-8
+ks_IN.UTF-8:					ks_IN.UTF-8
+ks_IN@devanagari:				ks_IN@devanagari.UTF-8
+ks_IN@devanagari.utf8:				ks_IN@devanagari.UTF-8
+ks_IN@devanagari.UTF-8:				ks_IN@devanagari.UTF-8
 kw:						kw_GB.ISO8859-1
 kw_GB:						kw_GB.ISO8859-1
 kw_GB.iso88591:					kw_GB.ISO8859-1
@@ -773,6 +788,9 @@ lv_LV.iso885913:				lv_LV.ISO8859-13
 lv_LV.ISO-8859-13:				lv_LV.ISO8859-13
 lv_LV.ISO_8859-13:				lv_LV.ISO8859-13
 lv_LV.utf8:					lv_LV.UTF-8
+mai:						mai_IN.UTF-8
+mai_IN.utf8:					mai_IN.UTF-8
+mai_IN.UTF-8:					mai_IN.UTF-8
 mi:						mi_NZ.ISO8859-1
 mi_NZ:						mi_NZ.ISO8859-1
 mi_NZ.iso88591:					mi_NZ.ISO8859-1
@@ -788,8 +806,10 @@ mk_MK.utf8:					mk_MK.UTF-8
 ml:						ml_IN.UTF-8
 ml_IN.utf8:					ml_IN.UTF-8
 ml_IN.UTF-8:					ml_IN.UTF-8
+mr:						mr_IN.UTF-8
 mr_IN:						mr_IN.UTF-8
 mr_IN.utf8:					mr_IN.UTF-8
+mr_IN.UTF-8:					mr_IN.UTF-8
 ms:						ms_MY.ISO8859-1
 ms_MY:						ms_MY.ISO8859-1
 ms_MY.iso88591:					ms_MY.ISO8859-1
@@ -804,7 +824,10 @@ nb_NO.iso88591:					nb_NO.ISO8859-1
 nb_NO.ISO-8859-1:				nb_NO.ISO8859-1
 nb_NO.iso885915:				nb_NO.ISO8859-15
 nb_NO.ISO-8859-15:				nb_NO.ISO8859-15
+ne_NP.utf8:					ne_NP.UTF-8
+ne_NP.UTF-8:					ne_NP.UTF-8
 nl:						nl_NL.ISO8859-1
+nl.ISO8859-15:					nl_NL.ISO8859-15
 nl_BE:						nl_BE.ISO8859-1
 nl_BE.88591:					nl_BE.ISO8859-1
 nl_BE.88591.en:					nl_BE.ISO8859-1
@@ -842,6 +865,8 @@ no_NO.88591:					no_NO.ISO8859-1
 no_NO.88591.en:					no_NO.ISO8859-1
 no_NO.iso88591:					no_NO.ISO8859-1
 no_NO.ISO-8859-1:				no_NO.ISO8859-1
+no_NO.ISO8859-1@bokmal:				no_NO.ISO8859-1
+no_NO.ISO8859-1@nynorsk:			no_NO.ISO8859-1
 no_NO.iso885915:				no_NO.ISO8859-15
 no_NO.ISO-8859-15:				no_NO.ISO8859-15
 no_NO.utf8:					no_NO.UTF-8
@@ -870,8 +895,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
@@ -883,6 +910,7 @@ ph:						ph_PH.ISO8859-1
 ph_PH:						ph_PH.ISO8859-1
 ph_PH.iso88591:					ph_PH.ISO8859-1
 pl:						pl_PL.ISO8859-2
+pl.UTF-8:					pl_PL.UTF-8
 pl_PL:						pl_PL.ISO8859-2
 pl_PL.iso88592:					pl_PL.ISO8859-2
 pl_PL.ISO-8859-2:				pl_PL.ISO8859-2
@@ -891,6 +919,7 @@ pp:						pp_AN.ISO8859-1
 pp_AN:						pp_AN.ISO8859-1
 pp_AN.iso88591:					pp_AN.ISO8859-1
 pt:						pt_PT.ISO8859-1
+pt.ISO8859-15:					pt_PT.ISO8859-15
 pt_BR:						pt_BR.ISO8859-1
 pt_BR.88591:					pt_BR.ISO8859-1
 pt_BR.88591.en:					pt_BR.ISO8859-1
@@ -917,6 +946,8 @@ ro_RO.iso88592:					ro_RO.ISO8859-2
 ro_RO.ISO-8859-2:				ro_RO.ISO8859-2
 ro_RO.utf8:					ro_RO.UTF-8
 ru:						ru_RU.UTF-8
+ru.koi8-r:					ru_RU.KOI8-R
+ru.UTF-8:					ru_RU.UTF-8
 ru_RU:						ru_RU.UTF-8
 ru_RU.utf8:					ru_RU.UTF-8
 ru_RU.iso88595:					ru_RU.ISO8859-5
@@ -943,16 +974,22 @@ rw_RW:                      rw_RW.ISO8859-1
 rw_RW.iso8859-1:            rw_RW.ISO8859-1
 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:						sd_IN@devanagari.UTF-8
+sd_IN@devanagari.utf8:				sd_IN@devanagari.UTF-8
+sd_IN@devanagari.UTF-8:				sd_IN@devanagari.UTF-8
 se_NO:						se_NO.UTF-8
 se_NO.utf8:					se_NO.UTF-8
 XCOMM sh was the old ISO code for Serbo-Croatian (now individual sr and hr).
-XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
+XCOMM YU was the old ISO code for Yugoslavia (later CS for Serbia&Montenegro).
+XCOMM CS was the old ISO code for Serbia&Montenegro (now separate RS and ME).
 XCOMM These lines should be deleted in the future.
-sh:						sr_CS.ISO8859-2
+sh:						sr_RS.UTF-8@latin
+sh_BA.ISO8859-2@bosnia:				sr_CS.ISO8859-2
 sh_HR.iso88592:					hr_HR.ISO8859-2
-sh_SP:						sr_CS.ISO8859-2
-sh_YU:						sr_CS.ISO8859-2
-sh_YU.utf8:					sr_CS.UTF-8
+sh_YU:						sr_RS.UTF-8@latin
+sh_YU.utf8:					sr_RS.UTF-8@latin
 si:						si_LK.UTF-8
 si_LK:						si_LK.UTF-8
 sk:						sk_SK.ISO8859-2
@@ -965,49 +1002,33 @@ sl_SI:						sl_SI.ISO8859-2
 sl_SI.iso88592:					sl_SI.ISO8859-2
 sl_SI.ISO-8859-2:				sl_SI.ISO8859-2
 sl_SI.utf8:					sl_SI.UTF-8
-XCOMM sp is not an ISO 639 language code, but in Cyrillic, "R" looks like "P".
-XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
-XCOMM These lines should be deleted in the future.
-sp:						sr_CS.ISO8859-5
-sp_YU:						sr_CS.ISO8859-5
 sq:						sq_AL.ISO8859-2
 sq_AL:						sq_AL.ISO8859-2
 sq_AL.iso88592:					sq_AL.ISO8859-2
 sq_AL.ISO-8859-2:				sq_AL.ISO8859-2
 sq_AL.utf8:					sq_AL.UTF-8
-XCOMM SP is not an ISO 639 country code, but in Cyrillic, "R" looks like "P".
-XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
+XCOMM YU was the old ISO code for Yugoslavia (later CS for Serbia&Montenegro).
+XCOMM CS was the old ISO code for Serbia&Montenegro (now separate RS and ME).
 XCOMM Some of these lines should be deleted in the future.
-sr_SP:						sr_CS.ISO8859-2
-sr:						sr_CS.ISO8859-5
-sr_YU:						sr_CS.ISO8859-5
-sr_YU.iso88592:					sr_CS.ISO8859-2
-sr_YU.ISO-8859-2:				sr_CS.ISO8859-2
-sr_YU.iso88595:					sr_CS.ISO8859-5
-sr_YU.ISO-8859-5:				sr_CS.ISO8859-5
-sr@cyrillic:					sr_CS.ISO8859-5
-sr_YU@cyrillic:					sr_CS.ISO8859-5
-sr_YU.iso88595@cyrillic:			sr_CS.ISO8859-5
-sr_YU.ISO-8859-5@cyrillic:			sr_CS.ISO8859-5
-sr_YU.ISO8859-5@cyrillic:			sr_CS.ISO8859-5
-sr_YU.cp1251@cyrillic:				sr_CS.CP1251
-sr_YU.CP1251@cyrillic:				sr_CS.CP1251
-sr_YU.microsoftcp1251@cyrillic:			sr_CS.CP1251
-sr_YU.microsoft-cp1251@cyrillic:		sr_CS.CP1251
-sr_YU.MICROSOFT-CP1251@cyrillic:		sr_CS.CP1251
-sr_YU.utf8:					sr_CS.UTF-8
-sr_YU.UTF-8@cyrillic:				sr_CS.UTF-8
-sr_CS.iso88592:					sr_CS.ISO8859-2
-sr_CS.ISO-8859-2:				sr_CS.ISO8859-2
-sr_CS.iso88595:					sr_CS.ISO8859-5
-sr_CS.ISO-8859-5:				sr_CS.ISO8859-5
-sr@Latn:					sr_CS.ISO8859-2
-sr_CS@Latn:					sr_CS.ISO8859-2
-sr_CS.iso88592@Latn:				sr_CS.ISO8859-2
-sr_CS.ISO-8859-2@Latn:				sr_CS.ISO8859-2
-sr_CS.ISO8859-2@Latn:				sr_CS.ISO8859-2
-sr_CS.utf8:					sr_CS.UTF-8
-sr_CS.UTF-8@Latn:				sr_CS.UTF-8
+sr:						sr_RS.UTF-8
+sr_YU:						sr_RS.UTF-8@latin
+sr@cyrillic:					sr_RS.UTF-8
+sr_YU@cyrillic:					sr_RS.UTF-8
+sr_YU.utf8:					sr_RS.UTF-8
+sr_YU.UTF-8@cyrillic:				sr_RS.UTF-8
+sr_CS:						sr_RS.UTF-8
+sr@Latn:					sr_RS.UTF-8@latin
+sr_CS@Latn:					sr_RS.UTF-8@latin
+sr_CS.utf8:					sr_RS.UTF-8
+sr_CS.UTF-8@Latn:				sr_RS.UTF-8@latin
+sr_RS:						sr_RS.UTF-8
+sr@latin:					sr_RS.UTF-8@latin
+sr_RS@latin:				sr_RS.UTF-8@latin
+sr_RS@Latn:				sr_RS.UTF-8@latin
+sr_RS.UTF-8@Latn:				sr_RS.UTF-8@latin
+sr_RS.utf8:					sr_RS.UTF-8
+sr_ME:						sr_ME.UTF-8
+sr_ME.utf8:					sr_ME.UTF-8
 ss:							ss_ZA.ISO8859-1
 ss_ZA:						ss_ZA.ISO8859-1
 ss_ZA.iso88591:				ss_ZA.ISO8859-1
@@ -1017,6 +1038,8 @@ st_ZA:						st_ZA.ISO8859-1
 st_ZA.iso88591:				st_ZA.ISO8859-1
 st_ZA.utf8:					st_ZA.UTF-8
 sv:						sv_SE.ISO8859-1
+sv.ISO8859-15:					sv_SE.ISO8859-15
+sv.UTF-8:					sv_SE.UTF-8
 sv_FI:						sv_FI.ISO8859-1
 sv_FI.iso88591:					sv_FI.ISO8859-1
 sv_FI.ISO-8859-1:				sv_FI.ISO8859-1
@@ -1141,6 +1164,7 @@ zh_CN.euc:					zh_CN.eucCN
 zh_CN.utf8:					zh_CN.UTF-8
 ZH_CN.UTF-8:					zh_CN.UTF-8
 zh_HK:						zh_HK.big5hkscs
+zh_HK.BIG5HK:					zh_HK.big5hkscs
 zh_HK.Big5hkscs:				zh_HK.big5hkscs
 zh_HK.Big5-hkscs:				zh_HK.big5hkscs
 zh_HK.Big5_hkscs:				zh_HK.big5hkscs
@@ -1226,7 +1250,7 @@ portuguese.iso88591:				pt_PT.ISO8859-1
 romanian:					ro_RO.ISO8859-2
 rumanian:					ro_RO.ISO8859-2
 russian:					ru_RU.ISO8859-5
-serbocroatian:					sr_CS.ISO8859-2
+serbocroatian:					sr_RS.UTF-8@latin
 sinhala:					si_LK.UTF-8
 slovak:						sk_SK.ISO8859-2
 slovene:					sl_SI.ISO8859-2
@@ -1339,7 +1363,7 @@ Russian_Russia.1251:				ru_RU.iso8859-5
 Slovak_Slovakia.1250:				sk_SK.iso8859-2
 Slovene_Slovenia.1250:				sl_SI.iso8859-2
 Albanian_Albania.1250:				sq_AL.iso8859-2
-Serbian (Latin)_Serbia.1250:			sr_CS.iso8859-2
+Serbian (Latin)_Serbia.1250:			sr_RS.UTF-8@latin
 Swedish_Finland.1252:				sv_FI.iso8859-1
 Swedish_Sweden.1252:				sv_SE.iso8859-1
 Turkish_Turkey.1254:				tr_TR.iso8859-9
diff --git a/libX11/nls/locale.dir.pre b/libX11/nls/locale.dir.pre
index 6489388db..0fc4a9f93 100644
--- a/libX11/nls/locale.dir.pre
+++ b/libX11/nls/locale.dir.pre
@@ -208,11 +208,9 @@ iso8859-1/XLC_LOCALE:           rw_RW.ISO8859-1
 iso8859-2/XLC_LOCALE: 			sh_YU.ISO8859-2
 iso8859-2/XLC_LOCALE: 			sk_SK.ISO8859-2
 iso8859-2/XLC_LOCALE: 			sl_SI.ISO8859-2
-iso8859-5/XLC_LOCALE: 			sp_YU.ISO8859-5
 iso8859-2/XLC_LOCALE: 			sq_AL.ISO8859-2
 iso8859-2/XLC_LOCALE:			sr_CS.ISO8859-2
 iso8859-5/XLC_LOCALE:			sr_CS.ISO8859-5
-iso8859-2/XLC_LOCALE:			sr_SP.ISO8859-2
 iso8859-2/XLC_LOCALE:			sr_YU.ISO8859-2
 iso8859-5/XLC_LOCALE:			sr_YU.ISO8859-5
 microsoft-cp1251/XLC_LOCALE:		sr_YU.CP1251
@@ -262,6 +260,7 @@ en_US.UTF-8/XLC_LOCALE:			ar_AE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_BH.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_DZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_EG.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 ar_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_IQ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_JO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_KW.UTF-8
@@ -283,6 +282,7 @@ en_US.UTF-8/XLC_LOCALE:			be_BY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			bg_BG.UTF-8
 en_US.UTF-8/XLC_LOCALE:			bn_BD.UTF-8
 en_US.UTF-8/XLC_LOCALE:			bn_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 bo_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			br_FR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ca_AD.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ca_ES.UTF-8
@@ -298,6 +298,7 @@ en_US.UTF-8/XLC_LOCALE:			de_CH.UTF-8
 en_US.UTF-8/XLC_LOCALE:			de_DE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			de_LI.UTF-8
 en_US.UTF-8/XLC_LOCALE:			de_LU.UTF-8
+en_US.UTF-8/XLC_LOCALE:			el_CY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			el_GR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_AU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_BE.UTF-8
@@ -306,6 +307,7 @@ en_US.UTF-8/XLC_LOCALE:			en_CA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_IE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_JM.UTF-8
+en_US.UTF-8/XLC_LOCALE:			en_MT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_NZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_TT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			en_UK.UTF-8
@@ -330,6 +332,7 @@ en_US.UTF-8/XLC_LOCALE:			es_PE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			es_PR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			es_PY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			es_SV.UTF-8
+en_US.UTF-8/XLC_LOCALE:			es_US.UTF-8
 en_US.UTF-8/XLC_LOCALE:			es_UY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			es_VE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			et_EE.UTF-8
@@ -349,6 +352,7 @@ en_US.UTF-8/XLC_LOCALE:			gu_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			gv_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			he_IL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hi_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 hne_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hr_HR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hu_HU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			hy_AM.UTF-8
@@ -360,18 +364,23 @@ en_US.UTF-8/XLC_LOCALE:			iu_CA.UTF-8
 ja_JP.UTF-8/XLC_LOCALE:			ja_JP.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ka_GE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kl_GL.UTF-8
+en_US.UTF-8/XLC_LOCALE:			kk_KZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kn_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 ks_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 ks_IN@devanagari.UTF-8
 ko_KR.UTF-8/XLC_LOCALE:			ko_KR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ky_KG.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lo_LA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lt_LT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lv_LV.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 mai_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mi_NZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mk_MK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ml_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mr_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ms_MY.UTF-8
+en_US.UTF-8/XLC_LOCALE:			mt_MT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nl_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nl_NL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nb_NO.UTF-8
@@ -383,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
@@ -391,16 +401,22 @@ en_US.UTF-8/XLC_LOCALE:			pp_AN.UTF-8
 pt_BR.UTF-8/XLC_LOCALE:			pt_BR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pt_PT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ro_RO.UTF-8
-en_US.UTF-8/XLC_LOCALE:			ru_RU.UTF-8
+ru_RU.UTF-8/XLC_LOCALE:			ru_RU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ru_UA.UTF-8
-en_US.UTF-8/XLC_LOCALE:         rw_RW.UTF-8
+en_US.UTF-8/XLC_LOCALE:         	rw_RW.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 sa_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 sd_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 sd_IN@devanagari.UTF-8
 en_US.UTF-8/XLC_LOCALE:			se_NO.UTF-8
+en_US.UTF-8/XLC_LOCALE:			sh_BA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sh_YU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			si_LK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sk_SK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sl_SI.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sq_AL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_CS.UTF-8
+en_US.UTF-8/XLC_LOCALE:			sr_ME.UTF-8
+en_US.UTF-8/XLC_LOCALE:			sr_RS.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_YU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ss_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			st_ZA.UTF-8
@@ -426,6 +442,7 @@ en_US.UTF-8/XLC_LOCALE:			vi_VN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			wa_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			xh_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			yi_US.UTF-8
+en_US.UTF-8/XLC_LOCALE:                 ne_NP.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_CN.UTF-8
 zh_HK.UTF-8/XLC_LOCALE:			zh_HK.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_SG.UTF-8
diff --git a/libX11/nls/microsoft-cp1251/Makefile.in b/libX11/nls/microsoft-cp1251/Makefile.in
index dde9a6997..90e2af904 100644
--- a/libX11/nls/microsoft-cp1251/Makefile.in
+++ b/libX11/nls/microsoft-cp1251/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1251
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/microsoft-cp1251/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/microsoft-cp1251/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/microsoft-cp1251/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/microsoft-cp1251/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/microsoft-cp1255/Makefile.in b/libX11/nls/microsoft-cp1255/Makefile.in
index 9d571c6e9..a2e178dbd 100644
--- a/libX11/nls/microsoft-cp1255/Makefile.in
+++ b/libX11/nls/microsoft-cp1255/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1255
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/microsoft-cp1255/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/microsoft-cp1255/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/microsoft-cp1255/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/microsoft-cp1255/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/microsoft-cp1256/Makefile.in b/libX11/nls/microsoft-cp1256/Makefile.in
index a2c43bd3e..9ca530bf6 100644
--- a/libX11/nls/microsoft-cp1256/Makefile.in
+++ b/libX11/nls/microsoft-cp1256/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1256
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/microsoft-cp1256/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/microsoft-cp1256/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/microsoft-cp1256/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/microsoft-cp1256/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/mulelao-1/Makefile.in b/libX11/nls/mulelao-1/Makefile.in
index 8dd823815..0a286e584 100644
--- a/libX11/nls/mulelao-1/Makefile.in
+++ b/libX11/nls/mulelao-1/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/mulelao-1
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/mulelao-1/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/mulelao-1/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/mulelao-1/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/mulelao-1/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/nokhchi-1/Makefile.in b/libX11/nls/nokhchi-1/Makefile.in
index 915fb7b81..fc03ef83a 100644
--- a/libX11/nls/nokhchi-1/Makefile.in
+++ b/libX11/nls/nokhchi-1/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/nokhchi-1
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/nokhchi-1/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/nokhchi-1/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/nokhchi-1/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/nokhchi-1/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/pt_BR.UTF-8/Compose.pre b/libX11/nls/pt_BR.UTF-8/Compose.pre
index ae785424d..5c12af383 100644
--- a/libX11/nls/pt_BR.UTF-8/Compose.pre
+++ b/libX11/nls/pt_BR.UTF-8/Compose.pre
@@ -451,18 +451,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <underscore> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
 <dead_circumflex> <Multi_key> <underbar> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
 <Multi_key> <asciicircum> <underbar> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
+<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
 <dead_grave> <A>	: "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
 <Multi_key> <grave> <A>	: "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
-<combining_grave> <A>	: "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
 <dead_acute> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 <Multi_key> <acute> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 <Multi_key> <apostrophe> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
-<combining_acute> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 <dead_circumflex> <A>	: "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <A>	: "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 <dead_tilde> <A>	: "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
 <Multi_key> <asciitilde> <A>	: "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
-<combining_tilde> <A>	: "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
 <dead_diaeresis> <A>	: "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
 <Multi_key> <quotedbl> <A>	: "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
 <dead_abovering> <A>	: "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
@@ -472,52 +472,42 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <cedilla> <C>	: "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
 <dead_grave> <E>	: "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
 <Multi_key> <grave> <E>	: "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
-<combining_grave> <E>	: "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
 <dead_acute> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 <Multi_key> <acute> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 <Multi_key> <apostrophe> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
-<combining_acute> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 <dead_circumflex> <E>	: "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <E>	: "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 <dead_diaeresis> <E>	: "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
 <Multi_key> <quotedbl> <E>	: "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
 <dead_grave> <I>	: "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
 <Multi_key> <grave> <I>	: "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
-<combining_grave> <I>	: "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
 <dead_acute> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 <Multi_key> <acute> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 <Multi_key> <apostrophe> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
-<combining_acute> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 <dead_circumflex> <I>	: "Î" Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <I>	: "Î" Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 <dead_diaeresis> <I>	: "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
 <Multi_key> <quotedbl> <I>	: "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
 <dead_tilde> <N>	: "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
 <Multi_key> <asciitilde> <N>	: "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
-<combining_tilde> <N>	: "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
 <dead_grave> <O>	: "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
 <Multi_key> <grave> <O>	: "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
-<combining_grave> <O>	: "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
 <dead_acute> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 <Multi_key> <acute> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 <Multi_key> <apostrophe> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
-<combining_acute> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 <dead_circumflex> <O>	: "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <O>	: "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 <dead_tilde> <O>	: "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
 <Multi_key> <asciitilde> <O>	: "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
-<combining_tilde> <O>	: "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
 <dead_diaeresis> <O>	: "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
 <Multi_key> <quotedbl> <O>	: "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
 <Multi_key> <slash> <O>	: "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
 <Multi_key> <KP_Divide> <O>	: "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
 <dead_grave> <U>	: "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
 <Multi_key> <grave> <U>	: "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
-<combining_grave> <U>	: "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
 <dead_acute> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 <Multi_key> <acute> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 <Multi_key> <apostrophe> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
-<combining_acute> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 <dead_circumflex> <U>	: "Û" Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <U>	: "Û" Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 <dead_diaeresis> <U>	: "Ü" Udiaeresis # LATIN CAPITAL LETTER U WITH DIAERESIS
@@ -525,19 +515,15 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 <Multi_key> <acute> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 <Multi_key> <apostrophe> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
-<combining_acute> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 <dead_grave> <a>	: "à" agrave # LATIN SMALL LETTER A WITH GRAVE
 <Multi_key> <grave> <a>	: "à" agrave # LATIN SMALL LETTER A WITH GRAVE
-<combining_grave> <a>	: "à" agrave # LATIN SMALL LETTER A WITH GRAVE
 <dead_acute> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
 <Multi_key> <acute> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
 <Multi_key> <apostrophe> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
-<combining_acute> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
 <dead_circumflex> <a>	: "â" acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <a>	: "â" acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
 <dead_tilde> <a>	: "ã" atilde # LATIN SMALL LETTER A WITH TILDE
 <Multi_key> <asciitilde> <a>	: "ã" atilde # LATIN SMALL LETTER A WITH TILDE
-<combining_tilde> <a>	: "ã" atilde # LATIN SMALL LETTER A WITH TILDE
 <dead_diaeresis> <a>	: "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
 <Multi_key> <quotedbl> <a>	: "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
 <dead_abovering> <a>	: "å" aring # LATIN SMALL LETTER A WITH RING ABOVE
@@ -547,52 +533,42 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <cedilla> <c>	: "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
 <dead_grave> <e>	: "è" egrave # LATIN SMALL LETTER E WITH GRAVE
 <Multi_key> <grave> <e>	: "è" egrave # LATIN SMALL LETTER E WITH GRAVE
-<combining_grave> <e>	: "è" egrave # LATIN SMALL LETTER E WITH GRAVE
 <dead_acute> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
 <Multi_key> <acute> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
 <Multi_key> <apostrophe> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
-<combining_acute> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
 <dead_circumflex> <e>	: "ê" ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <e>	: "ê" ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
 <dead_diaeresis> <e>	: "ë" ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
 <Multi_key> <quotedbl> <e>	: "ë" ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
 <dead_grave> <i>	: "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
 <Multi_key> <grave> <i>	: "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
-<combining_grave> <i>	: "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
 <dead_acute> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
 <Multi_key> <acute> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
 <Multi_key> <apostrophe> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
-<combining_acute> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
 <dead_circumflex> <i>	: "î" icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <i>	: "î" icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
 <dead_diaeresis> <i>	: "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
 <Multi_key> <quotedbl> <i>	: "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
 <dead_tilde> <n>	: "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
 <Multi_key> <asciitilde> <n>	: "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
-<combining_tilde> <n>	: "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
 <dead_grave> <o>	: "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
 <Multi_key> <grave> <o>	: "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
-<combining_grave> <o>	: "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
 <dead_acute> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
 <Multi_key> <acute> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
 <Multi_key> <apostrophe> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
-<combining_acute> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
 <dead_circumflex> <o>	: "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <o>	: "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
 <dead_tilde> <o>	: "õ" otilde # LATIN SMALL LETTER O WITH TILDE
 <Multi_key> <asciitilde> <o>	: "õ" otilde # LATIN SMALL LETTER O WITH TILDE
-<combining_tilde> <o>	: "õ" otilde # LATIN SMALL LETTER O WITH TILDE
 <dead_diaeresis> <o>	: "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
 <Multi_key> <quotedbl> <o>	: "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
 <Multi_key> <slash> <o>	: "ø" oslash # LATIN SMALL LETTER O WITH STROKE
 <Multi_key> <KP_Divide> <o>	: "ø" oslash # LATIN SMALL LETTER O WITH STROKE
 <dead_grave> <u>	: "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
 <Multi_key> <grave> <u>	: "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
-<combining_grave> <u>	: "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
 <dead_acute> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
 <Multi_key> <acute> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
 <Multi_key> <apostrophe> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
-<combining_acute> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
 <dead_circumflex> <u>	: "û" ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <u>	: "û" ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
 <dead_diaeresis> <u>	: "ü" udiaeresis # LATIN SMALL LETTER U WITH DIAERESIS
@@ -600,7 +576,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
 <Multi_key> <acute> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
 <Multi_key> <apostrophe> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
-<combining_acute> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
 <dead_diaeresis> <y>	: "ÿ" ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
 <Multi_key> <quotedbl> <y>	: "ÿ" ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
 <dead_macron> <A>	: "Ā" U0100 # LATIN CAPITAL LETTER A WITH MACRON
@@ -619,14 +594,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <semicolon> <A>	: "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
 <dead_ogonek> <a>	: "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
 <Multi_key> <semicolon> <a>	: "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
-<dead_acute> <C>	: "Ç" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
+<dead_acute> <C>	: "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
 <Multi_key> <acute> <C>	: "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
 <Multi_key> <apostrophe> <C>	: "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-<combining_acute> <C>	: "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
-<dead_acute> <c>	: "ç" U0107 # LATIN SMALL LETTER C WITH ACUTE
+<dead_acute> <c>	: "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
 <Multi_key> <acute> <c>	: "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
 <Multi_key> <apostrophe> <c>	: "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
-<combining_acute> <c>	: "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
 <dead_circumflex> <C>	: "Ĉ" U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <C>	: "Ĉ" U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 <dead_circumflex> <c>	: "ĉ" U0109 # LATIN SMALL LETTER C WITH CIRCUMFLEX
@@ -701,10 +674,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <KP_Divide> <h>	: "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
 <dead_tilde> <I>	: "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
 <Multi_key> <asciitilde> <I>	: "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
-<combining_tilde> <I>	: "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
 <dead_tilde> <i>	: "ĩ" U0129 # LATIN SMALL LETTER I WITH TILDE
 <Multi_key> <asciitilde> <i>	: "ĩ" U0129 # LATIN SMALL LETTER I WITH TILDE
-<combining_tilde> <i>	: "ĩ" U0129 # LATIN SMALL LETTER I WITH TILDE
 <dead_macron> <I>	: "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
 <Multi_key> <macron> <I>	: "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
 <Multi_key> <underscore> <I>	: "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
@@ -736,11 +707,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <L>	: "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 <Multi_key> <acute> <L>	: "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 <Multi_key> <apostrophe> <L>	: "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
-<combining_acute> <L>	: "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 <dead_acute> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
 <Multi_key> <acute> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
 <Multi_key> <apostrophe> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
-<combining_acute> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
 <dead_cedilla> <L>	: "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
 <Multi_key> <comma> <L>	: "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
 <Multi_key> <cedilla> <L>	: "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
@@ -758,11 +727,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 <Multi_key> <acute> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 <Multi_key> <apostrophe> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
-<combining_acute> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 <dead_acute> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
 <Multi_key> <acute> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
 <Multi_key> <apostrophe> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
-<combining_acute> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
 <dead_cedilla> <N>	: "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
 <Multi_key> <comma> <N>	: "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
 <Multi_key> <cedilla> <N>	: "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
@@ -792,11 +759,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 <Multi_key> <acute> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 <Multi_key> <apostrophe> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
-<combining_acute> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 <dead_acute> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
 <Multi_key> <acute> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
 <Multi_key> <apostrophe> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
-<combining_acute> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
 <dead_cedilla> <R>	: "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
 <Multi_key> <comma> <R>	: "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
 <Multi_key> <cedilla> <R>	: "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
@@ -810,11 +775,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
 <Multi_key> <acute> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
 <Multi_key> <apostrophe> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
-<combining_acute> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
 <dead_acute> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
 <Multi_key> <acute> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
 <Multi_key> <apostrophe> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
-<combining_acute> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
 <dead_circumflex> <S>	: "Ŝ" U015C # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 <Multi_key> <asciicircum> <S>	: "Ŝ" U015C # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 <dead_circumflex> <s>	: "ŝ" U015D # LATIN SMALL LETTER S WITH CIRCUMFLEX
@@ -845,10 +808,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <KP_Divide> <t>	: "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
 <dead_tilde> <U>	: "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
 <Multi_key> <asciitilde> <U>	: "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
-<combining_tilde> <U>	: "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
 <dead_tilde> <u>	: "ũ" U0169 # LATIN SMALL LETTER U WITH TILDE
 <Multi_key> <asciitilde> <u>	: "ũ" U0169 # LATIN SMALL LETTER U WITH TILDE
-<combining_tilde> <u>	: "ũ" U0169 # LATIN SMALL LETTER U WITH TILDE
 <dead_macron> <U>	: "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
 <Multi_key> <macron> <U>	: "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
 <Multi_key> <underscore> <U>	: "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
@@ -886,11 +847,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 <Multi_key> <acute> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 <Multi_key> <apostrophe> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
-<combining_acute> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 <dead_acute> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
 <Multi_key> <acute> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
 <Multi_key> <apostrophe> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
-<combining_acute> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
 <dead_abovedot> <Z>	: "Ż" U017B # LATIN CAPITAL LETTER Z WITH DOT ABOVE
 <Multi_key> <period> <Z>	: "Ż" U017B # LATIN CAPITAL LETTER Z WITH DOT ABOVE
 <dead_abovedot> <z>	: "ż" U017C # LATIN SMALL LETTER Z WITH DOT ABOVE
@@ -958,9 +917,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <quotedbl> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <Udiaeresis>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
@@ -970,9 +926,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <quotedbl> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <dead_caron> <Udiaeresis>	: "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <Multi_key> <c> <Udiaeresis>	: "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <dead_diaeresis> <U>	: "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
@@ -991,18 +944,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_grave> <Multi_key> <quotedbl> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <dead_diaeresis> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <quotedbl> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <Udiaeresis>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <dead_diaeresis> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <Multi_key> <quotedbl> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <udiaeresis>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <udiaeresis>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <dead_diaeresis> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_grave> <Multi_key> <quotedbl> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <dead_diaeresis> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <Multi_key> <grave> <quotedbl> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <udiaeresis>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <dead_diaeresis> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <Multi_key> <quotedbl> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 <dead_macron> <Adiaeresis>	: "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
 <Multi_key> <macron> <Adiaeresis>	: "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
 <Multi_key> <underscore> <Adiaeresis>	: "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
@@ -1088,17 +1035,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 <Multi_key> <acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 <Multi_key> <apostrophe> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
-<combining_acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 <dead_acute> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
 <Multi_key> <acute> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
 <Multi_key> <apostrophe> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
-<combining_acute> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
 <dead_grave> <N>	: "Ǹ" U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
 <Multi_key> <grave> <N>	: "Ǹ" U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
-<combining_grave> <N>	: "Ǹ" U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
 <dead_grave> <n>	: "ǹ" U01F9 # LATIN SMALL LETTER N WITH GRAVE
 <Multi_key> <grave> <n>	: "ǹ" U01F9 # LATIN SMALL LETTER N WITH GRAVE
-<combining_grave> <n>	: "ǹ" U01F9 # LATIN SMALL LETTER N WITH GRAVE
 <dead_acute> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <acute> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
@@ -1108,9 +1051,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <o> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <dead_abovering> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <o> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <dead_abovering> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <Multi_key> <o> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <dead_acute> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <acute> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
@@ -1120,17 +1060,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <dead_abovering> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <Multi_key> <apostrophe> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <dead_abovering> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<combining_acute> <Multi_key> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 <dead_acute> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 <Multi_key> <acute> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 <Multi_key> <apostrophe> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
-<combining_acute> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 <dead_acute> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
 <Multi_key> <acute> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
 <Multi_key> <apostrophe> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
-<combining_acute> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
 <dead_acute> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
@@ -1140,9 +1075,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <Multi_key> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <slash> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 <dead_acute> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
@@ -1152,37 +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
-<combining_acute> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <slash> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<combining_acute> <Multi_key> <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
@@ -1224,9 +1153,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <macron> <asciitilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <dead_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <asciitilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<dead_macron> <combining_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<Multi_key> <macron> <combining_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<Multi_key> <underscore> <combining_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <dead_macron> <otilde>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <macron> <otilde>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <otilde>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
@@ -1236,9 +1162,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <macron> <asciitilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <dead_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <Multi_key> <underscore> <asciitilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
-<dead_macron> <combining_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
-<Multi_key> <macron> <combining_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
-<Multi_key> <underscore> <combining_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_abovedot> <O>	: "Ȯ" U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 <Multi_key> <period> <O>	: "Ȯ" U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 <dead_abovedot> <o>	: "ȯ" U022F # LATIN SMALL LETTER O WITH DOT ABOVE
@@ -1332,39 +1255,30 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <quotedbl> <dead_acute>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
 <Multi_key> <quotedbl> <acute>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
 <Multi_key> <quotedbl> <apostrophe>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
-<Multi_key> <quotedbl> <combining_acute>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
 <Multi_key> <diaeresis> <dead_acute>	: "΅" U0385 # GREEK DIALYTIKA TONOS
 <Multi_key> <diaeresis> <acute>	: "΅" U0385 # GREEK DIALYTIKA TONOS
 <Multi_key> <diaeresis> <apostrophe>	: "΅" U0385 # GREEK DIALYTIKA TONOS
-<Multi_key> <diaeresis> <combining_acute>	: "΅" U0385 # GREEK DIALYTIKA TONOS
 <dead_acute> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 <Multi_key> <acute> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 <Multi_key> <apostrophe> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
-<combining_acute> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 <dead_acute> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 <Multi_key> <acute> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
-<combining_acute> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 <dead_acute> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 <Multi_key> <acute> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 <Multi_key> <apostrophe> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
-<combining_acute> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 <dead_acute> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 <Multi_key> <acute> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 <Multi_key> <apostrophe> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
-<combining_acute> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 <dead_acute> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 <Multi_key> <acute> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 <Multi_key> <apostrophe> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
-<combining_acute> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 <dead_acute> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 <Multi_key> <acute> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
-<combining_acute> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 <dead_acute> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 <Multi_key> <acute> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 <Multi_key> <apostrophe> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
-<combining_acute> <Greek_OMEGA>	: "Ώ" 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
@@ -1374,9 +1288,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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
-<combining_acute> <Greek_iotadieresis>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<combining_acute> <dead_diaeresis> <Greek_iota>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-<combining_acute> <Multi_key> <quotedbl> <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
 <dead_diaeresis> <Greek_UPSILON>	: "Ϋ" U03AB # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
@@ -1384,19 +1295,15 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 <Multi_key> <acute> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 <Multi_key> <apostrophe> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
-<combining_acute> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 <dead_acute> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 <Multi_key> <acute> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
-<combining_acute> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 <dead_acute> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
 <Multi_key> <acute> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
 <Multi_key> <apostrophe> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
-<combining_acute> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
 <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
-<combining_acute> <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
@@ -1406,9 +1313,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <quotedbl> <Greek_upsilon>	: "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
 <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
-<combining_acute> <Greek_upsilondieresis>	: "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<combining_acute> <dead_diaeresis> <Greek_upsilon>	: "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-<combining_acute> <Multi_key> <quotedbl> <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
 <dead_diaeresis> <Greek_upsilon>	: "ϋ" U03CB # GREEK SMALL LETTER UPSILON WITH DIALYTIKA
@@ -1416,36 +1320,29 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_acute> <Greek_omicron>	: "ό" U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
 <Multi_key> <acute> <Greek_omicron>	: "ό" U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
 <Multi_key> <apostrophe> <Greek_omicron>	: "ό" U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
-<combining_acute> <Greek_omicron>	: "ό" U03CC # GREEK SMALL LETTER OMICRON WITH TONOS
 <dead_acute> <Greek_upsilon>	: "ύ" U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
 <Multi_key> <acute> <Greek_upsilon>	: "ύ" U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
 <Multi_key> <apostrophe> <Greek_upsilon>	: "ύ" U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
-<combining_acute> <Greek_upsilon>	: "ύ" U03CD # GREEK SMALL LETTER UPSILON WITH TONOS
 <dead_acute> <Greek_omega>	: "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
 <Multi_key> <acute> <Greek_omega>	: "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
 <Multi_key> <apostrophe> <Greek_omega>	: "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
-<combining_acute> <Greek_omega>	: "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
 <Multi_key> <acute> <U03d2>	: "ϓ" U03D3 # GREEK UPSILON WITH ACUTE AND HOOK SYMBOL
 <Multi_key> <apostrophe> <U03d2>	: "ϓ" U03D3 # GREEK UPSILON WITH ACUTE AND HOOK SYMBOL
 <Multi_key> <quotedbl> <U03d2>	: "ϔ" U03D4 # GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
 <dead_grave> <Cyrillic_IE>	: "Ѐ" U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
 <Multi_key> <grave> <Cyrillic_IE>	: "Ѐ" U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
-<combining_grave> <Cyrillic_IE>	: "Ѐ" U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
 <dead_diaeresis> <Cyrillic_IE>	: "Ё" U0401 # CYRILLIC CAPITAL LETTER IO
 <Multi_key> <quotedbl> <Cyrillic_IE>	: "Ё" U0401 # CYRILLIC CAPITAL LETTER IO
 <dead_acute> <Cyrillic_GHE>	: "Ѓ" U0403 # CYRILLIC CAPITAL LETTER GJE
 <Multi_key> <acute> <Cyrillic_GHE>	: "Ѓ" U0403 # CYRILLIC CAPITAL LETTER GJE
 <Multi_key> <apostrophe> <Cyrillic_GHE>	: "Ѓ" U0403 # CYRILLIC CAPITAL LETTER GJE
-<combining_acute> <Cyrillic_GHE>	: "Ѓ" U0403 # CYRILLIC CAPITAL LETTER GJE
 <dead_diaeresis> <Ukrainian_I>	: "Ї" U0407 # CYRILLIC CAPITAL LETTER YI
 <Multi_key> <quotedbl> <Ukrainian_I>	: "Ї" U0407 # CYRILLIC CAPITAL LETTER YI
 <dead_acute> <Cyrillic_KA>	: "Ќ" U040C # CYRILLIC CAPITAL LETTER KJE
 <Multi_key> <acute> <Cyrillic_KA>	: "Ќ" U040C # CYRILLIC CAPITAL LETTER KJE
 <Multi_key> <apostrophe> <Cyrillic_KA>	: "Ќ" U040C # CYRILLIC CAPITAL LETTER KJE
-<combining_acute> <Cyrillic_KA>	: "Ќ" U040C # CYRILLIC CAPITAL LETTER KJE
 <dead_grave> <Cyrillic_I>	: "Ѝ" U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
 <Multi_key> <grave> <Cyrillic_I>	: "Ѝ" U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
-<combining_grave> <Cyrillic_I>	: "Ѝ" U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
 <dead_breve> <Cyrillic_U>	: "Ў" U040E # CYRILLIC CAPITAL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_U>	: "Ў" U040E # CYRILLIC CAPITAL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_U>	: "Ў" U040E # CYRILLIC CAPITAL LETTER SHORT U
@@ -1457,27 +1354,23 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <b> <Cyrillic_i>	: "й" U0439 # CYRILLIC SMALL LETTER SHORT I
 <dead_grave> <Cyrillic_ie>	: "ѐ" U0450 # CYRILLIC SMALL LETTER IE WITH GRAVE
 <Multi_key> <grave> <Cyrillic_ie>	: "ѐ" U0450 # CYRILLIC SMALL LETTER IE WITH GRAVE
-<combining_grave> <Cyrillic_ie>	: "ѐ" U0450 # CYRILLIC SMALL LETTER IE WITH GRAVE
 <dead_diaeresis> <Cyrillic_ie>	: "ё" U0451 # CYRILLIC SMALL LETTER IO
 <Multi_key> <quotedbl> <Cyrillic_ie>	: "ё" U0451 # CYRILLIC SMALL LETTER IO
 <dead_acute> <Cyrillic_ghe>	: "ѓ" U0453 # CYRILLIC SMALL LETTER GJE
 <Multi_key> <acute> <Cyrillic_ghe>	: "ѓ" U0453 # CYRILLIC SMALL LETTER GJE
 <Multi_key> <apostrophe> <Cyrillic_ghe>	: "ѓ" U0453 # CYRILLIC SMALL LETTER GJE
-<combining_acute> <Cyrillic_ghe>	: "ѓ" U0453 # CYRILLIC SMALL LETTER GJE
 <dead_diaeresis> <Ukrainian_i>	: "ї" U0457 # CYRILLIC SMALL LETTER YI
 <Multi_key> <quotedbl> <Ukrainian_i>	: "ї" U0457 # CYRILLIC SMALL LETTER YI
 <dead_acute> <Cyrillic_ka>	: "ќ" U045C # CYRILLIC SMALL LETTER KJE
 <Multi_key> <acute> <Cyrillic_ka>	: "ќ" U045C # CYRILLIC SMALL LETTER KJE
 <Multi_key> <apostrophe> <Cyrillic_ka>	: "ќ" U045C # CYRILLIC SMALL LETTER KJE
-<combining_acute> <Cyrillic_ka>	: "ќ" U045C # CYRILLIC SMALL LETTER KJE
 <dead_grave> <Cyrillic_i>	: "ѝ" U045D # CYRILLIC SMALL LETTER I WITH GRAVE
 <Multi_key> <grave> <Cyrillic_i>	: "ѝ" U045D # CYRILLIC SMALL LETTER I WITH GRAVE
-<combining_grave> <Cyrillic_i>	: "ѝ" U045D # CYRILLIC SMALL LETTER I WITH GRAVE
 <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
@@ -1640,20 +1533,18 @@ 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
 <Multi_key> <period> <b>	: "ḃ" U1E03 # LATIN SMALL LETTER B WITH DOT ABOVE
 <dead_belowdot> <B>	: "Ḅ" U1E04 # LATIN CAPITAL LETTER B WITH DOT BELOW
 <Multi_key> <exclam> <B>	: "Ḅ" U1E04 # LATIN CAPITAL LETTER B WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <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
@@ -1666,10 +1557,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_cedilla> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <comma> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <cedilla> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Ccedilla>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <dead_cedilla> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <comma> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <cedilla> <C>	: "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <dead_acute> <ccedilla>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <acute> <ccedilla>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <ccedilla>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
@@ -1682,30 +1569,24 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_cedilla> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <comma> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <Multi_key> <apostrophe> <cedilla> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <ccedilla>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <dead_cedilla> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <comma> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <cedilla> <c>	: "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <dead_abovedot> <D>	: "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
 <Multi_key> <period> <D>	: "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
 <dead_abovedot> <d>	: "ḋ" U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
 <Multi_key> <period> <d>	: "ḋ" U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
 <dead_belowdot> <D>	: "Ḍ" U1E0C # LATIN CAPITAL LETTER D WITH DOT BELOW
 <Multi_key> <exclam> <D>	: "Ḍ" U1E0C # LATIN CAPITAL LETTER D WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <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
@@ -1714,10 +1595,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <grave> <dead_macron> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Emacron>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <E>	: "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
 <dead_grave> <emacron>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <emacron>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
@@ -1726,10 +1603,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <grave> <dead_macron> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <emacron>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <e>	: "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <dead_acute> <Emacron>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <acute> <Emacron>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <Emacron>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
@@ -1742,10 +1615,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_macron> <E>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <E>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <E>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Emacron>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <E>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <E>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <E>	: "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
 <dead_acute> <emacron>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <acute> <emacron>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <emacron>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
@@ -1758,14 +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
-<combining_acute> <emacron>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <e>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <e>	: "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <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
@@ -1806,10 +1671,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <period> <h>	: "ḣ" U1E23 # LATIN SMALL LETTER H WITH DOT ABOVE
 <dead_belowdot> <H>	: "Ḥ" U1E24 # LATIN CAPITAL LETTER H WITH DOT BELOW
 <Multi_key> <exclam> <H>	: "Ḥ" U1E24 # LATIN CAPITAL LETTER H WITH DOT BELOW
-<combining_belowdot> <H>	: "Ḥ" U1E24 # LATIN CAPITAL LETTER H WITH DOT BELOW
 <dead_belowdot> <h>	: "ḥ" U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
 <Multi_key> <exclam> <h>	: "ḥ" U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
-<combining_belowdot> <h>	: "ḥ" U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
 <dead_diaeresis> <H>	: "Ḧ" U1E26 # LATIN CAPITAL LETTER H WITH DIAERESIS
 <Multi_key> <quotedbl> <H>	: "Ḧ" U1E26 # LATIN CAPITAL LETTER H WITH DIAERESIS
 <dead_diaeresis> <h>	: "ḧ" U1E27 # LATIN SMALL LETTER H WITH DIAERESIS
@@ -1820,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
@@ -1833,9 +1696,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <quotedbl> <I>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <I>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <I>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <Idiaeresis>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <I>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <I>	: "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <dead_acute> <idiaeresis>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <acute> <idiaeresis>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <idiaeresis>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
@@ -1845,31 +1705,22 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <quotedbl> <i>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <dead_diaeresis> <i>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <Multi_key> <apostrophe> <quotedbl> <i>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <idiaeresis>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <dead_diaeresis> <i>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<combining_acute> <Multi_key> <quotedbl> <i>	: "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
 <dead_acute> <K>	: "Ḱ" U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
 <Multi_key> <acute> <K>	: "Ḱ" U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
 <Multi_key> <apostrophe> <K>	: "Ḱ" U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
-<combining_acute> <K>	: "Ḱ" U1E30 # LATIN CAPITAL LETTER K WITH ACUTE
 <dead_acute> <k>	: "ḱ" U1E31 # LATIN SMALL LETTER K WITH ACUTE
 <Multi_key> <acute> <k>	: "ḱ" U1E31 # LATIN SMALL LETTER K WITH ACUTE
 <Multi_key> <apostrophe> <k>	: "ḱ" U1E31 # LATIN SMALL LETTER K WITH ACUTE
-<combining_acute> <k>	: "ḱ" U1E31 # LATIN SMALL LETTER K WITH ACUTE
 <dead_belowdot> <K>	: "Ḳ" U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
 <Multi_key> <exclam> <K>	: "Ḳ" U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <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
-<combining_belowdot> <L>	: "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
 <dead_belowdot> <l>	: "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
 <Multi_key> <exclam> <l>	: "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
-<combining_belowdot> <l>	: "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
 <dead_macron> <U1e36>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1e36>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1e36>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
@@ -1879,9 +1730,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <macron> <exclam> <L>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <dead_belowdot> <L>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <exclam> <L>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<dead_macron> <combining_belowdot> <L>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <L>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <L>	: "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
 <dead_macron> <U1e37>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1e37>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1e37>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
@@ -1891,45 +1739,36 @@ 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
-<dead_macron> <combining_belowdot> <l>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <l>	: "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <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
-<combining_acute> <M>	: "Ḿ" U1E3E # LATIN CAPITAL LETTER M WITH ACUTE
 <dead_acute> <m>	: "ḿ" U1E3F # LATIN SMALL LETTER M WITH ACUTE
 <Multi_key> <acute> <m>	: "ḿ" U1E3F # LATIN SMALL LETTER M WITH ACUTE
 <Multi_key> <apostrophe> <m>	: "ḿ" U1E3F # LATIN SMALL LETTER M WITH ACUTE
-<combining_acute> <m>	: "ḿ" U1E3F # LATIN SMALL LETTER M WITH ACUTE
 <dead_abovedot> <M>	: "Ṁ" U1E40 # LATIN CAPITAL LETTER M WITH DOT ABOVE
 <Multi_key> <period> <M>	: "Ṁ" U1E40 # LATIN CAPITAL LETTER M WITH DOT ABOVE
 <dead_abovedot> <m>	: "ṁ" U1E41 # LATIN SMALL LETTER M WITH DOT ABOVE
 <Multi_key> <period> <m>	: "ṁ" U1E41 # LATIN SMALL LETTER M WITH DOT ABOVE
 <dead_belowdot> <M>	: "Ṃ" U1E42 # LATIN CAPITAL LETTER M WITH DOT BELOW
 <Multi_key> <exclam> <M>	: "Ṃ" U1E42 # LATIN CAPITAL LETTER M WITH DOT BELOW
-<combining_belowdot> <M>	: "Ṃ" U1E42 # LATIN CAPITAL LETTER M WITH DOT BELOW
 <dead_belowdot> <m>	: "ṃ" U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
 <Multi_key> <exclam> <m>	: "ṃ" U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
-<combining_belowdot> <m>	: "ṃ" U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
 <dead_abovedot> <N>	: "Ṅ" U1E44 # LATIN CAPITAL LETTER N WITH DOT ABOVE
 <Multi_key> <period> <N>	: "Ṅ" U1E44 # LATIN CAPITAL LETTER N WITH DOT ABOVE
 <dead_abovedot> <n>	: "ṅ" U1E45 # LATIN SMALL LETTER N WITH DOT ABOVE
 <Multi_key> <period> <n>	: "ṅ" U1E45 # LATIN SMALL LETTER N WITH DOT ABOVE
 <dead_belowdot> <N>	: "Ṇ" U1E46 # LATIN CAPITAL LETTER N WITH DOT BELOW
 <Multi_key> <exclam> <N>	: "Ṇ" U1E46 # LATIN CAPITAL LETTER N WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <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
@@ -1939,13 +1778,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciitilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <Otilde>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <O>	: "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <dead_acute> <otilde>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <acute> <otilde>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <otilde>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
@@ -1955,29 +1787,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciitilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <otilde>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <o>	: "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <dead_diaeresis> <Otilde>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <Otilde>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <dead_tilde> <O>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <Multi_key> <asciitilde> <O>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <dead_tilde> <O>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <asciitilde> <O>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_diaeresis> <combining_tilde> <O>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<Multi_key> <quotedbl> <combining_tilde> <O>	: "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <otilde>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <otilde>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <dead_tilde> <o>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <dead_diaeresis> <Multi_key> <asciitilde> <o>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <dead_tilde> <o>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <Multi_key> <quotedbl> <asciitilde> <o>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_diaeresis> <combining_tilde> <o>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<Multi_key> <quotedbl> <combining_tilde> <o>	: "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
 <dead_grave> <Omacron>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <Omacron>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
@@ -1986,10 +1807,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <grave> <dead_macron> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Omacron>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <O>	: "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
 <dead_grave> <omacron>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <omacron>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <dead_grave> <dead_macron> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
@@ -1998,10 +1815,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <grave> <dead_macron> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <macron> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <Multi_key> <grave> <underscore> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <omacron>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <dead_macron> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <macron> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<combining_grave> <Multi_key> <underscore> <o>	: "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
 <dead_acute> <Omacron>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <acute> <Omacron>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <Omacron>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
@@ -2014,10 +1827,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_macron> <O>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <O>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <O>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Omacron>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <O>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <O>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <O>	: "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
 <dead_acute> <omacron>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <acute> <omacron>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <omacron>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
@@ -2030,18 +1839,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_macron> <o>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <macron> <o>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <Multi_key> <apostrophe> <underscore> <o>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <omacron>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <dead_macron> <o>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <macron> <o>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<combining_acute> <Multi_key> <underscore> <o>	: "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
 <dead_acute> <P>	: "Ṕ" U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
 <Multi_key> <acute> <P>	: "Ṕ" U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
 <Multi_key> <apostrophe> <P>	: "Ṕ" U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
-<combining_acute> <P>	: "Ṕ" U1E54 # LATIN CAPITAL LETTER P WITH ACUTE
 <dead_acute> <p>	: "ṕ" U1E55 # LATIN SMALL LETTER P WITH ACUTE
 <Multi_key> <acute> <p>	: "ṕ" U1E55 # LATIN SMALL LETTER P WITH ACUTE
 <Multi_key> <apostrophe> <p>	: "ṕ" U1E55 # LATIN SMALL LETTER P WITH ACUTE
-<combining_acute> <p>	: "ṕ" U1E55 # LATIN SMALL LETTER P WITH ACUTE
 <dead_abovedot> <P>	: "Ṗ" U1E56 # LATIN CAPITAL LETTER P WITH DOT ABOVE
 <Multi_key> <period> <P>	: "Ṗ" U1E56 # LATIN CAPITAL LETTER P WITH DOT ABOVE
 <dead_abovedot> <p>	: "ṗ" U1E57 # LATIN SMALL LETTER P WITH DOT ABOVE
@@ -2052,10 +1855,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <period> <r>	: "ṙ" U1E59 # LATIN SMALL LETTER R WITH DOT ABOVE
 <dead_belowdot> <R>	: "Ṛ" U1E5A # LATIN CAPITAL LETTER R WITH DOT BELOW
 <Multi_key> <exclam> <R>	: "Ṛ" U1E5A # LATIN CAPITAL LETTER R WITH DOT BELOW
-<combining_belowdot> <R>	: "Ṛ" U1E5A # LATIN CAPITAL LETTER R WITH DOT BELOW
 <dead_belowdot> <r>	: "ṛ" U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
 <Multi_key> <exclam> <r>	: "ṛ" U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
-<combining_belowdot> <r>	: "ṛ" U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
 <dead_macron> <U1e5a>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1e5a>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1e5a>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
@@ -2065,9 +1866,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <macron> <exclam> <R>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <dead_belowdot> <R>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <exclam> <R>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<dead_macron> <combining_belowdot> <R>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <R>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <R>	: "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
 <dead_macron> <U1e5b>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <macron> <U1e5b>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
 <Multi_key> <underscore> <U1e5b>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
@@ -2077,21 +1875,16 @@ 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
-<dead_macron> <combining_belowdot> <r>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <combining_belowdot> <r>	: "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <combining_belowdot> <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
 <Multi_key> <period> <s>	: "ṡ" U1E61 # LATIN SMALL LETTER S WITH DOT ABOVE
 <dead_belowdot> <S>	: "Ṣ" U1E62 # LATIN CAPITAL LETTER S WITH DOT BELOW
 <Multi_key> <exclam> <S>	: "Ṣ" U1E62 # LATIN CAPITAL LETTER S WITH DOT BELOW
-<combining_belowdot> <S>	: "Ṣ" U1E62 # LATIN CAPITAL LETTER S WITH DOT BELOW
 <dead_belowdot> <s>	: "ṣ" U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
 <Multi_key> <exclam> <s>	: "ṣ" U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
-<combining_belowdot> <s>	: "ṣ" U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
 <dead_abovedot> <Sacute>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <Sacute>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <dead_acute> <S>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
@@ -2100,8 +1893,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <period> <dead_acute> <S>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <acute> <S>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <apostrophe> <S>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_abovedot> <combining_acute> <S>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<Multi_key> <period> <combining_acute> <S>	: "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <sacute>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <sacute>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <dead_acute> <s>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
@@ -2110,8 +1901,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <period> <dead_acute> <s>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <acute> <s>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <Multi_key> <period> <apostrophe> <s>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_abovedot> <combining_acute> <s>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-<Multi_key> <period> <combining_acute> <s>	: "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_abovedot> <Scaron>	: "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
 <Multi_key> <period> <Scaron>	: "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
 <dead_abovedot> <dead_caron> <S>	: "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
@@ -2130,36 +1919,30 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_abovedot> <Multi_key> <exclam> <S>	: "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <dead_belowdot> <S>	: "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <exclam> <S>	: "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_abovedot> <combining_belowdot> <S>	: "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<Multi_key> <period> <combining_belowdot> <S>	: "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <U1e63>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <U1e63>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <dead_belowdot> <s>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <Multi_key> <exclam> <s>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <dead_belowdot> <s>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <Multi_key> <period> <exclam> <s>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_abovedot> <combining_belowdot> <s>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<Multi_key> <period> <combining_belowdot> <s>	: "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_abovedot> <T>	: "Ṫ" U1E6A # LATIN CAPITAL LETTER T WITH DOT ABOVE
 <Multi_key> <period> <T>	: "Ṫ" U1E6A # LATIN CAPITAL LETTER T WITH DOT ABOVE
 <dead_abovedot> <t>	: "ṫ" U1E6B # LATIN SMALL LETTER T WITH DOT ABOVE
 <Multi_key> <period> <t>	: "ṫ" U1E6B # LATIN SMALL LETTER T WITH DOT ABOVE
 <dead_belowdot> <T>	: "Ṭ" U1E6C # LATIN CAPITAL LETTER T WITH DOT BELOW
 <Multi_key> <exclam> <T>	: "Ṭ" U1E6C # LATIN CAPITAL LETTER T WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <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
@@ -2169,13 +1952,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciitilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <Utilde>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <U>	: "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <dead_acute> <utilde>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <acute> <utilde>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <utilde>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
@@ -2185,13 +1961,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciitilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <dead_tilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <Multi_key> <apostrophe> <asciitilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<dead_acute> <combining_tilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <acute> <combining_tilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<Multi_key> <apostrophe> <combining_tilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <utilde>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <dead_tilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <Multi_key> <asciitilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<combining_acute> <combining_tilde> <u>	: "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <dead_diaeresis> <Umacron>	: "Ṻ" U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
 <Multi_key> <quotedbl> <Umacron>	: "Ṻ" U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
 <dead_diaeresis> <dead_macron> <U>	: "Ṻ" U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
@@ -2210,30 +1979,22 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <quotedbl> <underscore> <u>	: "ṻ" U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
 <dead_tilde> <V>	: "Ṽ" U1E7C # LATIN CAPITAL LETTER V WITH TILDE
 <Multi_key> <asciitilde> <V>	: "Ṽ" U1E7C # LATIN CAPITAL LETTER V WITH TILDE
-<combining_tilde> <V>	: "Ṽ" U1E7C # LATIN CAPITAL LETTER V WITH TILDE
 <dead_tilde> <v>	: "ṽ" U1E7D # LATIN SMALL LETTER V WITH TILDE
 <Multi_key> <asciitilde> <v>	: "ṽ" U1E7D # LATIN SMALL LETTER V WITH TILDE
-<combining_tilde> <v>	: "ṽ" U1E7D # LATIN SMALL LETTER V WITH TILDE
 <dead_belowdot> <V>	: "Ṿ" U1E7E # LATIN CAPITAL LETTER V WITH DOT BELOW
 <Multi_key> <exclam> <V>	: "Ṿ" U1E7E # LATIN CAPITAL LETTER V WITH DOT BELOW
-<combining_belowdot> <V>	: "Ṿ" U1E7E # LATIN CAPITAL LETTER V WITH DOT BELOW
 <dead_belowdot> <v>	: "ṿ" U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
 <Multi_key> <exclam> <v>	: "ṿ" U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
-<combining_belowdot> <v>	: "ṿ" U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
 <dead_grave> <W>	: "Ẁ" U1E80 # LATIN CAPITAL LETTER W WITH GRAVE
 <Multi_key> <grave> <W>	: "Ẁ" U1E80 # LATIN CAPITAL LETTER W WITH GRAVE
-<combining_grave> <W>	: "Ẁ" U1E80 # LATIN CAPITAL LETTER W WITH GRAVE
 <dead_grave> <w>	: "ẁ" U1E81 # LATIN SMALL LETTER W WITH GRAVE
 <Multi_key> <grave> <w>	: "ẁ" U1E81 # LATIN SMALL LETTER W WITH GRAVE
-<combining_grave> <w>	: "ẁ" U1E81 # LATIN SMALL LETTER W WITH GRAVE
 <dead_acute> <W>	: "Ẃ" U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
 <Multi_key> <acute> <W>	: "Ẃ" U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
 <Multi_key> <apostrophe> <W>	: "Ẃ" U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
-<combining_acute> <W>	: "Ẃ" U1E82 # LATIN CAPITAL LETTER W WITH ACUTE
 <dead_acute> <w>	: "ẃ" U1E83 # LATIN SMALL LETTER W WITH ACUTE
 <Multi_key> <acute> <w>	: "ẃ" U1E83 # LATIN SMALL LETTER W WITH ACUTE
 <Multi_key> <apostrophe> <w>	: "ẃ" U1E83 # LATIN SMALL LETTER W WITH ACUTE
-<combining_acute> <w>	: "ẃ" U1E83 # LATIN SMALL LETTER W WITH ACUTE
 <dead_diaeresis> <W>	: "Ẅ" U1E84 # LATIN CAPITAL LETTER W WITH DIAERESIS
 <Multi_key> <quotedbl> <W>	: "Ẅ" U1E84 # LATIN CAPITAL LETTER W WITH DIAERESIS
 <dead_diaeresis> <w>	: "ẅ" U1E85 # LATIN SMALL LETTER W WITH DIAERESIS
@@ -2244,10 +2005,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <period> <w>	: "ẇ" U1E87 # LATIN SMALL LETTER W WITH DOT ABOVE
 <dead_belowdot> <W>	: "Ẉ" U1E88 # LATIN CAPITAL LETTER W WITH DOT BELOW
 <Multi_key> <exclam> <W>	: "Ẉ" U1E88 # LATIN CAPITAL LETTER W WITH DOT BELOW
-<combining_belowdot> <W>	: "Ẉ" U1E88 # LATIN CAPITAL LETTER W WITH DOT BELOW
 <dead_belowdot> <w>	: "ẉ" U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
 <Multi_key> <exclam> <w>	: "ẉ" U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
-<combining_belowdot> <w>	: "ẉ" U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
 <dead_abovedot> <X>	: "Ẋ" U1E8A # LATIN CAPITAL LETTER X WITH DOT ABOVE
 <Multi_key> <period> <X>	: "Ẋ" U1E8A # LATIN CAPITAL LETTER X WITH DOT ABOVE
 <dead_abovedot> <x>	: "ẋ" U1E8B # LATIN SMALL LETTER X WITH DOT ABOVE
@@ -2266,13 +2025,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <z>	: "ẑ" U1E91 # LATIN SMALL LETTER Z WITH CIRCUMFLEX
 <dead_belowdot> <Z>	: "Ẓ" U1E92 # LATIN CAPITAL LETTER Z WITH DOT BELOW
 <Multi_key> <exclam> <Z>	: "Ẓ" U1E92 # LATIN CAPITAL LETTER Z WITH DOT BELOW
-<combining_belowdot> <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
-<combining_belowdot> <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
@@ -2283,16 +2040,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <period> <U017f>	: "ẛ" 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
-<combining_belowdot> <A>	: "Ạ" U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
 <dead_belowdot> <a>	: "ạ" U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
 <Multi_key> <exclam> <a>	: "ạ" U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
-<combining_belowdot> <a>	: "ạ" U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
 <dead_hook> <A>	: "Ả" U1EA2 # LATIN CAPITAL LETTER A WITH HOOK ABOVE
 <Multi_key> <question> <A>	: "Ả" U1EA2 # LATIN CAPITAL LETTER A WITH HOOK ABOVE
-<combining_hook> <A>	: "Ả" U1EA2 # LATIN CAPITAL LETTER A WITH HOOK ABOVE
 <dead_hook> <a>	: "ả" U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
 <Multi_key> <question> <a>	: "ả" U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
-<combining_hook> <a>	: "ả" U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
 <dead_acute> <Acircumflex>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <Acircumflex>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <Acircumflex>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
@@ -2302,9 +2055,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciicircum> <A>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <A>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <A>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Acircumflex>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <A>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <A>	: "Ấ" U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_acute> <acircumflex>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <acircumflex>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <acircumflex>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
@@ -2314,79 +2064,54 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciicircum> <a>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <a>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <a>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <acircumflex>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <a>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <a>	: "ấ" U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_grave> <Acircumflex>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <Acircumflex>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <A>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <A>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <A>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <A>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Acircumflex>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <A>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <A>	: "Ầ" U1EA6 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <acircumflex>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <acircumflex>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <a>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <a>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <a>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <a>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <acircumflex>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <a>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <a>	: "ầ" U1EA7 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
 <dead_hook> <Acircumflex>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <Acircumflex>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <A>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <A>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <A>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <A>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Acircumflex>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <A>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <A>	: "Ẩ" U1EA8 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <acircumflex>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <acircumflex>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <a>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <a>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <a>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <a>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <acircumflex>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <a>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <a>	: "ẩ" U1EA9 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_tilde> <Acircumflex>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <Acircumflex>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <A>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <A>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <A>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <A>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Acircumflex>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <A>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <A>	: "Ẫ" U1EAA # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <acircumflex>	: "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <acircumflex>	: "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <a>	: "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <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
-<combining_tilde> <acircumflex>	: "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <a>	: "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <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_circumflex> <combining_belowdot> <A>	: "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <A>	: "Ậ" 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
 <Multi_key> <asciicircum> <exclam> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_acute> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <acute> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
@@ -2399,10 +2124,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_breve> <A>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <U> <A>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <b> <A>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <dead_breve> <A>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <U> <A>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <b> <A>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <dead_acute> <abreve>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <acute> <abreve>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <abreve>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
@@ -2415,10 +2136,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <apostrophe> <dead_breve> <a>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <U> <a>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <b> <a>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <abreve>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <dead_breve> <a>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <U> <a>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<combining_acute> <Multi_key> <b> <a>	: "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <dead_grave> <Abreve>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <Abreve>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <dead_grave> <dead_breve> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
@@ -2427,10 +2144,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <grave> <dead_breve> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <U> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <b> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Abreve>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <dead_breve> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <U> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <b> <A>	: "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
 <dead_grave> <abreve>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <abreve>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <dead_grave> <dead_breve> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
@@ -2439,10 +2152,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <grave> <dead_breve> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <U> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <Multi_key> <grave> <b> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <abreve>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <dead_breve> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <U> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<combining_grave> <Multi_key> <b> <a>	: "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
 <dead_hook> <Abreve>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <Abreve>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_hook> <dead_breve> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
@@ -2451,10 +2160,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <question> <dead_breve> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <U> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <b> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Abreve>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <dead_breve> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <U> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <b> <A>	: "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_hook> <abreve>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <abreve>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_hook> <dead_breve> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
@@ -2463,10 +2168,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <question> <dead_breve> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <U> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <Multi_key> <question> <b> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <abreve>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <dead_breve> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <U> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<combining_hook> <Multi_key> <b> <a>	: "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_tilde> <Abreve>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <Abreve>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_tilde> <dead_breve> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
@@ -2475,10 +2176,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciitilde> <dead_breve> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <U> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <b> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Abreve>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <dead_breve> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <U> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <b> <A>	: "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_tilde> <abreve>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <abreve>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <dead_tilde> <dead_breve> <a>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
@@ -2487,10 +2184,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciitilde> <dead_breve> <a>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <U> <a>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <Multi_key> <asciitilde> <b> <a>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <abreve>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <dead_breve> <a>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <U> <a>	: "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<combining_tilde> <Multi_key> <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
@@ -2500,9 +2193,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <U> <exclam> <A>	: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <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_breve> <combining_belowdot> <A>	: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <combining_belowdot> <A>	: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <combining_belowdot> <A>	: "Ặ" 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
@@ -2512,27 +2202,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <U> <exclam> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <dead_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <exclam> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<dead_breve> <combining_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <combining_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <combining_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <dead_belowdot> <E>	: "Ẹ" U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
 <Multi_key> <exclam> <E>	: "Ẹ" U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
-<combining_belowdot> <E>	: "Ẹ" U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
 <dead_belowdot> <e>	: "ẹ" U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
 <Multi_key> <exclam> <e>	: "ẹ" U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
-<combining_belowdot> <e>	: "ẹ" U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
 <dead_hook> <E>	: "Ẻ" U1EBA # LATIN CAPITAL LETTER E WITH HOOK ABOVE
 <Multi_key> <question> <E>	: "Ẻ" U1EBA # LATIN CAPITAL LETTER E WITH HOOK ABOVE
-<combining_hook> <E>	: "Ẻ" U1EBA # LATIN CAPITAL LETTER E WITH HOOK ABOVE
 <dead_hook> <e>	: "ẻ" U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
 <Multi_key> <question> <e>	: "ẻ" U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
-<combining_hook> <e>	: "ẻ" U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
 <dead_tilde> <E>	: "Ẽ" U1EBC # LATIN CAPITAL LETTER E WITH TILDE
 <Multi_key> <asciitilde> <E>	: "Ẽ" U1EBC # LATIN CAPITAL LETTER E WITH TILDE
-<combining_tilde> <E>	: "Ẽ" U1EBC # LATIN CAPITAL LETTER E WITH TILDE
 <dead_tilde> <e>	: "ẽ" U1EBD # LATIN SMALL LETTER E WITH TILDE
 <Multi_key> <asciitilde> <e>	: "ẽ" U1EBD # LATIN SMALL LETTER E WITH TILDE
-<combining_tilde> <e>	: "ẽ" U1EBD # LATIN SMALL LETTER E WITH TILDE
 <dead_acute> <Ecircumflex>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <Ecircumflex>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <Ecircumflex>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
@@ -2542,9 +2223,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciicircum> <E>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <E>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <E>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Ecircumflex>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <E>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <E>	: "Ế" U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_acute> <ecircumflex>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <ecircumflex>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <ecircumflex>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
@@ -2554,103 +2232,70 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciicircum> <e>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <e>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <e>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <ecircumflex>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <e>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <e>	: "ế" U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_grave> <Ecircumflex>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <Ecircumflex>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <E>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <E>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <E>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <E>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Ecircumflex>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <E>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <E>	: "Ề" U1EC0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <ecircumflex>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <ecircumflex>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <e>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <e>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <e>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <e>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <ecircumflex>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <e>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <e>	: "ề" U1EC1 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
 <dead_hook> <Ecircumflex>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <Ecircumflex>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <E>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <E>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <E>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <E>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Ecircumflex>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <E>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <E>	: "Ể" U1EC2 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <ecircumflex>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <ecircumflex>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <e>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <e>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <e>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <e>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <ecircumflex>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <e>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <e>	: "ể" U1EC3 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_tilde> <Ecircumflex>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <Ecircumflex>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <E>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <E>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <E>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <E>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Ecircumflex>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <E>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <E>	: "Ễ" U1EC4 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <ecircumflex>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <ecircumflex>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <e>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <e>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <e>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <e>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <ecircumflex>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <e>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <e>	: "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <U1eb8>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1eb8>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1eb9>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1eb9>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_hook> <I>	: "Ỉ" U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
 <Multi_key> <question> <I>	: "Ỉ" U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
-<combining_hook> <I>	: "Ỉ" U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
 <dead_hook> <i>	: "ỉ" U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
 <Multi_key> <question> <i>	: "ỉ" U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
-<combining_hook> <i>	: "ỉ" U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
 <dead_belowdot> <I>	: "Ị" U1ECA # LATIN CAPITAL LETTER I WITH DOT BELOW
 <Multi_key> <exclam> <I>	: "Ị" U1ECA # LATIN CAPITAL LETTER I WITH DOT BELOW
-<combining_belowdot> <I>	: "Ị" U1ECA # LATIN CAPITAL LETTER I WITH DOT BELOW
 <dead_belowdot> <i>	: "ị" U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
 <Multi_key> <exclam> <i>	: "ị" U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
-<combining_belowdot> <i>	: "ị" U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
 <dead_belowdot> <O>	: "Ọ" U1ECC # LATIN CAPITAL LETTER O WITH DOT BELOW
 <Multi_key> <exclam> <O>	: "Ọ" U1ECC # LATIN CAPITAL LETTER O WITH DOT BELOW
-<combining_belowdot> <O>	: "Ọ" U1ECC # LATIN CAPITAL LETTER O WITH DOT BELOW
 <dead_belowdot> <o>	: "ọ" U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
 <Multi_key> <exclam> <o>	: "ọ" U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
-<combining_belowdot> <o>	: "ọ" U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
 <dead_hook> <O>	: "Ỏ" U1ECE # LATIN CAPITAL LETTER O WITH HOOK ABOVE
 <Multi_key> <question> <O>	: "Ỏ" U1ECE # LATIN CAPITAL LETTER O WITH HOOK ABOVE
-<combining_hook> <O>	: "Ỏ" U1ECE # LATIN CAPITAL LETTER O WITH HOOK ABOVE
 <dead_hook> <o>	: "ỏ" U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
 <Multi_key> <question> <o>	: "ỏ" U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
-<combining_hook> <o>	: "ỏ" U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
 <dead_acute> <Ocircumflex>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <Ocircumflex>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <Ocircumflex>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
@@ -2660,9 +2305,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciicircum> <O>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <O>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <O>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Ocircumflex>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <O>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <O>	: "Ố" U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_acute> <ocircumflex>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <acute> <ocircumflex>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <ocircumflex>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
@@ -2672,79 +2314,54 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <asciicircum> <o>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <dead_circumflex> <o>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <Multi_key> <apostrophe> <asciicircum> <o>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <ocircumflex>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <dead_circumflex> <o>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<combining_acute> <Multi_key> <asciicircum> <o>	: "ố" U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_grave> <Ocircumflex>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <Ocircumflex>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <O>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <O>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <O>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <O>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Ocircumflex>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <O>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <O>	: "Ồ" U1ED2 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <ocircumflex>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <ocircumflex>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <dead_circumflex> <o>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_grave> <Multi_key> <asciicircum> <o>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <dead_circumflex> <o>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <Multi_key> <grave> <asciicircum> <o>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <ocircumflex>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <dead_circumflex> <o>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<combining_grave> <Multi_key> <asciicircum> <o>	: "ồ" U1ED3 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
 <dead_hook> <Ocircumflex>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <Ocircumflex>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <O>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <O>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <O>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <O>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Ocircumflex>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <O>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <O>	: "Ổ" U1ED4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <ocircumflex>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <ocircumflex>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <dead_circumflex> <o>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_hook> <Multi_key> <asciicircum> <o>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <dead_circumflex> <o>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <Multi_key> <question> <asciicircum> <o>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <ocircumflex>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <dead_circumflex> <o>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<combining_hook> <Multi_key> <asciicircum> <o>	: "ổ" U1ED5 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_tilde> <Ocircumflex>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <Ocircumflex>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <O>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <O>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <O>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <O>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Ocircumflex>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <O>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <O>	: "Ỗ" U1ED6 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <ocircumflex>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <ocircumflex>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <dead_circumflex> <o>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_tilde> <Multi_key> <asciicircum> <o>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <dead_circumflex> <o>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <Multi_key> <asciitilde> <asciicircum> <o>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <ocircumflex>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <dead_circumflex> <o>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<combining_tilde> <Multi_key> <asciicircum> <o>	: "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <U1ecc>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1ecc>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1ecd>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1ecd>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <Multi_key> <exclam> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <dead_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <exclam> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <combining_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <combining_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_acute> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <acute> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
@@ -2754,9 +2371,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <plus> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<combining_acute> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <dead_acute> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <acute> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
@@ -2766,93 +2380,62 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <plus> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<combining_acute> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <dead_grave> <Ohorn>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <Ohorn>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<combining_grave> <Ohorn>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <ohorn>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <ohorn>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<combining_grave> <ohorn>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_hook> <Ohorn>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <Ohorn>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <Ohorn>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <ohorn>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <ohorn>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <ohorn>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_tilde> <Ohorn>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <Ohorn>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<combining_tilde> <Ohorn>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <ohorn>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <ohorn>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<combining_tilde> <ohorn>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_belowdot> <Ohorn>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <Ohorn>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <Ohorn>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <ohorn>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <ohorn>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <ohorn>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <U>	: "Ụ" U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
 <Multi_key> <exclam> <U>	: "Ụ" U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
-<combining_belowdot> <U>	: "Ụ" U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
 <dead_belowdot> <u>	: "ụ" U1EE5 # LATIN SMALL LETTER U WITH DOT BELOW
 <Multi_key> <exclam> <u>	: "ụ" U1EE5 # LATIN SMALL LETTER U WITH DOT BELOW
-<combining_belowdot> <u>	: "ụ" U1EE5 # LATIN SMALL LETTER U WITH DOT BELOW
 <dead_hook> <U>	: "Ủ" U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
 <Multi_key> <question> <U>	: "Ủ" U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
-<combining_hook> <U>	: "Ủ" U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
 <dead_hook> <u>	: "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
 <Multi_key> <question> <u>	: "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
-<combining_hook> <u>	: "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
 <dead_acute> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <acute> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
@@ -2862,9 +2445,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <plus> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<combining_acute> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <dead_acute> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <acute> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
@@ -2874,929 +2454,464 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <acute> <plus> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <dead_horn> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <plus> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<combining_acute> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<combining_acute> <dead_horn> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<combining_acute> <Multi_key> <plus> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <dead_grave> <Uhorn>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <Uhorn>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<combining_grave> <Uhorn>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <uhorn>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <uhorn>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <dead_horn> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <plus> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<combining_grave> <uhorn>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<combining_grave> <dead_horn> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<combining_grave> <Multi_key> <plus> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_hook> <Uhorn>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <Uhorn>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <Uhorn>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <uhorn>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <uhorn>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <dead_horn> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <plus> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <uhorn>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <dead_horn> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<combining_hook> <Multi_key> <plus> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_tilde> <Uhorn>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <Uhorn>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<combining_tilde> <Uhorn>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <uhorn>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <uhorn>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <dead_horn> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <plus> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<combining_tilde> <uhorn>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<combining_tilde> <dead_horn> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<combining_tilde> <Multi_key> <plus> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_belowdot> <Uhorn>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <Uhorn>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <Uhorn>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <uhorn>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <uhorn>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <dead_horn> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <plus> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <uhorn>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <dead_horn> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<combining_belowdot> <Multi_key> <plus> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_grave> <Y>	: "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
 <Multi_key> <grave> <Y>	: "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
-<combining_grave> <Y>	: "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
 <dead_grave> <y>	: "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
 <Multi_key> <grave> <y>	: "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
-<combining_grave> <y>	: "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
 <dead_belowdot> <Y>	: "Ỵ" U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
 <Multi_key> <exclam> <Y>	: "Ỵ" U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
-<combining_belowdot> <Y>	: "Ỵ" U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
 <dead_belowdot> <y>	: "ỵ" U1EF5 # LATIN SMALL LETTER Y WITH DOT BELOW
 <Multi_key> <exclam> <y>	: "ỵ" U1EF5 # LATIN SMALL LETTER Y WITH DOT BELOW
-<combining_belowdot> <y>	: "ỵ" U1EF5 # LATIN SMALL LETTER Y WITH DOT BELOW
 <dead_hook> <Y>	: "Ỷ" U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
 <Multi_key> <question> <Y>	: "Ỷ" U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-<combining_hook> <Y>	: "Ỷ" U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
 <dead_hook> <y>	: "ỷ" U1EF7 # LATIN SMALL LETTER Y WITH HOOK ABOVE
 <Multi_key> <question> <y>	: "ỷ" U1EF7 # LATIN SMALL LETTER Y WITH HOOK ABOVE
-<combining_hook> <y>	: "ỷ" U1EF7 # LATIN SMALL LETTER Y WITH HOOK ABOVE
 <dead_tilde> <Y>	: "Ỹ" U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
 <Multi_key> <asciitilde> <Y>	: "Ỹ" U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
-<combining_tilde> <Y>	: "Ỹ" U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
 <dead_tilde> <y>	: "ỹ" U1EF9 # LATIN SMALL LETTER Y WITH TILDE
 <Multi_key> <asciitilde> <y>	: "ỹ" U1EF9 # LATIN SMALL LETTER Y WITH TILDE
-<combining_tilde> <y>	: "ỹ" U1EF9 # LATIN SMALL LETTER Y WITH TILDE
-<U0313> <Greek_alpha>	: "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
 <Multi_key> <parenright> <Greek_alpha>	: "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f00>	: "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_alpha>	: "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f01>	: "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_alpha>	: "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f00>	: "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_alpha>	: "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f01>	: "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_alpha>	: "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_alpha>	: "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<U0342> <U1f00>	: "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_alpha>	: "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_alpha>	: "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f01>	: "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA 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
-<U0342> <U0314> <Greek_alpha>	: "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_alpha>	: "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_alpha>	: "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_alpha>	: "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_ALPHA>	: "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
 <Multi_key> <parenright> <Greek_ALPHA>	: "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f08>	: "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_ALPHA>	: "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f09>	: "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_ALPHA>	: "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f08>	: "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_ALPHA>	: "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f09>	: "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_ALPHA>	: "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_ALPHA>	: "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<U0342> <U1f08>	: "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_ALPHA>	: "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_ALPHA>	: "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f09>	: "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA 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
-<U0342> <U0314> <Greek_ALPHA>	: "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_ALPHA>	: "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_ALPHA>	: "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_ALPHA>	: "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_epsilon>	: "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
 <Multi_key> <parenright> <Greek_epsilon>	: "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f10>	: "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_epsilon>	: "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f11>	: "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_epsilon>	: "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f10>	: "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_epsilon>	: "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <Greek_epsilon>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_epsilon>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_epsilon>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_epsilon>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U1f11>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_epsilon>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_epsilon>	: "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<U0313> <Greek_EPSILON>	: "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
 <Multi_key> <parenright> <Greek_EPSILON>	: "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f18>	: "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_EPSILON>	: "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f19>	: "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_EPSILON>	: "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f18>	: "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_EPSILON>	: "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <Greek_EPSILON>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_EPSILON>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_EPSILON>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_EPSILON>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U1f19>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_EPSILON>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_EPSILON>	: "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<U0313> <Greek_eta>	: "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI
 <Multi_key> <parenright> <Greek_eta>	: "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f20>	: "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_eta>	: "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f21>	: "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_eta>	: "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f20>	: "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_eta>	: "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f21>	: "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_eta>	: "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_eta>	: "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<U0342> <U1f20>	: "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_eta>	: "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_eta>	: "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f21>	: "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA 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
-<U0342> <U0314> <Greek_eta>	: "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_eta>	: "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_eta>	: "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_eta>	: "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_ETA>	: "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
 <Multi_key> <parenright> <Greek_ETA>	: "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f28>	: "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_ETA>	: "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f29>	: "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_ETA>	: "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f28>	: "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_ETA>	: "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f29>	: "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_ETA>	: "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_ETA>	: "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<U0342> <U1f28>	: "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_ETA>	: "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_ETA>	: "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f29>	: "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA 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
-<U0342> <U0314> <Greek_ETA>	: "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_ETA>	: "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_ETA>	: "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_ETA>	: "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_iota>	: "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
 <Multi_key> <parenright> <Greek_iota>	: "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f30>	: "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_iota>	: "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f31>	: "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_iota>	: "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f30>	: "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_iota>	: "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f31>	: "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_iota>	: "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_iota>	: "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<U0342> <U1f30>	: "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_iota>	: "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_iota>	: "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f31>	: "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA 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
-<U0342> <U0314> <Greek_iota>	: "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_iota>	: "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_iota>	: "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_iota>	: "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_IOTA>	: "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
 <Multi_key> <parenright> <Greek_IOTA>	: "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f38>	: "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_IOTA>	: "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f39>	: "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_IOTA>	: "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f38>	: "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_IOTA>	: "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f39>	: "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_IOTA>	: "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_IOTA>	: "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<U0342> <U1f38>	: "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_IOTA>	: "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_IOTA>	: "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f39>	: "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA 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
-<U0342> <U0314> <Greek_IOTA>	: "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_IOTA>	: "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_IOTA>	: "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_IOTA>	: "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_omicron>	: "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
 <Multi_key> <parenright> <Greek_omicron>	: "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f40>	: "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_omicron>	: "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f41>	: "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_omicron>	: "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f40>	: "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_omicron>	: "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <Greek_omicron>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_omicron>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_omicron>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_omicron>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U1f41>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_omicron>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_omicron>	: "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<U0313> <Greek_OMICRON>	: "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
 <Multi_key> <parenright> <Greek_OMICRON>	: "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f48>	: "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_OMICRON>	: "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f49>	: "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_OMICRON>	: "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f48>	: "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_OMICRON>	: "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <Greek_OMICRON>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <acute> <parenleft> <Greek_OMICRON>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U0314> <Greek_OMICRON>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
 <Multi_key> <apostrophe> <parenleft> <Greek_OMICRON>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U1f49>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_OMICRON>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_OMICRON>	: "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<U0313> <Greek_upsilon>	: "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
 <Multi_key> <parenright> <Greek_upsilon>	: "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f50>	: "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_upsilon>	: "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f51>	: "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_upsilon>	: "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f50>	: "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_upsilon>	: "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f51>	: "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_upsilon>	: "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_upsilon>	: "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<U0342> <U1f50>	: "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_upsilon>	: "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_upsilon>	: "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f51>	: "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA 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
-<U0342> <U0314> <Greek_upsilon>	: "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_upsilon>	: "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <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
-<U0314> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f59>	: "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_UPSILON>	: "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f59>	: "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_UPSILON>	: "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_UPSILON>	: "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<U0342> <U1f59>	: "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <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
-<U0342> <U0314> <Greek_UPSILON>	: "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_UPSILON>	: "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_UPSILON>	: "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_UPSILON>	: "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U0313> <Greek_omega>	: "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
 <Multi_key> <parenright> <Greek_omega>	: "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f60>	: "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_omega>	: "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f61>	: "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_omega>	: "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f60>	: "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_omega>	: "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f61>	: "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_omega>	: "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_omega>	: "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<U0342> <U1f60>	: "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_omega>	: "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_omega>	: "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f61>	: "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA 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
-<U0342> <U0314> <Greek_omega>	: "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_omega>	: "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_omega>	: "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_omega>	: "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0313> <Greek_OMEGA>	: "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
 <Multi_key> <parenright> <Greek_OMEGA>	: "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
-<U0314> <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> <U0313> <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> <U0313> <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
-<combining_grave> <U1f68>	: "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U0313> <Greek_OMEGA>	: "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <Multi_key> <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> <U0314> <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> <U0314> <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
-<combining_grave> <U1f69>	: "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U0314> <Greek_OMEGA>	: "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <Multi_key> <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> <U0313> <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> <U0313> <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> <U0313> <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
-<combining_acute> <U1f68>	: "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U0313> <Greek_OMEGA>	: "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <Multi_key> <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> <U0314> <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> <U0314> <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> <U0314> <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
-<combining_acute> <U1f69>	: "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U0314> <Greek_OMEGA>	: "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <Multi_key> <parenleft> <Greek_OMEGA>	: "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<U0342> <U1f68>	: "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
 <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
-<U0342> <U0313> <Greek_OMEGA>	: "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U0342> <Multi_key> <parenright> <Greek_OMEGA>	: "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U0313> <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> <U0313> <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
-<U0342> <U1f69>	: "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA 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
-<U0342> <U0314> <Greek_OMEGA>	: "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U0342> <Multi_key> <parenleft> <Greek_OMEGA>	: "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U0314> <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> <U0314> <Greek_OMEGA>	: "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <Multi_key> <asciitilde> <parenleft> <Greek_OMEGA>	: "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
 <dead_grave> <Greek_alpha>	: "ὰ" U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
 <Multi_key> <grave> <Greek_alpha>	: "ὰ" U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
-<combining_grave> <Greek_alpha>	: "ὰ" U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
 <dead_grave> <Greek_epsilon>	: "ὲ" U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
 <Multi_key> <grave> <Greek_epsilon>	: "ὲ" U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
-<combining_grave> <Greek_epsilon>	: "ὲ" U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
 <dead_grave> <Greek_eta>	: "ὴ" U1F74 # GREEK SMALL LETTER ETA WITH VARIA
 <Multi_key> <grave> <Greek_eta>	: "ὴ" U1F74 # GREEK SMALL LETTER ETA WITH VARIA
-<combining_grave> <Greek_eta>	: "ὴ" U1F74 # GREEK SMALL LETTER ETA WITH VARIA
 <dead_grave> <Greek_iota>	: "ὶ" U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
 <Multi_key> <grave> <Greek_iota>	: "ὶ" U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
-<combining_grave> <Greek_iota>	: "ὶ" U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
 <dead_grave> <Greek_omicron>	: "ὸ" U1F78 # GREEK SMALL LETTER OMICRON WITH VARIA
 <Multi_key> <grave> <Greek_omicron>	: "ὸ" U1F78 # GREEK SMALL LETTER OMICRON WITH VARIA
-<combining_grave> <Greek_omicron>	: "ὸ" U1F78 # GREEK SMALL LETTER OMICRON WITH VARIA
 <dead_grave> <Greek_upsilon>	: "ὺ" U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
 <Multi_key> <grave> <Greek_upsilon>	: "ὺ" U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
-<combining_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
-<combining_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> <U0313> <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> <U0313> <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> <U0314> <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> <U0314> <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
@@ -3804,40 +2919,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <Greek_alpha>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_alpha>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_alpha>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1f00>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f00>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_alpha>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_alpha>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_alpha>	: "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <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> <U0314> <Greek_alpha>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_alpha>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_alpha>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1f01>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f01>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_alpha>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_alpha>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_alpha>	: "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -3846,24 +2941,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <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> <U0313> <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> <U0313> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1f00>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f00>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_alpha>	: "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -3872,75 +2955,39 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0314> <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> <U0314> <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> <U0314> <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> <U0314> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1f01>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f01>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_alpha>	: "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1f00>	: "ᾆ" 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> <U0342> <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> <U0342> <U0313> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <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> <U0313> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_alpha>	: "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1f01>	: "ᾇ" 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> <U0342> <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> <U0342> <U0314> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <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> <U0314> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_alpha>	: "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0314> <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> <U0313> <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> <U0313> <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> <U0314> <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> <U0314> <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
@@ -3948,40 +2995,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <Greek_ALPHA>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_ALPHA>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_ALPHA>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1f08>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f08>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_ALPHA>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_ALPHA>	: "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <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> <U0314> <Greek_ALPHA>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_ALPHA>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_ALPHA>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1f09>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f09>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_ALPHA>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_ALPHA>	: "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -3990,24 +3017,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <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> <U0313> <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> <U0313> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1f08>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f08>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_ALPHA>	: "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4016,75 +3031,39 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0314> <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> <U0314> <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> <U0314> <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> <U0314> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1f09>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f09>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_ALPHA>	: "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1f08>	: "ᾎ" 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> <U0342> <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> <U0342> <U0313> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <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> <U0313> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_ALPHA>	: "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1f09>	: "ᾏ" 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> <U0342> <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> <U0342> <U0314> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <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> <U0314> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_ALPHA>	: "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0314> <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> <U0313> <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> <U0313> <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> <U0314> <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> <U0314> <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
@@ -4092,40 +3071,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <Greek_eta>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_eta>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_eta>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1f20>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f20>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_eta>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_eta>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_eta>	: "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <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> <U0314> <Greek_eta>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_eta>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_eta>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1f21>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f21>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_eta>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_eta>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_eta>	: "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4134,24 +3093,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <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> <U0313> <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> <U0313> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1f20>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f20>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_eta>	: "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4160,75 +3107,39 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0314> <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> <U0314> <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> <U0314> <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> <U0314> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1f21>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f21>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_eta>	: "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1f20>	: "ᾖ" 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> <U0342> <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> <U0342> <U0313> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <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> <U0313> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_eta>	: "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1f21>	: "ᾗ" 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> <U0342> <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> <U0342> <U0314> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <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> <U0314> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_eta>	: "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0314> <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> <U0313> <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> <U0313> <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> <U0314> <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> <U0314> <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
@@ -4236,40 +3147,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <Greek_ETA>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_ETA>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_ETA>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1f28>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f28>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_ETA>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_ETA>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_ETA>	: "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <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> <U0314> <Greek_ETA>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_ETA>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_ETA>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1f29>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f29>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_ETA>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_ETA>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_ETA>	: "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4278,24 +3169,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <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> <U0313> <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> <U0313> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1f28>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f28>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_ETA>	: "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4304,75 +3183,39 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0314> <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> <U0314> <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> <U0314> <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> <U0314> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1f29>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f29>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_ETA>	: "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1f28>	: "ᾞ" 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> <U0342> <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> <U0342> <U0313> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <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> <U0313> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_ETA>	: "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1f29>	: "ᾟ" 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> <U0342> <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> <U0342> <U0314> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <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> <U0314> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_ETA>	: "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0314> <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> <U0313> <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> <U0313> <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> <U0314> <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> <U0314> <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
@@ -4380,40 +3223,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <Greek_omega>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_omega>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_omega>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1f60>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f60>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_omega>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_omega>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_omega>	: "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <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> <U0314> <Greek_omega>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_omega>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_omega>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1f61>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f61>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_omega>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_omega>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_omega>	: "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4422,24 +3245,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <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> <U0313> <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> <U0313> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1f60>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f60>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_omega>	: "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4448,75 +3259,39 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0314> <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> <U0314> <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> <U0314> <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> <U0314> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1f61>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f61>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_omega>	: "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1f60>	: "ᾦ" 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> <U0342> <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> <U0342> <U0313> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <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> <U0313> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_omega>	: "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1f61>	: "ᾧ" 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> <U0342> <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> <U0342> <U0314> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <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> <U0314> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_omega>	: "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
 <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> <U0314> <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> <U0313> <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> <U0313> <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> <U0314> <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> <U0314> <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
@@ -4524,40 +3299,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <Greek_OMEGA>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenright> <Greek_OMEGA>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_OMEGA>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
 <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> <U0313> <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> <combining_grave> <U1f68>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f68>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0313> <Greek_OMEGA>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_OMEGA>	: "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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> <U0314> <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> <U0314> <Greek_OMEGA>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <grave> <parenleft> <Greek_OMEGA>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_OMEGA>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
 <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> <U0314> <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> <combining_grave> <U1f69>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U1f69>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U0314> <Greek_OMEGA>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_OMEGA>	: "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4566,24 +3321,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0313> <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> <U0313> <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> <U0313> <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> <U0313> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0313> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenright> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0313> <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> <combining_acute> <U1f68>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f68>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0313> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_OMEGA>	: "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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
@@ -4592,63 +3335,31 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <U0314> <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> <U0314> <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> <U0314> <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> <U0314> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U0314> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <acute> <parenleft> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U0314> <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> <combining_acute> <U1f69>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U1f69>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U0314> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_OMEGA>	: "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <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> <U0342> <U1f68>	: "ᾮ" 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> <U0342> <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> <U0342> <U0313> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenright> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0313> <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> <U0313> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_OMEGA>	: "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
 <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> <U0313> <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> <U0342> <U1f69>	: "ᾯ" 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> <U0342> <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> <U0342> <U0314> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U0314> <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> <U0314> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_OMEGA>	: "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
 <dead_breve> <Greek_alpha>	: "ᾰ" U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
 <Multi_key> <U> <Greek_alpha>	: "ᾰ" U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
@@ -4662,8 +3373,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <combining_grave> <Greek_alpha>	: "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4674,17 +3383,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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_iota> <combining_acute> <Greek_alpha>	: "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <Greek_alpha>	: "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<U0342> <Greek_alpha>	: "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
 <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> <U0342> <Greek_alpha>	: "ᾷ" 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> <U0342> <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
 <Multi_key> <Greek_iota> <asciitilde> <Greek_alpha>	: "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_breve> <Greek_ALPHA>	: "Ᾰ" U1FB8 # GREEK CAPITAL LETTER ALPHA WITH VRACHY
@@ -4695,10 +3399,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <underscore> <Greek_ALPHA>	: "Ᾱ" U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON
 <dead_grave> <Greek_ALPHA>	: "Ὰ" U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
 <Multi_key> <grave> <Greek_ALPHA>	: "Ὰ" U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
-<combining_grave> <Greek_ALPHA>	: "Ὰ" U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
 <dead_iota> <Greek_ALPHA>	: "ᾼ" U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_ALPHA>	: "ᾼ" U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-<Multi_key> <diaeresis> <U0342>	: "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
 <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
@@ -4707,8 +3409,6 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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> <combining_grave> <Greek_eta>	: "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4719,35 +3419,25 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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_iota> <combining_acute> <Greek_eta>	: "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <Greek_eta>	: "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<U0342> <Greek_eta>	: "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
 <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> <U0342> <Greek_eta>	: "ῇ" 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> <U0342> <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
 <Multi_key> <Greek_iota> <asciitilde> <Greek_eta>	: "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_grave> <Greek_EPSILON>	: "Ὲ" U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
 <Multi_key> <grave> <Greek_EPSILON>	: "Ὲ" U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
-<combining_grave> <Greek_EPSILON>	: "Ὲ" U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
 <dead_grave> <Greek_ETA>	: "Ὴ" U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
 <Multi_key> <grave> <Greek_ETA>	: "Ὴ" U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
-<combining_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> <combining_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> <combining_acute>	: "῎" U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U1fbf> <U0342>	: "῏" U1FCF # GREEK PSILI AND PERISPOMENI
 <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
@@ -4762,17 +3452,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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
-<combining_grave> <Greek_iotadieresis>	: "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<combining_grave> <dead_diaeresis> <Greek_iota>	: "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<combining_grave> <Multi_key> <quotedbl> <Greek_iota>	: "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<U0342> <Greek_iota>	: "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
 <dead_tilde> <Greek_iota>	: "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_iota>	: "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
-<U0342> <Greek_iotadieresis>	: "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND 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
-<U0342> <dead_diaeresis> <Greek_iota>	: "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-<U0342> <Multi_key> <quotedbl> <Greek_iota>	: "ῗ" 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
@@ -4785,15 +3468,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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
-<combining_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> <combining_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> <combining_acute>	: "῞" U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U1ffe> <U0342>	: "῟" U1FDF # GREEK DASIA AND PERISPOMENI
 <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
@@ -4808,21 +3487,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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
 <Multi_key> <grave> <quotedbl> <Greek_upsilon>	: "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<combining_grave> <Greek_upsilondieresis>	: "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<combining_grave> <dead_diaeresis> <Greek_upsilon>	: "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<combining_grave> <Multi_key> <quotedbl> <Greek_upsilon>	: "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<U0313> <Greek_rho>	: "ῤ" U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
 <Multi_key> <parenright> <Greek_rho>	: "ῤ" U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
-<U0314> <Greek_rho>	: "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
 <Multi_key> <parenleft> <Greek_rho>	: "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
-<U0342> <Greek_upsilon>	: "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
 <dead_tilde> <Greek_upsilon>	: "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
 <Multi_key> <asciitilde> <Greek_upsilon>	: "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-<U0342> <Greek_upsilondieresis>	: "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND 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
-<U0342> <dead_diaeresis> <Greek_upsilon>	: "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-<U0342> <Multi_key> <quotedbl> <Greek_upsilon>	: "ῧ" 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
@@ -4835,20 +3505,15 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <underscore> <Greek_UPSILON>	: "Ῡ" U1FE9 # GREEK CAPITAL LETTER UPSILON WITH MACRON
 <dead_grave> <Greek_UPSILON>	: "Ὺ" U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
 <Multi_key> <grave> <Greek_UPSILON>	: "Ὺ" U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
-<combining_grave> <Greek_UPSILON>	: "Ὺ" U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
-<U0314> <Greek_RHO>	: "Ῥ" U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
 <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
-<Multi_key> <diaeresis> <combining_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> <combining_grave> <Greek_omega>	: "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_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
@@ -4859,25 +3524,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <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_iota> <combining_acute> <Greek_omega>	: "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <Greek_omega>	: "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<U0342> <Greek_omega>	: "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
 <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> <U0342> <Greek_omega>	: "ῷ" 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> <U0342> <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
 <Multi_key> <Greek_iota> <asciitilde> <Greek_omega>	: "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
 <dead_grave> <Greek_OMICRON>	: "Ὸ" U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
 <Multi_key> <grave> <Greek_OMICRON>	: "Ὸ" U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
-<combining_grave> <Greek_OMICRON>	: "Ὸ" U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
 <dead_grave> <Greek_OMEGA>	: "Ὼ" U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
 <Multi_key> <grave> <Greek_OMEGA>	: "Ὼ" U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
-<combining_grave> <Greek_OMEGA>	: "Ὼ" U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
 <dead_iota> <Greek_OMEGA>	: "ῼ" U1FFC # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
 <Multi_key> <Greek_iota> <Greek_OMEGA>	: "ῼ" U1FFC # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
 <dead_circumflex> <0>	: "⁰" U2070 # SUPERSCRIPT ZERO
@@ -4990,6 +3648,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <S> <M>	: "℠" U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <T> <M>	: "™" U2122 # TRADE MARK SIGN
 <Multi_key> <asciicircum> <T> <M>	: "™" U2122 # TRADE MARK SIGN
+<Multi_key> <1> <3>			: "⅓"	U2153 # VULGAR FRACTION ONE THIRD
+<Multi_key> <2> <3>			: "⅔"	U2154 # VULGAR FRACTION TWO THIRDS
+<Multi_key> <1> <5>			: "⅕"	U2155 # VULGAR FRACTION ONE FIFTH
+<Multi_key> <2> <5>			: "⅖"	U2156 # VULGAR FRACTION TWO FIFTHS
+<Multi_key> <3> <5>			: "⅗"	U2157 # VULGAR FRACTION THREE FIFTHS
+<Multi_key> <4> <5>			: "⅘"	U2158 # VULGAR FRACTION FOUR FIFTHS
+<Multi_key> <1> <6>			: "⅙"	U2159 # VULGAR FRACTION ONE SIXTH
+<Multi_key> <5> <6>			: "⅚"	U215A # VULGAR FRACTION FIVE SIXTHS
+<Multi_key> <1> <8>			: "⅛"	U215B # VULGAR FRACTION ONE EIGHTH
+<Multi_key> <3> <8>			: "⅜"	U215C # VULGAR FRACTION THREE EIGHTHS
+<Multi_key> <5> <8>			: "⅝"	U215D # VULGAR FRACTION FIVE EIGHTHS
+<Multi_key> <7> <8>			: "⅞"	U215E # VULGAR FRACTION SEVEN EIGHTHS
 <Multi_key> <slash> <leftarrow>	: "↚" U219A # LEFTWARDS ARROW WITH STROKE
 <Multi_key> <KP_Divide> <leftarrow>	: "↚" U219A # LEFTWARDS ARROW WITH STROKE
 <Multi_key> <slash> <rightarrow>	: "↛" U219B # RIGHTWARDS ARROW WITH STROKE
diff --git a/libX11/nls/pt_BR.UTF-8/Makefile.in b/libX11/nls/pt_BR.UTF-8/Makefile.in
index f63c4b5b0..ffac17706 100644
--- a/libX11/nls/pt_BR.UTF-8/Makefile.in
+++ b/libX11/nls/pt_BR.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/pt_BR.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/pt_BR.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/pt_BR.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/pt_BR.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/pt_BR.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/tatar-cyr/Makefile.in b/libX11/nls/tatar-cyr/Makefile.in
index fe4270773..ebd16b7a0 100644
--- a/libX11/nls/tatar-cyr/Makefile.in
+++ b/libX11/nls/tatar-cyr/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/tatar-cyr
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/tatar-cyr/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/tatar-cyr/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/tatar-cyr/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/tatar-cyr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/th_TH.UTF-8/Makefile.in b/libX11/nls/th_TH.UTF-8/Makefile.in
index fc2149671..24a49ac4a 100644
--- a/libX11/nls/th_TH.UTF-8/Makefile.in
+++ b/libX11/nls/th_TH.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/th_TH.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/th_TH.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/th_TH.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/th_TH.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/th_TH.UTF-8/XLC_LOCALE.pre b/libX11/nls/th_TH.UTF-8/XLC_LOCALE.pre
index 9f1caf7e7..caede144f 100644
--- a/libX11/nls/th_TH.UTF-8/XLC_LOCALE.pre
+++ b/libX11/nls/th_TH.UTF-8/XLC_LOCALE.pre
@@ -27,8 +27,8 @@ fs1	{
 }
 XCOMM 	fs1 class (Thai) 
 fs2	{
-	charset         TIS620-0:GR
-	font            TIS620-0:GR
+	charset         ISO8859-11:GR
+	font            ISO8859-11:GR
 }
 END XLC_FONTSET
 
@@ -69,7 +69,13 @@ cs1	{
 	length		1
 
 	wc_encoding	\x30000000
-	ct_encoding     TIS620-0:GR
+	ct_encoding     ISO8859-11:GR
+}
+
+XCOMM 	cs2 class
+cs2	{
+	side		none
+	ct_encoding     ISO10646-1
 }
 
 END XLC_XLOCALE
diff --git a/libX11/nls/th_TH/Makefile.in b/libX11/nls/th_TH/Makefile.in
index 57f9adb49..ab6fc77c4 100644
--- a/libX11/nls/th_TH/Makefile.in
+++ b/libX11/nls/th_TH/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/th_TH/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/th_TH/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/th_TH/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/th_TH/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/th_TH/XLC_LOCALE.pre b/libX11/nls/th_TH/XLC_LOCALE.pre
index 7d55d8510..c67d68370 100644
--- a/libX11/nls/th_TH/XLC_LOCALE.pre
+++ b/libX11/nls/th_TH/XLC_LOCALE.pre
@@ -16,8 +16,8 @@ fs0	{
 }
 XCOMM 	fs1 class (Thai) 
 fs1	{
-	charset         TIS620-0:GR
-	font            TIS620-0:GR
+	charset         ISO8859-11:GR
+	font            ISO8859-11:GR
 }
 END XLC_FONTSET
 
@@ -61,7 +61,7 @@ cs1	{
 #else
 	wc_encoding	\x00008080
 #endif
-	ct_encoding     TIS620-0:GR
+	ct_encoding     ISO8859-11:GR
 }
 
 END XLC_XLOCALE
diff --git a/libX11/nls/tscii-0/Makefile.in b/libX11/nls/tscii-0/Makefile.in
index f6f01d792..3627dc9f8 100644
--- a/libX11/nls/tscii-0/Makefile.in
+++ b/libX11/nls/tscii-0/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/tscii-0
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/tscii-0/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/tscii-0/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/tscii-0/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/tscii-0/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/vi_VN.tcvn/Makefile.in b/libX11/nls/vi_VN.tcvn/Makefile.in
index ec387d292..30c4f9b4d 100644
--- a/libX11/nls/vi_VN.tcvn/Makefile.in
+++ b/libX11/nls/vi_VN.tcvn/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.tcvn
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/vi_VN.tcvn/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/vi_VN.tcvn/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/vi_VN.tcvn/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/vi_VN.tcvn/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/vi_VN.viscii/Makefile.in b/libX11/nls/vi_VN.viscii/Makefile.in
index ddca9609c..aecbcfd7e 100644
--- a/libX11/nls/vi_VN.viscii/Makefile.in
+++ b/libX11/nls/vi_VN.viscii/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.viscii
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/vi_VN.viscii/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/vi_VN.viscii/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/vi_VN.viscii/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/vi_VN.viscii/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_CN.UTF-8/Makefile.in b/libX11/nls/zh_CN.UTF-8/Makefile.in
index 08368b7f2..eb7f535de 100644
--- a/libX11/nls/zh_CN.UTF-8/Makefile.in
+++ b/libX11/nls/zh_CN.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_CN.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_CN.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_CN.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_CN.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_CN.gb18030/Makefile.in b/libX11/nls/zh_CN.gb18030/Makefile.in
index 16ccab380..f5f22a65b 100644
--- a/libX11/nls/zh_CN.gb18030/Makefile.in
+++ b/libX11/nls/zh_CN.gb18030/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gb18030
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_CN.gb18030/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_CN.gb18030/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_CN.gb18030/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_CN.gb18030/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_CN.gbk/Makefile.in b/libX11/nls/zh_CN.gbk/Makefile.in
index 3f2fbb40c..df5622446 100644
--- a/libX11/nls/zh_CN.gbk/Makefile.in
+++ b/libX11/nls/zh_CN.gbk/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gbk
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_CN.gbk/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_CN.gbk/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_CN.gbk/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_CN.gbk/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_CN/Makefile.in b/libX11/nls/zh_CN/Makefile.in
index 83c655aab..8a61b36d4 100644
--- a/libX11/nls/zh_CN/Makefile.in
+++ b/libX11/nls/zh_CN/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_CN/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_CN/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_CN/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_CN/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_HK.UTF-8/Makefile.in b/libX11/nls/zh_HK.UTF-8/Makefile.in
index 099e4a166..2fb0a2507 100644
--- a/libX11/nls/zh_HK.UTF-8/Makefile.in
+++ b/libX11/nls/zh_HK.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_HK.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_HK.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_HK.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_HK.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_HK.big5/Makefile.in b/libX11/nls/zh_HK.big5/Makefile.in
index 3d5502a56..5ce1c579c 100644
--- a/libX11/nls/zh_HK.big5/Makefile.in
+++ b/libX11/nls/zh_HK.big5/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_HK.big5/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_HK.big5/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_HK.big5/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_HK.big5/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_HK.big5hkscs/Makefile.in b/libX11/nls/zh_HK.big5hkscs/Makefile.in
index c47bd15a5..d76c2b066 100644
--- a/libX11/nls/zh_HK.big5hkscs/Makefile.in
+++ b/libX11/nls/zh_HK.big5hkscs/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5hkscs
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_HK.big5hkscs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_HK.big5hkscs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_HK.big5hkscs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_HK.big5hkscs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_TW.UTF-8/Makefile.in b/libX11/nls/zh_TW.UTF-8/Makefile.in
index f1dc38ed0..647f0221f 100644
--- a/libX11/nls/zh_TW.UTF-8/Makefile.in
+++ b/libX11/nls/zh_TW.UTF-8/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.UTF-8
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_TW.UTF-8/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_TW.UTF-8/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_TW.UTF-8/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_TW.UTF-8/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_TW.big5/Makefile.in b/libX11/nls/zh_TW.big5/Makefile.in
index 247119fcf..0dd5cbfde 100644
--- a/libX11/nls/zh_TW.big5/Makefile.in
+++ b/libX11/nls/zh_TW.big5/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.big5
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_TW.big5/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_TW.big5/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_TW.big5/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_TW.big5/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libX11/nls/zh_TW/Makefile.in b/libX11/nls/zh_TW/Makefile.in
index 47c0b5a8a..7d4e6ad37 100644
--- a/libX11/nls/zh_TW/Makefile.in
+++ b/libX11/nls/zh_TW/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h \
 	$(top_builddir)/include/X11/XlibConf.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,11 +59,24 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
 	"$(DESTDIR)$(x11thislocaledir)"
-dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
-x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -78,27 +94,26 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
@@ -110,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
 LAUNCHD = @LAUNCHD@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,7 +135,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINTLIB = @LINTLIB@
 LINT_FLAGS = @LINT_FLAGS@
+LIPO = @LIPO@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -127,8 +146,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,17 +191,14 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XPROTO_CFLAGS = @XPROTO_CFLAGS@
 XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
-XTHREADS = @XTHREADS@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -193,6 +213,7 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -209,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -221,6 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW
@@ -239,6 +262,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 EXTRA_DIST = XLC_LOCALE.pre Compose.pre
@@ -253,14 +277,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/zh_TW/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  nls/zh_TW/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/zh_TW/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign nls/zh_TW/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -278,6 +302,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -287,37 +312,43 @@ clean-libtool:
 install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-dist_x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(dist_x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 install-x11thislocaleDATA: $(x11thislocale_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(x11thislocaledir)" || $(MKDIR_P) "$(DESTDIR)$(x11thislocaledir)"
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(x11thislocaledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(x11thislocaledir)" || exit $$?; \
 	done
 
 uninstall-x11thislocaleDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(x11thislocale_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
-	done
+	@list='$(x11thislocale_DATA)'; test -n "$(x11thislocaledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(x11thislocaledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(x11thislocaledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -341,13 +372,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -379,6 +414,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -397,6 +433,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -406,18 +444,28 @@ install-data-am: install-dist_x11thislocaleDATA \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -455,9 +503,9 @@ uninstall-am: uninstall-dist_x11thislocaleDATA \
 	uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: